Commit e7d576ce authored Jun 29, 2006 by unknown

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

into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

parents f030f858 372f81af

.bzrignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,8 @@
		*.d
		*.da
		*.exe
		*.gcda
		*.gcno
		*.gcov
		*.idb
		*.la
		@@ -1778,3 +1780,4 @@ vio/viotest-sslconnect.cpp
		vio/viotest.cpp
		zlib/*.ds?
		zlib/*.vcproj
		server-tools/instance-manager/net_serv.cc

BUILD/compile-pentium-gcov

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"
		# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
		# code with profiling information used by gcov.
		# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM"
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY"
		extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
		extra_configs="$extra_configs $max_configs"

mysql-test/r/show_check.result

+6 −0

Original line number	Diff line number	Diff line
		@@ -623,4 +623,10 @@ delete from mysql.db where user='mysqltest_4';
		delete from mysql.tables_priv where user='mysqltest_4';
		flush privileges;
		drop database mysqltest;
		show full plugin;
		show warnings;
		Level Code Message
		Warning 1541 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead.
		show plugin;
		show plugins;
		End of 5.1 tests

mysql-test/t/events_stress.test

+2 −1

Original line number	Diff line number	Diff line
		# Can't test with embedded server that doesn't support grants
		--source include/not_embedded.inc
		--source include/big_test.inc

		CREATE DATABASE IF NOT EXISTS events_test;
		#

mysql-test/t/rpl_ndb_auto_inc.test

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		# Change: Augmented test to use with cluster
		#####################################
		--source include/master-slave.inc
		--source include/have_binlog_format_mixed_or_row.inc

		--echo *************** Test 1 **********************
		--echo