mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
client/Makefile.am: Use LDADD_R as common variable for programs to be linked with thread safe library. client/mysqlimport.c: Enable "--use-threads" Formatting mysql-test/r/mysqldump.result: Update test result mysql-test/t/disabled.def: Enable mysqldump mysql-test/t/mysqldump.test: Enable test for mysqlimport with threads Add test for failed mysqlimport
This commit is contained in:
@@ -1049,7 +1049,6 @@ SET SQL_MODE = @old_sql_mode;
|
||||
DROP TRIGGER tr1;
|
||||
DROP TABLE t1;
|
||||
|
||||
--disable_parsing
|
||||
#
|
||||
# Added for use-thread option
|
||||
#
|
||||
@@ -1070,7 +1069,22 @@ select * from t2;
|
||||
--exec $MYSQL_IMPORT --silent --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt
|
||||
select * from t1;
|
||||
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
|
||||
select * from t1;
|
||||
select * from t2;
|
||||
select * from words;
|
||||
select * from words2;
|
||||
|
||||
# Drop table "words" and run with threads, should fail
|
||||
drop table words;
|
||||
--replace_regex /.*mysqlimport/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
|
||||
|
||||
drop table t1;
|
||||
drop table t2;
|
||||
--enable_parsing
|
||||
|
||||
drop table words2;
|
||||
|
||||
Reference in New Issue
Block a user