From aefe5da5493bb5ed9d60ab863762b700d978a6ec Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2006 19:09:10 -0800 Subject: [PATCH 1/3] Fixed comments bug#17239 client/mysqlslap.c: Fixed comments. --- client/mysqlslap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/mysqlslap.c b/client/mysqlslap.c index be034da0c8c..fddc5cffac6 100644 --- a/client/mysqlslap.c +++ b/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).", From 6753b5fdedef9cc6feba41c43f2c358238c0d84a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2006 17:40:05 +0100 Subject: [PATCH 2/3] disabled a bunch of tests with reference to bugreporsts to cleanup push-build --- mysql-test/t/disabled.def | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 491c1ba2fa6..b8646f61b87 100644 --- a/mysql-test/t/disabled.def +++ b/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 From 98285530eb37a596254679ef621a98e40236e690 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2006 12:11:26 -0600 Subject: [PATCH 3/3] mysqlimport.c: Revise option description for --help message. client/mysqlimport.c: Revise option description for --help message. --- client/mysqlimport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/mysqlimport.c b/client/mysqlimport.c index fbe15b94111..afc1724b87b 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -147,10 +147,10 @@ static struct my_option my_long_options[] = REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #include {"use-threads", OPT_USE_THREADS, - "Parrelize the loading of files. Requires an arguement for the number \ - threads to use for loading of data.", - (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, - GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + "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 {"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},