diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-17 18:19:29 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-17 18:19:29 +0100 |
| commit | 0c7568f13c7bdca4f419d44d9701cf179c2d9fe2 (patch) | |
| tree | 2e3cad6b04bf9cec9d1f628ad34d64a418982a58 /client/mysqlimport.c | |
| parent | 62e514d6943fb4fd1efedb4cb4181d04a3768df3 (diff) | |
| download | mariadb-git-0c7568f13c7bdca4f419d44d9701cf179c2d9fe2.tar.gz | |
Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
- Disable --use-threads option in 5.1.7
client/mysqlimport.c:
Disable --use-threads option
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/mysqldump.test:
Disable test for --use-threads
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index afc1724b87b..f5b60d4938c 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -146,11 +146,13 @@ 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}, |