bk commit into 5.0 tree (patg:1.1977) BUG#9926

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg 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.1977 05/06/22 19:29:34 patg@stripped +1 -0
  Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty

  sql/ha_federated.cc
    1.29 05/06/22 19:22:09 patg@stripped +12 -0
    Added auto-reconnect to allow foreign server restarts.

# 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:	patg
# Host:	radha.local
# Root:	/Volumes/disk2s1/mysql-5.0

--- 1.28/sql/ha_federated.cc	Sun Jun  5 16:18:48 2005
+++ 1.29/sql/ha_federated.cc	Wed Jun 22 19:22:09 2005
@@ -462,6 +462,12 @@
   }
   else
   {
+    /*
+      Since we do not support transactions at this version, we can let the client
+      API silently reconnect. For future versions, we will need more logic to deal
+      with transactions
+    */
+    mysql->reconnect= 1;
     /* 
       Note: I am not using INORMATION_SCHEMA because this needs to work with < 5.0
       if we can connect, then make sure the table exists 
@@ -988,6 +994,12 @@
     my_error(ER_CONNECT_TO_MASTER, MYF(0), mysql_error(mysql));
     DBUG_RETURN(ER_CONNECT_TO_MASTER);
   }
+  /*
+    Since we do not support transactions at this version, we can let the client
+    API silently reconnect. For future versions, we will need more logic to deal
+    with transactions
+  */
+  mysql->reconnect= 1;
   DBUG_RETURN(0);
 }