summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-21 08:43:07 -0400
committerunknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-21 08:43:07 -0400
commit661537c744232bb2e110bf9e8973deb962d2a72b (patch)
tree3134b1337835cddc30818d013c39e701baabfbfa /sql/sql_table.cc
parent058aa025858115fb01860dfa30ca568425292819 (diff)
downloadmariadb-git-661537c744232bb2e110bf9e8973deb962d2a72b.tar.gz
BUG#19067: Crash when ALTER TABLE for default subpartitioned table
mysql-test/r/partition.result: New test cases mysql-test/r/partition_02myisam.result: ENGINE always specified per partition in show table mysql-test/t/partition.test: New test cases sql/partition_element.h: New copy constructor for partition_element sql/partition_info.cc: Use new copy constructor to ensure default subpartitions inherit partition options from parent Ensure engine is always set on both partitions and subpartitions sql/sql_partition.cc: Removed unneeded bool to generate_partition_syntax Write partition options also for subpartitioned tables when subpartitioning is by default Set up defaults for new partitions also in REORGANIZE PARTITION sql/sql_partition.h: Removed unneeded parameter to generate_partition_syntax call sql/sql_show.cc: Removed unneeded parameter to generate_partition_syntax call sql/sql_table.cc: Removed unneeded parameter to generate_partition_syntax call
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 6cc2ad266e5..f23b664126e 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -323,7 +323,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
part_info->part_state_len= 0;
if (!(part_syntax_buf= generate_partition_syntax(part_info,
&syntax_len,
- TRUE, FALSE)))
+ TRUE)))
{
DBUG_RETURN(TRUE);
}
@@ -2159,7 +2159,7 @@ bool mysql_create_table_internal(THD *thd,
*/
if (!(part_syntax_buf= generate_partition_syntax(part_info,
&syntax_len,
- TRUE, FALSE)))
+ TRUE)))
goto err;
part_info->part_info_string= part_syntax_buf;
part_info->part_info_len= syntax_len;