summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-03-20 14:36:21 -0500
committerunknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-03-20 14:36:21 -0500
commit51f70d9ff7b38d68d5fca9f7eb155b6f41a4d98f (patch)
tree9a8acafd5a0c86c7a1897c3e8157d8436f714bf8 /sql/lex.h
parentee9930bfa4c6cbdd15438f22dccc3a4a2c232d36 (diff)
downloadmariadb-git-51f70d9ff7b38d68d5fca9f7eb155b6f41a4d98f.tar.gz
BUG#17754
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING, changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning Fix a number of mix engine bugs in partitioning mysql-test/r/ndb_partition_key.result: Added a number of new test cases mysql-test/r/partition.result: Added a number of new test cases mysql-test/t/ndb_partition_key.test: Added a number of new test cases mysql-test/t/partition.test: Added a number of new test cases sql/lex.h: REMOVE and PARTITIONING added as keywords in parser sql/sql_lex.h: Added flag to alter_info flag sql/sql_partition.cc: Fixes for the new syntax, changes of the current semantics of the syntax. Fixes for errors in handling mixes of table handlers in partitioning syntax for ALTER TABLE sql/sql_table.cc: Bug fix sql/sql_yacc.yy: New syntax for REMOVE PARTITIONING
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 574d7036c8a..9fd8cae1325 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -391,6 +391,7 @@ static SYMBOL symbols[] = {
{ "PARSER", SYM(PARSER_SYM)},
{ "PARTIAL", SYM(PARTIAL)},
{ "PARTITION", SYM(PARTITION_SYM)},
+ { "PARTITIONING", SYM(PARTITIONING_SYM)},
{ "PARTITIONS", SYM(PARTITIONS_SYM)},
{ "PASSWORD", SYM(PASSWORD)},
{ "PHASE", SYM(PHASE_SYM)},
@@ -428,6 +429,7 @@ static SYMBOL symbols[] = {
{ "RELAY_THREAD", SYM(RELAY_THREAD)},
{ "RELEASE", SYM(RELEASE_SYM)},
{ "RELOAD", SYM(RELOAD)},
+ { "REMOVE", SYM(REMOVE_SYM)},
{ "RENAME", SYM(RENAME)},
{ "REORGANIZE", SYM(REORGANIZE_SYM)},
{ "REPAIR", SYM(REPAIR)},