bk commit into 5.1 tree (brian:1.2252)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.1 repository of brian. When brian does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2252 06/03/28 17:59:11 brian@zim.(none) +1 -0
  Behavior change to preserve schema unless you specify autogenerated SQL or create
values. 

  client/mysqlslap.c
    1.27 06/03/28 17:59:05 brian@zim.(none) +7 -2
    Behavior change

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	brian
# Host:	zim.(none)
# Root:	/home/brian/mysql/dep-5.1

--- 1.26/client/mysqlslap.c	2006-03-27 09:24:58 -08:00
+++ 1.27/client/mysqlslap.c	2006-03-28 17:59:05 -08:00
@@ -266,6 +266,7 @@
     my_end(0);
     exit(1);
   }
+
   /* globals? Yes, so we only have to run strlen once */
   delimiter_length= strlen(delimiter);
 
@@ -455,9 +456,10 @@
     (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
     0},
   {"preserve-schema", OPT_MYSQL_PRESERVE_SCHEMA,
-    "Preserve the schema from the mysqlslap run.",
+    "Preserve the schema from the mysqlslap run, this happens unless \
+      --auto-generate-sql or --create are used.",
     (gptr*) &opt_preserve, (gptr*) &opt_preserve, 0, GET_BOOL,
-    NO_ARG, 0, 0, 0, 0, 0, 0},
+    NO_ARG, TRUE, 0, 0, 0, 0, 0},
   {"protocol", OPT_MYSQL_PROTOCOL,
     "The protocol of connection (tcp,socket,pipe,memory).",
     0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -749,6 +751,9 @@
 
   if (!user)
     user= (char *)"root";
+
+  if (create_string || auto_generate_sql )
+    opt_preserve= FALSE;
 
   if (auto_generate_sql && (create_string || user_supplied_query))
   {