1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#19067: Crash for default subpartitioning when altering the table

Browse Source 
mysql-test/r/information_schema_part.result:
  Bug fix
sql/partition_element.h:
  Review fixes
sql/sql_partition.cc:
  Review fixes
This commit is contained in:
unknown 2006-06-03 18:37:31 -04:00
parent dabe83976f
commit 14e1d69aea
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/information_schema_part.result
View File

@ -119,7 +119,7 @@ SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL `a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) SUBPARTITION BY LINEAR HASH (a) (PARTITION p0 VALUES LESS THAN (10) ) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) SUBPARTITION BY LINEAR HASH (a) (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM)
select SUBPARTITION_METHOD FROM information_schema.partitions WHERE select SUBPARTITION_METHOD FROM information_schema.partitions WHERE
table_schema="test" AND table_name="t1"; table_schema="test" AND table_name="t1";
SUBPARTITION_METHOD SUBPARTITION_METHOD

26
sql/partition_element.h
View File

@ -64,24 +64,20 @@ public:
engine_type(NULL),part_state(PART_NORMAL), engine_type(NULL),part_state(PART_NORMAL),
nodegroup_id(UNDEF_NODEGROUP), has_null_value(FALSE) nodegroup_id(UNDEF_NODEGROUP), has_null_value(FALSE)
{ {
subpartitions.empty();
list_val_list.empty();
} }
partition_element(partition_element *part_elem) partition_element(partition_element *part_elem)
: partition_name(NULL), range_value(0), has_null_value(FALSE) : part_max_rows(part_elem->part_max_rows),
part_min_rows(part_elem->part_min_rows),
partition_name(NULL),
tablespace_name(part_elem->tablespace_name),
range_value(0), part_comment(part_elem->part_comment),
data_file_name(part_elem->data_file_name),
index_file_name(part_elem->index_file_name),
engine_type(part_elem->engine_type),
part_state(part_elem->part_state),
nodegroup_id(part_elem->nodegroup_id),
has_null_value(FALSE)
{ {
subpartitions.empty();
list_val_list.empty();
part_max_rows= part_elem->part_max_rows;
part_min_rows= part_elem->part_min_rows;
tablespace_name= part_elem->tablespace_name;
part_comment= part_elem->part_comment;
data_file_name= part_elem->data_file_name;
index_file_name= part_elem->index_file_name;
engine_type= part_elem->engine_type;
part_state= part_elem->part_state;
nodegroup_id= part_elem->nodegroup_id;
} }
~partition_element() {} ~partition_element() {}
}; };

5
sql/sql_partition.cc
View File

@ -1886,9 +1886,10 @@ char *generate_partition_syntax(partition_info *part_info,
err+= add_partition_values(fptr, part_info, part_elem); err+= add_partition_values(fptr, part_info, part_elem);
if (!part_info->is_sub_partitioned() || if (!part_info->is_sub_partitioned() ||
part_info->use_default_subpartitions) part_info->use_default_subpartitions)
{
err+= add_partition_options(fptr, part_elem); 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_space(fptr);
err+= add_begin_parenthesis(fptr); err+= add_begin_parenthesis(fptr);