diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-24 17:10:40 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-24 17:10:40 +0100 |
| commit | 3a78156ee6e859da0247af80824b2b6826f8471c (patch) | |
| tree | 7e0575afb4599def9823e98f56b0df08aa2d2d0c | |
| parent | d6aea04c5b45fd8444d14872c08751746f1eba8b (diff) | |
| download | mariadb-git-3a78156ee6e859da0247af80824b2b6826f8471c.tar.gz | |
Bug #17443 mysqldump test failure
client/mysqlimport.c:
Remove disabled --use-threads option
mysql-test/r/mysqldump.result:
Update result
mysql-test/t/disabled.def:
Remove disable of mysqldump
mysql-test/t/mysqldump.test:
Remove the disable_parsing on tests for --use-threads to mysqlimport
| -rw-r--r-- | client/mysqlimport.c | 2 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump.result | 30 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 2 |
4 files changed, 30 insertions, 5 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index edaaf20d98b..913f7fb2f15 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -145,13 +145,11 @@ static struct my_option my_long_options[] = (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #include <sslopt-longopts.h> -#if 0 {"use-threads", OPT_USE_THREADS, "Load files in parallel. The argument is the number " "of threads to use for loading data.", (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#endif #ifndef DONT_ALLOW_USER_CHANGE {"user", 'u', "User for login if not current user.", (gptr*) ¤t_user, (gptr*) ¤t_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 79b22964f8a..029f7c8d876 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -2650,3 +2650,33 @@ DELIMITER ; DROP TRIGGER tr1; DROP TABLE t1; +create table t1 (a text , b text); +create table t2 (a text , b text); +insert t1 values ("Duck, Duck", "goose"); +insert t1 values ("Duck, Duck", "pidgeon"); +insert t2 values ("We the people", "in order to perform"); +insert t2 values ("a more perfect", "union"); +select * from t1; +a b +Duck, Duck goose +Duck, Duck pidgeon +select * from t2; +a b +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 +select * from t1; +a b +Duck, Duck goose +Duck, Duck pidgeon +Duck, Duck goose +Duck, Duck pidgeon +select * from t2; +a b +We the people in order to perform +a more perfect union +We the people in order to perform +a more perfect union +drop table t1; +drop table t2; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 1c0c92c86a3..94686cfe8e7 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -36,4 +36,3 @@ rpl_sp : Bug#16456 rpl_until : Unstable test case, bug#15886 sp-goto : GOTO is currently is disabled - will be fixed in the future rpl_ndb_log : results are not deterministic -mysqldump : Bug#17443 mysqlimport --use-threads=5 gives crashes diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 90a6782200d..3f2fa8e8bf2 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1049,7 +1049,6 @@ SET SQL_MODE = @old_sql_mode; DROP TRIGGER tr1; DROP TABLE t1; ---disable_parsing # # Added for use-thread option # @@ -1073,4 +1072,3 @@ select * from t2; drop table t1; drop table t2; ---enable_parsing |