summaryrefslogtreecommitdiff
path: root/sql/sql_partition.h
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2012-02-02 12:47:17 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2012-02-02 12:47:17 +0100
commit7ebeb1433e567dece2601651d306448408656da8 (patch)
tree2954bdaac8f88095fc3a3d0ebf2b9980bf022cda /sql/sql_partition.h
parent225f0cd53d547927dc6d528a4e78c1be5e07cbc6 (diff)
downloadmariadb-git-7ebeb1433e567dece2601651d306448408656da8.tar.gz
Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ON
ALTER TABLE AFTER DROP PARTITION Bug#13608188 - 64038: CRASH IN HANDLER::HA_THD ON ALTER TABLE AFTER REPAIR NON-EXISTING PARTITION Backport of bug#13357766 from -trunk to -5.5. The state of some partitions was not reset on failure, leading to invalid states of partitions in consequent statements. Fixed by reverting back to original state for all partitions if not all partition names was resolved. Also adding extra security by forcing tables to be reopened in case of error in mysql_alter_table. (There is also removal of \r at the end of some lines.)
Diffstat (limited to 'sql/sql_partition.h')
-rw-r--r--sql/sql_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index 7a7b73e9f01..998e4b25f0b 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -254,7 +254,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
char *db,
const char *table_name,
TABLE *fast_alter_table);
-uint set_part_state(Alter_info *alter_info, partition_info *tab_part_info,
+bool set_part_state(Alter_info *alter_info, partition_info *tab_part_info,
enum partition_state part_state);
uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
HA_CREATE_INFO *create_info,