bk commit into 5.1 tree (holyfoot:1.2547)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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@stripped, 2007-06-06 00:20:01+05:00, holyfoot@hfmain.(none) +3 -0
  Merge bk@stripped:mysql-5.1-opt
  into  mysql.com:/home/hf/work/28477/my51-28477
  MERGE: 1.2475.74.1

  sql/sql_table.cc@stripped, 2007-06-06 00:19:57+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.416.2.3

  sql/table.cc@stripped, 2007-06-06 00:19:57+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.288.2.1

  sql/table.h@stripped, 2007-06-06 00:19:57+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.171.1.1

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/28477/my51-28477/RESYNC

--- 1.428/sql/sql_table.cc	2007-06-06 00:20:07 +05:00
+++ 1.429/sql/sql_table.cc	2007-06-06 00:20:07 +05:00
@@ -1249,6 +1249,7 @@ bool mysql_write_frm(ALTER_PARTITION_PAR
 
       if (part_info)
       {
+        TABLE_SHARE *share= lpt->table->s;
         if (!(part_syntax_buf= generate_partition_syntax(part_info,
                                                          &syntax_len,
                                                          TRUE, TRUE)))
@@ -1256,7 +1257,16 @@ bool mysql_write_frm(ALTER_PARTITION_PAR
           DBUG_RETURN(TRUE);
         }
         part_info->part_info_string= part_syntax_buf;
-        part_info->part_info_len= syntax_len;
+        share->partition_info_len= part_info->part_info_len= syntax_len;
+        if (share->partition_info_buffer_size < syntax_len + 1)
+        {
+          share->partition_info_buffer_size= syntax_len+1;
+          if (!(share->partition_info=
+                  alloc_root(&share->mem_root, syntax_len+1)))
+            DBUG_RETURN(TRUE);
+
+        }
+        memcpy((char*) share->partition_info, part_syntax_buf, syntax_len + 1);
       }
     }
 #endif

--- 1.291/sql/table.cc	2007-06-06 00:20:07 +05:00
+++ 1.292/sql/table.cc	2007-06-06 00:20:07 +05:00
@@ -726,7 +726,8 @@ static int open_binary_frm(THD *thd, TAB
     {
       uint32 partition_info_len = uint4korr(next_chunk);
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-      if ((share->partition_info_len= partition_info_len))
+      if ((share->partition_info_buffer_size=
+             share->partition_info_len= partition_info_len))
       {
         if (!(share->partition_info= (char*)
               memdup_root(&share->mem_root, next_chunk + 4,

--- 1.173/sql/table.h	2007-06-06 00:20:07 +05:00
+++ 1.174/sql/table.h	2007-06-06 00:20:07 +05:00
@@ -243,6 +243,7 @@ typedef struct st_table_share
   bool auto_partitioned;
   const char *partition_info;
   uint  partition_info_len;
+  uint  partition_info_buffer_size;
   const char *part_state;
   uint part_state_len;
   handlerton *default_part_db_type;