From: Nirbhay Choubey Date: April 8 2011 7:09am Subject: bzr push into mysql-5.1 branch (nirbhay.choubey:3648 to 3649) Bug#11765157 List-Archive: http://lists.mysql.com/commits/135020 X-Bug: 11765157 Message-Id: <201104080709.p3879Wps012296@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1769695676==" --===============1769695676== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3649 Nirbhay Choubey 2011-04-08 Bug#11765157 - 58090: mysqlslap drops schema specified in create_schema if auto-generate-sql also set. mysqlslap uses a schema to run its tests on and later drops it if auto-generate-sql is used. This can be a problem, if the schema is an already existing one. If create-schema is used with auto-generate-sql option, mysqlslap while performing the cleanup, drops the specified database. Fixed by introducing an option --no-drop, which, if used, will prevent the dropping of schema at the end of the test. @ client/client_priv.h Bug#11765157 - 58090: mysqlslap drops schema specified in create_schema if auto-generate-sql also set. Added an option. @ client/mysqlslap.c Bug#11765157 - 58090: mysqlslap drops schema specified in create_schema if auto-generate-sql also set. Introduced an option 'no-drop' to forbid the removal of schema even if 'create' or 'auto-generate-sql' options are used. @ mysql-test/r/mysqlslap.result Added a testcase for Bug#11765157. @ mysql-test/t/mysqlslap.test Added a testcase for Bug#11765157. modified: client/client_priv.h client/mysqlslap.c mysql-test/r/mysqlslap.result mysql-test/t/mysqlslap.test 3648 Bjorn Munch 2011-04-07 [merge] merge from 5.1-mtr modified: mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/include/mix1.inc mysql-test/include/mtr_warnings.sql mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/order_by.result mysql-test/r/show_check.result mysql-test/r/sp-destruct.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/t/ctype_cp932_binlog_stm.test mysql-test/t/order_by.test mysql-test/t/show_check.test mysql-test/t/sp-destruct.test === modified file 'client/client_priv.h' --- a/client/client_priv.h 2010-01-27 12:23:28 +0000 +++ b/client/client_priv.h 2011-04-08 06:52:44 +0000 @@ -85,6 +85,7 @@ enum options_client OPT_SLAP_POST_SYSTEM, OPT_SLAP_COMMIT, OPT_SLAP_DETACH, + OPT_SLAP_NO_DROP, OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID, OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT, OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE, === modified file 'client/mysqlslap.c' --- a/client/mysqlslap.c 2011-01-13 10:26:42 +0000 +++ b/client/mysqlslap.c 2011-04-08 06:52:44 +0000 @@ -131,7 +131,7 @@ const char *delimiter= "\n"; const char *create_schema_string= "mysqlslap"; -static my_bool opt_preserve= TRUE; +static my_bool opt_preserve= TRUE, opt_no_drop= FALSE; static my_bool debug_info_flag= 0, debug_check_flag= 0; static my_bool opt_only_print= FALSE; static my_bool opt_compress= FALSE, tty_password= FALSE, @@ -599,6 +599,8 @@ static struct my_option my_long_options[ REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"iterations", 'i', "Number of times to run the tests.", &iterations, &iterations, 0, GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0}, + {"no-drop", OPT_SLAP_NO_DROP, "Do not drop the schema after the test.", + &opt_no_drop, &opt_no_drop, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"number-char-cols", 'x', "Number of VARCHAR columns to create in table if specifying --auto-generate-sql.", &num_char_cols_opt, &num_char_cols_opt, 0, GET_STR, REQUIRED_ARG, @@ -1147,8 +1149,11 @@ get_options(int *argc,char ***argv) if (!user) user= (char *)"root"; - /* If something is created we clean it up, otherwise we leave schemas alone */ - if (create_string || auto_generate_sql) + /* + If something is created and --no-drop is not specified, we drop the + schema. + */ + if (!opt_no_drop && (create_string || auto_generate_sql)) opt_preserve= FALSE; if (auto_generate_sql && (create_string || user_supplied_query)) === modified file 'mysql-test/r/mysqlslap.result' --- a/mysql-test/r/mysqlslap.result 2007-12-20 20:32:16 +0000 +++ b/mysql-test/r/mysqlslap.result 2011-04-08 06:52:44 +0000 @@ -225,3 +225,23 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP PROCEDURE IF EXISTS p1; CREATE PROCEDURE p1() SELECT 1; DROP PROCEDURE p1; +# +# Bug #11765157 - 58090: mysqlslap drops schema specified in +# create_schema if auto-generate-sql also set. +# +# 'bug58090' database should not be present. +SHOW DATABASES; +Database +information_schema +mtr +mysql +test +# 'bug58090' database should be present. +SHOW DATABASES; +Database +information_schema +bug58090 +mtr +mysql +test +DROP DATABASE bug58090; === modified file 'mysql-test/t/mysqlslap.test' --- a/mysql-test/t/mysqlslap.test 2007-09-27 08:15:15 +0000 +++ b/mysql-test/t/mysqlslap.test 2011-04-08 06:52:44 +0000 @@ -53,3 +53,18 @@ CREATE PROCEDURE p1() SELECT 1; --exec $MYSQL_SLAP --create-schema=test --delimiter=";" --query="CALL p1; SELECT 1;" --silent 2>&1 DROP PROCEDURE p1; + + +--echo # +--echo # Bug #11765157 - 58090: mysqlslap drops schema specified in +--echo # create_schema if auto-generate-sql also set. +--echo # + +--exec $MYSQL_SLAP --silent --create-schema=bug58090 --concurrency=5 --iterations=20 --auto-generate-sql +--echo # 'bug58090' database should not be present. +SHOW DATABASES; +--exec $MYSQL_SLAP --silent --create-schema=bug58090 --no-drop --auto-generate-sql +--echo # 'bug58090' database should be present. +SHOW DATABASES; +DROP DATABASE bug58090; + --===============1769695676== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/nirbhay.choubey@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: nirbhay.choubey@stripped\ # y8br9lublzt79f4i # target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\ # 5.1.58090/ # testament_sha1: 36db92fa4b09789028ec8f755d67c062bbcf5db2 # timestamp: 2011-04-08 12:39:18 +0530 # base_revision_id: bjorn.munch@stripped\ # v62uf80w4jywi1x6 # # Begin bundle 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 --===============1769695676==--