database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity

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

Browse Source 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
This commit is contained in:
brian@zim.tangent.org
2006-02-14 16:20:06 -08:00
parent dd999e9eee 1d908def20
commit 1d3775a371
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqldump.result
View File

@@ -2666,8 +2666,6 @@ We the people in order to perform
a more perfect union a more perfect union
test.t1: 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 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; select * from t1;
a b a b
Duck, Duck goose Duck, Duck goose

1
mysql-test/t/disabled.def
View File

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

2
mysql-test/t/mysqldump.test
View File

@@ -1066,7 +1066,7 @@ select * from t2;
# The first load tests the pausing code # The first load tests the pausing code
--exec $MYSQL_IMPORT --use-threads=1 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt --exec $MYSQL_IMPORT --use-threads=1 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt
# Now we test with multiple threads! # 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 t1;
select * from t2; select * from t2;