summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-02-16 10:56:03 +0200
committerMonty <monty@mariadb.org>2018-03-29 13:59:40 +0300
commit2dbeebdb16436e3c2723cd483aaf21d93de799d6 (patch)
tree541a3f79353cdbd7c3b7e32e8cfb57237cc24167 /sql/ha_partition.h
parent0631f20ff75269f2ce427200d8116bb2b6c75605 (diff)
downloadmariadb-git-2dbeebdb16436e3c2723cd483aaf21d93de799d6.tar.gz
Changed static const in Alter_info and Alter_online_info to defines
Main reason was to make it easier to print the above structures in a debugger. Additional benefits is that I was able to use same defines for both structures, which simplifes some code. Most of the code is just removing Alter_info:: and Alter_inplace_info:: from alter table flags. Following renames was done: HA_ALTER_FLAGS -> alter_table_operations CHANGE_CREATE_OPTION -> ALTER_CHANGE_CREATE_OPTION Alter_info::ADD_INDEX -> ALTER_ADD_INDEX DROP_INDEX -> ALTER_DROP_INDEX ADD_UNIQUE_INDEX -> ALTER_ADD_UNIQUE_INDEX DROP_UNIQUE_INDEx -> ALTER_DROP_UNIQUE_INDEX ADD_PK_INDEX -> ALTER_ADD_PK_INDEX DROP_PK_INDEX -> ALTER_DROP_PK_INDEX Alter_info:ALTER_ADD_COLUMN -> ALTER_PARSE_ADD_COLUMN Alter_info:ALTER_DROP_COLUMN -> ALTER_PARSE_DROP_COLUMN Alter_inplace_info::ADD_INDEX -> ALTER_ADD_NON_UNIQUE_NON_PRIM_INDEX Alter_inplace_info::DROP_INDEX -> ALTER_DROP_NON_UNIQUE_NON_PRIM_INDEX Other things: - Added typedef alter_table_operatons for alter table flags - DROP CHECK CONSTRAINT can now be done online - Added checks for Aria tables in alter_table_online.test - alter_table_flags now takes an ulonglong as argument. - Don't support online operations if checksum option is used. - sql_lex.cc doesn't add ALTER_ADD_INDEX if index is not created
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 534b6335e79..e661d0badd3 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1188,7 +1188,7 @@ public:
wrapper function for handlerton alter_table_flags, since
the ha_partition_hton cannot know all its capabilities
*/
- virtual ulonglong alter_table_flags(ulonglong flags);
+ virtual alter_table_operations alter_table_flags(alter_table_operations flags);
/*
unireg.cc will call the following to make sure that the storage engine
can handle the data it is about to send.