bk commit into 5.1 tree (msvensson:1.2134) BUG#17382

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2134 06/02/17 18:19:29 msvensson@neptunus.(none) +3 -0
  Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
   - Disable --use-threads option in 5.1.7

  mysql-test/t/mysqldump.test
    1.82 06/02/17 18:19:24 msvensson@neptunus.(none) +2 -0
    Disable test for --use-threads

  mysql-test/r/mysqldump.result
    1.93 06/02/17 18:19:24 msvensson@neptunus.(none) +0 -30
    Update test result

  client/mysqlimport.c
    1.64 06/02/17 18:19:24 msvensson@neptunus.(none) +2 -0
    Disable --use-threads option

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-release

--- 1.63/client/mysqlimport.c	2006-02-14 19:10:05 +01:00
+++ 1.64/client/mysqlimport.c	2006-02-17 18:19:24 +01:00
@@ -146,11 +146,13 @@
    (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},

--- 1.92/mysql-test/r/mysqldump.result	2006-02-14 19:46:41 +01:00
+++ 1.93/mysql-test/r/mysqldump.result	2006-02-17 18:19:24 +01:00
@@ -2650,33 +2650,3 @@
 
 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;

--- 1.81/mysql-test/t/mysqldump.test	2006-02-14 19:46:41 +01:00
+++ 1.82/mysql-test/t/mysqldump.test	2006-02-17 18:19:24 +01:00
@@ -1049,6 +1049,7 @@
 DROP TRIGGER tr1;
 DROP TABLE t1;
 
+--disable_parsing
 #
 # Added for use-thread option
 #
@@ -1072,3 +1073,4 @@
 
 drop table t1;
 drop table t2;
+--enable_parsing