bk commit into 5.0 tree (patg:1.1934) 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.1934 05/06/04 02:31:35 patg@stripped +1 -0
  BUG# 9926 Added silent client API reconnect to ha_federated.cc
  
  ha_federated.cc:
    added mysql->reconnect=1 to ::open and ::create. This version of fedated
    need not support transactions, so silent reconnects will be ok. I will 
    have to add much more logic to Federated to deal with foreign server restarts
    in subsequent versions of Federated where we will be supporting many other
    features.

  sql/ha_federated.cc
    1.28 05/06/04 02:30:36 patg@stripped +13 -0
    added mysql->reconnect=1 to ::open and ::create. This version of fedated
    need not support transactions, so silent reconnects will be ok. I will 
    have to add much more logic to Federated to deal with foreign server restarts
    in subsequent versions of Federated where we will be supporting many other
    features.

# 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:	/Users/patg/mysql-5.0

--- 1.27/sql/ha_federated.cc	Fri May 27 22:07:36 2005
+++ 1.28/sql/ha_federated.cc	Sat Jun  4 02:30:36 2005
@@ -463,10 +463,17 @@
   }
   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 
     */
+
     query.append("SHOW TABLES LIKE '");
     escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_base_name,
                             sizeof(escaped_table_base_name),
@@ -989,6 +996,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);
 }