Commit 202c3fae authored Jun 02, 2006 by unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

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


sql/ha_innodb.cc:
  Auto merged

parents 0c68b710 faea23dc

mysql-test/t/ps_1general.test

+4 −2

Original line number	Diff line number	Diff line
		@@ -321,13 +321,15 @@ execute stmt4;
		prepare stmt4 from ' show variables like ''sql_mode'' ';
		execute stmt4;
		prepare stmt4 from ' show engine bdb logs ';
		# The output depends on the history (actions of the bdb engine).
		# The output depends on the bdb being enabled and on the history
		# history (actions of the bdb engine).
		# That is the reason why, we switch the output here off.
		# (The real output will be tested in ps_6bdb.test)
		# --replace_result $MYSQL_TEST_DIR TEST_DIR
		--disable_warnings
		--disable_result_log
		execute stmt4;
		--enable_result_log
		--enable_warnings
		prepare stmt4 from ' show grants for user ';
		--error 1295
		prepare stmt4 from ' show create table t2 ';

sql/ha_innodb.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ have disables the InnoDB inlining in this file. */

		#define MAX_ULONG_BIT ((ulong) 1 << (sizeof(ulong)*8-1))

		#ifdef WITH_INNOBASE_STORAGE_ENGINE

		#include "ha_innodb.h"

		pthread_mutex_t innobase_share_mutex, /* to protect innobase_open_files */
		@@ -7459,3 +7461,5 @@ mysql_declare_plugin(innobase)
		}
		mysql_declare_plugin_end;

		#endif

unittest/Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ SUBDIRS = mytap . mysys examples

		noinst_SCRIPTS = unit
		EXTRA_DIST = unit.pl
		CLEANFILES = unit

		unittests = mytap mysys