summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorunknown <mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-06-03 18:37:31 -0400
committerunknown <mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-06-03 18:37:31 -0400
commit14e1d69aeaa09075fe3ec609d5ccdcf899508d7d (patch)
tree44ed38ce07377309c8c20c7677ac1eb9fdc551ef /sql/sql_partition.cc
parentdabe83976fc637ad84ce82268b49d4399b3e7411 (diff)
downloadmariadb-git-14e1d69aeaa09075fe3ec609d5ccdcf899508d7d.tar.gz
BUG#19067: Crash for default subpartitioning when altering the table
mysql-test/r/information_schema_part.result: Bug fix sql/partition_element.h: Review fixes sql/sql_partition.cc: Review fixes
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 69104ea2ba8..a4f3be9ee41 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1886,9 +1886,10 @@ char *generate_partition_syntax(partition_info *part_info,
err+= add_partition_values(fptr, part_info, part_elem);
if (!part_info->is_sub_partitioned() ||
part_info->use_default_subpartitions)
+ {
err+= add_partition_options(fptr, part_elem);
- if (part_info->is_sub_partitioned() &&
- (!part_info->use_default_subpartitions))
+ }
+ else
{
err+= add_space(fptr);
err+= add_begin_parenthesis(fptr);