Commit 0c7568f1 authored by unknown's avatar unknown
Browse files

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
parent 62e514d6

client/mysqlimport.c

+2 −0
Original line number Diff line number Diff line
@@ -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*) &current_user,

   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

mysql-test/r/mysqldump.result

+0 −30
Original line number Diff line number Diff line
@@ -2650,33 +2650,3 @@ 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;

mysql-test/t/mysqldump.test

+2 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ SET SQL_MODE = @old_sql_mode; 
DROP TRIGGER tr1;

DROP TABLE t1;



--disable_parsing

#

# Added for use-thread option

#
@@ -1072,3 +1073,4 @@ select * from t2; 


drop table t1;

drop table t2;

--enable_parsing