diff options
author | unknown <mikron@c-8108e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-01 21:38:35 +0100 |
---|---|---|
committer | unknown <mikron@c-8108e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-01 21:38:35 +0100 |
commit | 04c95dc23a659e0abbd4aa1e8159ae350754dfbf (patch) | |
tree | c0e2d93ce36d4640d989cce45f88dc4e10e3ba85 /sql/sql_yacc.yy | |
parent | c31c4eec46819d67fa9f1f78d9091c9e616ec5fb (diff) | |
download | mariadb-git-04c95dc23a659e0abbd4aa1e8159ae350754dfbf.tar.gz |
WL 2826: Fifth step
Removed partition state from parser
sql/sql_yacc.yy:
Removed partition state from parser
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 71 |
1 files changed, 5 insertions, 66 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a86eccb493f..03a6ba4baca 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3582,75 +3582,14 @@ part_definition: LEX *lex= Lex; partition_info *part_info= lex->part_info; partition_element *p_elem= new partition_element(); - uint part_id= part_info->partitions.elements + - part_info->temp_partitions.elements; - enum partition_state part_state; + uint part_id= part_info->partitions.elements; - if (part_info->part_state) - part_state= (enum partition_state)part_info->part_state[part_id]; - else - part_state= PART_NORMAL; - switch (part_state) + if (!p_elem || part_info->partitions.push_back(p_elem)) { - case PART_TO_BE_DROPPED: - /* - This part is currently removed so we keep it in a - temporary list for REPAIR TABLE to be able to handle - failures during drop partition process. - */ - case PART_TO_BE_ADDED: - /* - This part is currently being added so we keep it in a - temporary list for REPAIR TABLE to be able to handle - failures during add partition process. - */ - if (!p_elem || part_info->temp_partitions.push_back(p_elem)) - { - mem_alloc_error(sizeof(partition_element)); - YYABORT; - } - break; - case PART_IS_ADDED: - /* - Part has been added and is now a normal partition - */ - case PART_TO_BE_REORGED: - /* - This part is currently reorganised, it is still however - used so we keep it in the list of partitions. We do - however need the state to be able to handle REPAIR TABLE - after failures in the reorganisation process. - */ - case PART_REORGED_DROPPED: - /* - This part is currently reorganised as part of a - COALESCE PARTITION and it will be dropped without a new - replacement partition after completing the reorganisation. - */ - case PART_CHANGED: - /* - This part is currently split or merged as part of ADD - PARTITION for a hash partition or as part of COALESCE - PARTITION for a hash partitioned table. - */ - case PART_IS_CHANGED: - /* - This part has been split or merged as part of ADD - PARTITION for a hash partition or as part of COALESCE - PARTITION for a hash partitioned table. - */ - case PART_NORMAL: - if (!p_elem || part_info->partitions.push_back(p_elem)) - { - mem_alloc_error(sizeof(partition_element)); - YYABORT; - } - break; - default: - mem_alloc_error((part_id * 1000) + part_state); - YYABORT; + mem_alloc_error(sizeof(partition_element)); + YYABORT; } - p_elem->part_state= part_state; + p_elem->part_state= PART_NORMAL; part_info->curr_part_elem= p_elem; part_info->current_partition= p_elem; part_info->use_default_partitions= FALSE; |