bk commit into 5.1 tree (serg:1.2207)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2207 06/03/02 10:48:54 serg@stripped +1 -0
  crazy - for the last week mysqlslap.test was generating 400 sigsegvs
  per run, failing ALL mysql_real_connect() calls - nobody noticed,
  the test always appeared to "pass".

  client/mysqlslap.c
    1.24 06/03/02 10:48:32 serg@stripped +9 -6
    crazy - for the last week mysqlslap.test was generating 400 sigsegvs
    per run, failing ALL mysql_real_connect() calls - nobody noticed,
    the test always appeared to "pass".

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.23/client/mysqlslap.c	Sun Feb 26 03:03:06 2006
+++ 1.24/client/mysqlslap.c	Thu Mar  2 10:48:32 2006
@@ -1086,6 +1086,9 @@ WAIT:
       int status, pid;
       pid= wait(&status);
       DBUG_PRINT("info", ("Parent: child %d status %d", pid, status));
+      if (status != 0)
+        printf("%s: Child %d died with the status %d\n",
+               my_progname, pid, status);
     }
   }
 #endif
@@ -1122,11 +1125,11 @@ run_task(thread_context *con)
   DBUG_PRINT("info", ("trying to connect to host %s as user %s", host, user));
   lock_file= my_open(lock_file_str, O_RDWR, MYF(0));
   my_lock(lock_file, F_RDLCK, 0, F_TO_EOF, MYF(0));
-  if (!opt_only_print) 
+  if (!opt_only_print)
   {
-    if (!(mysql= mysql_real_connect(NULL, host, user, opt_password,
-                                    create_schema_string, 
-                                    opt_mysql_port, 
+    if (!(mysql= mysql_real_connect(mysql, host, user, opt_password,
+                                    create_schema_string,
+                                    opt_mysql_port,
                                     opt_mysql_unix_port,
                                     0)))
     {
@@ -1136,12 +1139,12 @@ run_task(thread_context *con)
   }
   DBUG_PRINT("info", ("connected."));
 
-  queries= 0; 
+  queries= 0;
 
 limit_not_met:
     for (ptr= con->stmt; ptr && ptr->length; ptr= ptr->next)
     {
-      if (opt_only_print) 
+      if (opt_only_print)
       {
         printf("%.*s;\n", (uint)ptr->length, ptr->string);
       }