List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:January 20 2006 3:12pm
Subject:bk commit into 5.1 tree (sergefp:1.2072)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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.2072 06/01/20 18:12:45 sergefp@stripped +1 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

  sql/sql_class.cc
    1.240 06/01/20 18:12:41 sergefp@stripped +0 -0
    Auto merged

# 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:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r5/RESYNC

--- 1.239/sql/sql_class.cc	2006-01-20 15:24:10 +03:00
+++ 1.240/sql/sql_class.cc	2006-01-20 18:12:41 +03:00
@@ -785,7 +785,10 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   if (lex->describe & DESCRIBE_PARTITIONS)
   {
-    field_list.push_back(item= new Item_empty_string("partitions", 10, cs));
+    /* Maximum length of string that make_used_partitions_str() can produce */
+    item= new Item_empty_string("partitions", MAX_PARTITIONS * (1 + FN_LEN),
+                                cs);
+    field_list.push_back(item);
     item->maybe_null= 1;
   }
 #endif
Thread
bk commit into 5.1 tree (sergefp:1.2072)Sergey Petrunia20 Jan