bk commit into 5.1 tree (mikron:1.2102)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.2102 06/02/01 17:05:22 mikron@stripped +2 -0
  WL 2826: Fourth step
  Remove partition state from frm file
  Ensure we can still load tables created in 5.1.6 for the time
  being

  sql/unireg.cc
    1.76 06/02/01 17:05:10 mikron@stripped +0 -7
    Remove partition state from frm file
    Ensure we can still load tables created in 5.1.6 for the time
    being

  sql/table.cc
    1.205 06/02/01 17:05:10 mikron@stripped +6 -29
    Remove partition state from frm file
    Ensure we can still load tables created in 5.1.6 for the time
    being

# 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:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/wl2826

--- 1.204/sql/table.cc	2006-01-24 17:46:07 +01:00
+++ 1.205/sql/table.cc	2006-02-01 17:05:10 +01:00
@@ -638,38 +638,15 @@
 #endif
       next_chunk+= 5 + partition_info_len;
     }
-    if (share->mysql_version > 50105 && next_chunk + 5 < buff_end)
+    if (share->mysql_version == 50106)
     {
       /*
-        Partition state was introduced to support partition management in version 5.1.5
-      */
-      uint32 part_state_len= uint4korr(next_chunk);
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-      if ((share->part_state_len= part_state_len))
-        if (!(share->part_state=
-              (uchar*) memdup_root(&share->mem_root, next_chunk + 4,
-                                   part_state_len)))
-        {
-          my_free(buff, MYF(0));
-          goto err;
-        }
-#else
-      if (part_state_len)
-      {
-        DBUG_PRINT("info", ("WITH_PARTITION_STORAGE_ENGINE is not defined"));
-        my_free(buff, MYF(0));
-        goto err;
-      }
-#endif
-      next_chunk+= 4 + part_state_len;
+         Partition state array was here in version 5.1.6, this code makes
+         it possible to load a 5.1.6 table in later versions. Can most
+         likely be removed at some point in time.
+       */
+      next_chunk+= 4;
     }
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-    else
-    {
-      share->part_state_len= 0;
-      share->part_state= NULL;
-    }
-#endif
     keyinfo= share->key_info;
     for (i= 0; i < keys; i++, keyinfo++)
     {

--- 1.75/sql/unireg.cc	2006-01-31 20:14:49 +01:00
+++ 1.76/sql/unireg.cc	2006-02-01 17:05:10 +01:00
@@ -136,7 +136,6 @@
   if (part_info)
   {
     create_info->extra_size+= part_info->part_info_len;
-    create_info->extra_size+= part_info->part_state_len;
   }
 #endif
 
@@ -208,12 +207,6 @@
     if (my_write(file, (const byte*)buff, 4, MYF_RW) ||
         my_write(file, (const byte*)part_info->part_info_string,
                  part_info->part_info_len + 1, MYF_RW))
-      goto err;
-    DBUG_PRINT("info", ("Part state len = %d", part_info->part_state_len));
-    int4store(buff, part_info->part_state_len);
-    if (my_write(file, (const byte*)buff, 4, MYF_RW) ||
-        my_write(file, (const byte*)part_info->part_state,
-                 part_info->part_state_len, MYF_RW))
       goto err;
   }
   else