From: Nirbhay Choubey
Date: April 8 2011 7:10am
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3340 to 3341) Bug#11765157
List-Archive: http://lists.mysql.com/commits/135022
X-Bug: 11765157
Message-Id: <201104080711.p387BGoh013676@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1352762045=="

--===============1352762045==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3341 Nirbhay Choubey	2011-04-08 [merge]
      Merging patch for bug#11765157 from mysql-5.5.

    modified:
      client/client_priv.h
      client/mysqlslap.c
      mysql-test/r/mysqlslap.result
      mysql-test/t/mysqlslap.test
 3340 Jorgen Loland	2011-04-07
      BUG#11882131 Post-commit cleanup: Replace 
        delete select->quick; select->quick=X;
      with existing utility-function SQL_SELECT::set_quick().

    modified:
      sql/opt_range.cc
      sql/sql_join_cache.cc
      sql/sql_select.cc
      sql/sql_update.cc
=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2011-02-21 11:33:20 +0000
+++ b/client/client_priv.h	2011-04-08 07:07:57 +0000
@@ -75,6 +75,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_AUTO_VERTICAL_OUTPUT,

=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c	2011-01-16 04:02:29 +0000
+++ b/client/mysqlslap.c	2011-04-08 07:07:57 +0000
@@ -128,7 +128,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,
@@ -609,6 +609,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,
@@ -1151,8 +1153,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 07:04:54 +0000
@@ -225,3 +225,25 @@ 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
+performance_schema
+test
+# 'bug58090' database should be present.
+SHOW DATABASES;
+Database
+information_schema
+bug58090
+mtr
+mysql
+performance_schema
+test
+DROP DATABASE bug58090;

=== modified file 'mysql-test/t/mysqlslap.test'
--- a/mysql-test/t/mysqlslap.test	2010-03-23 19:43:49 +0000
+++ b/mysql-test/t/mysqlslap.test	2011-04-08 07:07:57 +0000
@@ -52,3 +52,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;
+


--===============1352762045==
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\
#   0vxiwor3u4frkroo
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   trunk/
# testament_sha1: 1a42f527b019465c5056fbff204fb9d6d94ecd9e
# timestamp: 2011-04-08 12:41:02 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# base_revision_id: jorgen.loland@stripped\
#   uqf1btsg4ezb9gwu
# 
# Begin bundle
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
QA==


--===============1352762045==--