summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-21 08:37:09 -0400
committerunknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-21 08:37:09 -0400
commit2cb17f9691c819e442de605bfc736a69ff946a67 (patch)
treef902e45e4078ccac436f3d2d5d4e8bbd7a32f696
parente66e6129316260cd0a254e83f362fcab6aac94ff (diff)
downloadmariadb-git-2cb17f9691c819e442de605bfc736a69ff946a67.tar.gz
BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ...
Review fixes sql/partition_info.cc: Review fixes sql/partition_info.h: Review fixes
-rw-r--r--sql/partition_info.cc5
-rw-r--r--sql/partition_info.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index bb1e9eeb905..dfc5dd2989b 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -88,7 +88,7 @@ partition_info *partition_info::get_clone()
The external routine needing this code is check_partition_info
*/
-#define MAX_PART_NAME_SIZE 16
+#define MAX_PART_NAME_SIZE 8
char *partition_info::create_default_partition_names(uint part_no, uint no_parts,
uint start_no)
@@ -125,7 +125,8 @@ char *partition_info::create_default_partition_names(uint part_no, uint no_parts
0 Memory allocation error
*/
-char *create_subpartition_name(uint subpart_no, const char *part_name)
+char *partition_info::create_subpartition_name(uint subpart_no,
+ const char *part_name)
{
uint size_alloc= strlen(part_name) + MAX_PART_NAME_SIZE;
char *ptr= sql_calloc(size_alloc);
diff --git a/sql/partition_info.h b/sql/partition_info.h
index ecba048c486..ae95b4a339f 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -257,6 +257,7 @@ private:
bool set_up_default_subpartitions(handler *file, ulonglong max_rows);
char *create_default_partition_names(uint part_no, uint no_parts,
uint start_no);
+ char *create_subpartition_name(uint subpart_no, const char *part_name);
bool has_unique_name(partition_element *element);
};