Commit 843ad8bb authored Feb 14, 2006 by unknown

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

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

parents db3a5936 3c310141

mysql-test/r/mysqldump.result

+0 −2

Original line number	Diff line number	Diff line
		@@ -2666,8 +2666,6 @@ We the people in order to perform
		a more perfect union
		test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
		test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
		test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
		test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
		select * from t1;
		a b
		Duck, Duck goose

mysql-test/t/disabled.def

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,4 +39,3 @@ binlog_row_insert_select : Bug #17385
		rpl_row_basic_2myisam : Bug #17385
		rpl_row_basic_3innodb : Bug #17385
		rpl_row_create_table : Bug #17385
		mysqldump : Bug #17383 Bug #17384

mysql-test/t/mysqldump.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -1066,7 +1066,7 @@ select * from t2;
		# The first load tests the pausing code
		--exec $MYSQL_IMPORT --use-threads=1 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt
		# Now we test with multiple threads!
		--exec $MYSQL_IMPORT --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt
		--exec $MYSQL_IMPORT --silent --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt
		select * from t1;
		select * from t2;