From: monty
Date: December 25 2005 2:34pm
Subject: bk commit into 5.1 tree (monty:1.1990)
List-Archive: http://lists.mysql.com/commits/403
Message-Id: <20051225143418.7069118A1C@mishka.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.1990 05/12/25 16:34:10 monty@stripped +2 -0
  Fixed compile errors (when compiling in debug mode)

  client/mysqlslap.c
    1.5 05/12/25 16:33:58 monty@stripped +5 -4
    Fixed compile errors (when compiling in debug mode)

  BitKeeper/etc/ignore
    1.218 05/12/25 16:32:17 monty@stripped +1 -0
    added storage/archive/archive_test

# 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:	monty
# Host:	mishka.mysql.com
# Root:	/home/my/mysql-5.1

--- 1.4/client/mysqlslap.c	2005-12-25 01:41:31 +02:00
+++ 1.5/client/mysqlslap.c	2005-12-25 16:33:58 +02:00
@@ -953,7 +953,7 @@
     case 0:
       /* child */
       DBUG_PRINT("info", ("fork returned 0, calling task(\"%s\"), pid %d gid %d",
-                          script, pid, getgid()));
+                          stmts->string, pid, getgid()));
       if (verbose >= 2)
         fprintf(stderr,
                 "%s: fork returned 0, calling task pid %d gid %d\n",
@@ -1001,7 +1001,7 @@
   MYSQL_ROW row;
 
   DBUG_ENTER("run_task");
-  DBUG_PRINT("info", ("task script \"%s\"", script));
+  DBUG_PRINT("info", ("task script \"%s\"", qstmt->string));
 
   mysql_init(&mysql);
 
@@ -1086,9 +1086,10 @@
       {
         if (mysql_real_query(&mysql, ptr->string, ptr->length))
         {
-          DBUG_PRINT("info", ("iteration %d with INSERT statement %s", script));
+          DBUG_PRINT("info", ("iteration %d with INSERT statement %s", ptr->string));
           fprintf(stderr,"%s: Cannot insert into table using sql: %.*s ERROR: %s\n",
-                  my_progname, (uint)ptr->length, ptr->string, mysql_error(&mysql));
+                  my_progname, (uint)ptr->length, ptr->string,
+                  mysql_error(&mysql));
           exit(1);
         }
       }

--- 1.217/BitKeeper/etc/ignore	2005-12-07 05:55:19 +02:00
+++ 1.218/BitKeeper/etc/ignore	2005-12-25 16:32:17 +02:00
@@ -1659,3 +1659,4 @@
 zlib/*.ds?
 zlib/*.vcproj
 client/mysqlslap
+storage/archive/archive_test