bk commit into 5.0 tree (svoj:1.2027)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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.2027 05/10/10 23:53:53 svoj@stripped +2 -0
  Always save/restore connect string.

  sql/unireg.cc
    1.71 05/10/10 23:53:46 svoj@stripped +6 -9
    Always save connect string.

  sql/table.cc
    1.197 05/10/10 23:53:46 svoj@stripped +6 -9
    If extra block present always restore connect string.

# 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:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/engine/mysql-5.0

--- 1.196/sql/table.cc	2005-10-10 23:01:37 +05:00
+++ 1.197/sql/table.cc	2005-10-10 23:53:46 +05:00
@@ -316,17 +316,14 @@
       my_free(buff, MYF(0));
       goto err;
     }
-    if (share->db_type == DB_TYPE_FEDERATED_DB)
+    share->connect_string.length= uint2korr(buff);
+    if (! (share->connect_string.str= strmake_root(&outparam->mem_root,
+            next_chunk + 2, share->connect_string.length)))
     {
-      share->connect_string.length= uint2korr(buff);
-      if (! (share->connect_string.str= strmake_root(&outparam->mem_root,
-              next_chunk + 2, share->connect_string.length)))
-      {
-        my_free(buff, MYF(0));
-        goto err;
-      }
-      next_chunk+= share->connect_string.length + 2;
+      my_free(buff, MYF(0));
+      goto err;
     }
+    next_chunk+= share->connect_string.length + 2;
     buff_end= buff + n_length;
     if (next_chunk + 2 < buff_end)
     {

--- 1.70/sql/unireg.cc	2005-10-10 23:01:37 +05:00
+++ 1.71/sql/unireg.cc	2005-10-10 23:53:46 +05:00
@@ -122,8 +122,7 @@
   str_db_type.str= (char *)ha_get_storage_engine(create_info->db_type);
   str_db_type.length= strlen(str_db_type.str);
   create_info->extra_size= 2 + str_db_type.length;
-  if (create_info->db_type == DB_TYPE_FEDERATED_DB)
-    create_info->extra_size+= create_info->connect_string.length + 2;
+  create_info->extra_size+= create_info->connect_string.length + 2;
 
   if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
 		       create_info, keys)) < 0)
@@ -159,14 +158,12 @@
 		     create_fields,reclength, data_offset))
     goto err;
 
-  if (create_info->db_type == DB_TYPE_FEDERATED_DB)
-  {
-    int2store(buff, create_info->connect_string.length);
-    if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
-        my_write(file, (const byte*)create_info->connect_string.str,
-                 create_info->connect_string.length, MYF(MY_NABP)))
+  int2store(buff, create_info->connect_string.length);
+  if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
+      my_write(file, (const byte*)create_info->connect_string.str,
+               create_info->connect_string.length, MYF(MY_NABP)))
       goto err;
-  }
+
   int2store(buff, str_db_type.length);
   if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
       my_write(file, (const byte*)str_db_type.str,