bk commit into 5.0 tree (jimw:1.1832) BUG#8866

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1832 05/03/16 17:13:45 jimw@stripped +1 -0
  Fix failure in 'lock' test due to change of default
  reconnect setting in mysql client library. (Bug #8866)

  client/mysqltest.c
    1.134 05/03/16 17:10:13 jimw@stripped +11 -1
    Make sure reconnect is always set on connections, and
    note that there is a test that relies on this

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-8866

--- 1.133/client/mysqltest.c	2005-02-15 06:44:56 -08:00
+++ 1.134/client/mysqltest.c	2005-03-16 17:10:13 -08:00
@@ -1695,7 +1695,11 @@
     }
     sleep(CON_RETRY_SLEEP);
   }
-  con->reconnect= 1; /* TODO: change this to 0 in future versions */
+  /*
+   TODO: change this to 0 in future versions, but the 'kill' test relies on
+   existing behavior
+  */
+  con->reconnect= 1;
   return con_error;
 }
 
@@ -1789,6 +1793,12 @@
     error= 1;
     goto err;
   }
+
+  /*
+   TODO: change this to 0 in future versions, but the 'kill' test relies on
+   existing behavior
+  */
+  con->reconnect= 1;
 
   if (record)
   {