Commit 27ba35b3 authored May 02, 2005 by unknown

Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

parents 4aefc357 a406c034

BUILD/check-cpu

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ if test -r /proc/cpuinfo ; then
		if test -z "$model_name" ; then
		model_name=`uname -m`
		fi
		else
		exit 0
		fi

		case "$cpu_family--$model_name" in

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