diff options
| author | msvensson@pilot.mysql.com <> | 2008-02-28 12:21:44 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2008-02-28 12:21:44 +0100 |
| commit | 56a354794c9c9ef13aad39ac45c5d525024c988c (patch) | |
| tree | 1a7e1ed12d61ecd778a2370fd8db32bb46c5015d /mysql-test/t/mysqldump.test | |
| parent | ae3f30828b48708f0c4ceade46dba08fe872c92e (diff) | |
| parent | 0462076eacd374299d8599407a38ab8d516b5ed1 (diff) | |
| download | mariadb-git-56a354794c9c9ef13aad39ac45c5d525024c988c.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 87613232011..9f43f277939 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1637,7 +1637,7 @@ select * from t2; # Now we test with multiple threads, but less threads than files. create table words(a varchar(255)); create table words2(b varchar(255)); ---exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat +--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat select * from t1; select * from t2; select * from words; @@ -1647,7 +1647,7 @@ select * from words2; drop table words; --replace_regex /.*mysqlimport(\.exe)*/mysql-import/ --error 1 ---exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat 2>&1 +--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat 2>&1 drop table t1; drop table t2; |