Commit 9b512475 authored May 01, 2005 by unknown

Merge bk-internal:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

parents d3d56609 21eed96b

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),

config/ac-macros/misc.m4

+2 −2

Original line number	Diff line number	Diff line
		@@ -646,8 +646,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
		'void exit (int);' \
		'#include <stdlib.h>'
		do
		_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
		$ac_declaration],
		_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration
		@%:@include <stdlib.h>],
		[exit (42);])],
		[],
		[continue])

configure.in

+3 −0

Original line number	Diff line number	Diff line
		@@ -1805,6 +1805,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

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