bk commit into 5.1 tree (brian:1.2571)

[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@stripped, 2007-08-20 13:03:50-07:00, brian@stripped +2 -0
  Extending tests for detach (found a memory issue in it, this fixes that and now tests
it).

  client/mysqlslap.c@stripped, 2007-08-20 13:03:48-07:00, brian@stripped +7 -0
    Fix memory allocation

  mysql-test/t/mysqlslap.test@stripped, 2007-08-20 13:03:48-07:00, brian@stripped +2
-0
    Extend test for --detach

diff -Nrup a/client/mysqlslap.c b/client/mysqlslap.c
--- a/client/mysqlslap.c	2007-08-09 13:01:27 -07:00
+++ b/client/mysqlslap.c	2007-08-20 13:03:48 -07:00
@@ -1804,6 +1804,13 @@ limit_not_met:
       {
         mysql_close(mysql);
 
+        if (!(mysql= mysql_init(NULL)))
+        {
+          fprintf(stderr,"%s: mysql_init() failed ERROR : %s\n",
+                  my_progname, mysql_error(mysql));
+          exit(0);
+        }
+
         if (slap_connect(mysql))
           goto end;
       }
diff -Nrup a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test
--- a/mysql-test/t/mysqlslap.test	2007-06-15 17:22:51 -07:00
+++ b/mysql-test/t/mysqlslap.test	2007-08-20 13:03:48 -07:00
@@ -38,3 +38,5 @@
 --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from
t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1
varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into
t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES"
--pre-query="SHOW TABLES";
 
  --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from
t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1
varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into
t2 values ('test', 'test2')" --engine="heap,myisam" --post-query="SHOW TABLES"
--pre-query="SHOW TABLES" --number-of-queries=6 --commit=1;
+
+--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=1 --number-int-cols=2
--number-char-cols=3 --auto-generate-sql --auto-generate-sql-add-autoincrement
--auto-generate-sql-load-type=write --detach=2