Commit e9e24d3a 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

parents 33b00ea5 a82d5e01

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 */
		@@ -7460,3 +7462,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