Commit 371b26e1 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0


sql/item.h:
  Auto merged
parents d45f95f0 d1d474c8

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -102,5 +102,10 @@ tags: 
test:

	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol



test-force:

	cd mysql-test; \

	mysql-test-run --force ;\

	mysql-test-run --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      void (*func) (MYSQL_RES*, MYSQL_ROW, uint);



      new_line = 1;

      if (mysql_query(mysql, "show status") ||

      if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||

	  !(res = mysql_store_result(mysql)))

      {

	my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,9 @@ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try 
again]);

fi

fi

AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])

AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])



MYSQL_PTHREAD_YIELD



######################################################################

include/config-win.h

+15 −2
Original line number Diff line number Diff line
@@ -106,20 +106,33 @@ functions */ 


/* Type information */



#if defined(__EMX__) || !defined(HAVE_UINT)

#undef HAVE_UINT

#define HAVE_UINT

typedef unsigned short	ushort;

typedef unsigned int	uint;

#endif /* defined(__EMX__) || !defined(HAVE_UINT) */



typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */

typedef __int64 longlong;

#ifndef HAVE_SIGSET_T

typedef int sigset_t;

#endif

#define longlong_defined

/* off_t should not be __int64 because of conflicts in header files;

   Use my_off_t or os_off_t instead */

/*

  off_t should not be __int64 because of conflicts in header files;

  Use my_off_t or os_off_t instead

*/

#ifndef HAVE_OFF_T

typedef long off_t;

#endif

typedef __int64 os_off_t;

#ifdef _WIN64

typedef UINT_PTR rf_SetTimer;

#else

#ifndef HAVE_SIZE_T

typedef unsigned int size_t;

#endif

typedef uint rf_SetTimer;

#endif