Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug16548

client/mysqlimport.c

@@ -147,8 +147,8 @@ static struct my_option my_long_options[] =
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
   {"use-threads", OPT_USE_THREADS,
-    "Parrelize the loading of files. Requires an arguement for the number \
-      threads to use for loading of data.",
+   "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},
 #ifndef DONT_ALLOW_USER_CHANGE

client/mysqlslap.c

@@ -55,7 +55,7 @@
   load statements, and then run all the queries in the query file
   with five clients (five times each):
 
-    mysqlslap --drop-schema --concurrency=5 \
+    mysqlslap --concurrency=5 \
               --iterations=5 --query=query.sql --create=create.sql \
               --delimiter=";"
 
@@ -425,12 +425,12 @@ static struct my_option my_long_options[] =
     (gptr*) &lock_directory, (gptr*) &lock_directory, 0, GET_STR, 
     REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"number-char-cols", 'x', 
-    "Number of INT columns to create table with if specifying --sql-generate-sql.",
+    "Number of INT columns to create table with if specifying --auto-generate-sql.",
     (gptr*) &num_char_cols, (gptr*) &num_char_cols, 0, GET_UINT, REQUIRED_ARG,
     1, 0, 0, 0, 0, 0},
   {"number-int-cols", 'y', 
     "Number of VARCHAR columns to create table with if specifying "
-      "--sql-generate-sql.", (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0,
+      "--auto-generate-sql.", (gptr*) &num_int_cols, (gptr*) &num_int_cols, 0,
     GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0},
   {"number-of-queries", OPT_MYSQL_NUMBER_OF_QUERY, 
     "Limit each client to this number of queries (this is not exact).",

mysql-test/t/disabled.def

@@ -33,3 +33,10 @@ rpl_until            : Unstable test case, bug#15886
 sp-goto              : GOTO is currently is disabled - will be fixed in the future
 subselect            : Bug#15706 (ps mode) [PATCH PENDING]
 rpl_ndb_log          : result not deterministic
+sp-code              : Bug #17360
+binlog_row_mix_innodb_myisam : Bug #17386
+binlog_row_insert_select : Bug #17385
+rpl_row_basic_2myisam : Bug #17385
+rpl_row_basic_3innodb : Bug #17385
+rpl_row_create_table : Bug #17385
+mysqldump : Bug #17383 Bug #17384