From: Nirbhay Choubey
Date: April 8 2011 7:10am
Subject: bzr push into mysql-5.5 branch (nirbhay.choubey:3425 to 3427) Bug#11765157
List-Archive: http://lists.mysql.com/commits/135021
X-Bug: 11765157
Message-Id: <201104080710.p387APtf023715@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2005725049=="

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

 3427 Nirbhay Choubey	2011-04-08
      Adjusting test result for bug#11765157.

    modified:
      mysql-test/r/mysqlslap.result
 3426 Nirbhay Choubey	2011-04-08 [merge]
      Merging patch for bug#11765157 from mysql-5.1.

    modified:
      client/client_priv.h
      client/mysqlslap.c
      mysql-test/r/mysqlslap.result
      mysql-test/t/mysqlslap.test
 3425 Bjorn Munch	2011-04-07 [merge]
      null upmerge

=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2011-02-21 10:15:29 +0000
+++ b/client/client_priv.h	2011-04-08 06:55:59 +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 03:59:05 +0000
+++ b/client/mysqlslap.c	2011-04-08 06:55:59 +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,
@@ -607,6 +607,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,
@@ -1149,8 +1151,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	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;
+


--===============2005725049==
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\
#   fu5wajpzolg7jghe
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# testament_sha1: 27735278856f089c574ce68c1699dbbc25240eb9
# timestamp: 2011-04-08 12:40:14 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.58090/
# base_revision_id: bjorn.munch@stripped\
#   2hjopucyfhewdmx0
# 
# Begin bundle
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


--===============2005725049==--