bk commit into 5.1 tree (msvensson:1.2324)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2324 06/04/11 20:49:31 msvensson@neptunus.(none) +1 -0
  Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable

  client/mysqlslap.c
    1.28 06/04/11 20:49:27 msvensson@neptunus.(none) +5 -5
    Only use the MYSQL* returned from mysql_reqal_connect as an indicator wether the connect was successfull or not.
    As the manual says about the return value from mysql_real_connect: "A MYSQL* connection handle if the connection
    was successful, NULL if the connection was unsuccessful. For a successful connection, the 
    return value is the same as the value of the first parameter."
    
     

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.27/client/mysqlslap.c	2006-03-29 03:59:05 +02:00
+++ 1.28/client/mysqlslap.c	2006-04-11 20:49:27 +02:00
@@ -1132,11 +1132,11 @@
   my_lock(lock_file, F_RDLCK, 0, F_TO_EOF, MYF(0));
   if (!opt_only_print)
   {
-    if (!(mysql= mysql_real_connect(mysql, host, user, opt_password,
-                                    create_schema_string,
-                                    opt_mysql_port,
-                                    opt_mysql_unix_port,
-                                    0)))
+    if (!(mysql_real_connect(mysql, host, user, opt_password,
+                             create_schema_string,
+                             opt_mysql_port,
+                             opt_mysql_unix_port,
+                             0)))
     {
       fprintf(stderr,"%s: %s\n",my_progname,mysql_error(mysql));
       goto end;