bk commit into 5.1 tree (knielsen:1.1972)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev 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.1972 05/11/25 10:33:38 knielsen@stripped +1 -0
  Mikaels fix for compiling without partition storage engine

  sql/table.cc
    1.189 05/11/25 10:33:07 knielsen@stripped +14 -3
    Mikaels fix for compiling without partition storage engine

# 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:	knielsen
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-5.1.3-fixes

--- 1.188/sql/table.cc	2005-11-23 21:58:50 +01:00
+++ 1.189/sql/table.cc	2005-11-25 10:33:07 +01:00
@@ -539,17 +539,28 @@
     }
     if (next_chunk + 4 < buff_end)
     {
-      if ((share->partition_info_len= uint4korr(next_chunk)))
+      uint32 partition_info_len = uint4korr(next_chunk);
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+      if ((share->partition_info_len= partition_info_len))
       {
         if (!(share->partition_info=
               (uchar*) memdup_root(&share->mem_root, next_chunk + 4,
-                                   share->partition_info_len + 1)))
+                                   partition_info_len + 1)))
         {
           my_free(buff, MYF(0));
           goto err;
         }
-        next_chunk+= share->partition_info_len + 5;
+	next_chunk++;
       }
+#else
+      if (partition_info_len)
+      {
+        DBUG_PRINT("info", ("WITH_PARTITION_STORAGE_ENGINE is not defined"));
+        my_free(buff, MYF(0));
+        goto err;
+      }
+#endif
+      next_chunk+= 4 + partition_info_len;
     }
     keyinfo= share->key_info;
     for (i= 0; i < keys; i++, keyinfo++)