diff options
| author | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-20 14:41:50 -0500 |
|---|---|---|
| committer | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-20 14:41:50 -0500 |
| commit | a5b8b7755ececaa340ba78ab4ac06058526bdb9d (patch) | |
| tree | 7c6033924ed6ff3437dd77cdfa0331fc6b3f64f3 /sql/sql_yacc.yy | |
| parent | f9dd31ca8ec96c2c315a9f8011d4f1ed5b73b0a4 (diff) | |
| parent | 51f70d9ff7b38d68d5fca9f7eb155b6f41a4d98f (diff) | |
| download | mariadb-git-a5b8b7755ececaa340ba78ab4ac06058526bdb9d.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 9accacbd7b4..f75a2480f10 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -495,6 +495,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token PARSER_SYM %token PARTIAL %token PARTITION_SYM +%token PARTITIONING_SYM %token PARTITIONS_SYM %token PASSWORD %token PARAM_MARKER @@ -537,6 +538,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token RELAY_THREAD %token RELEASE_SYM %token RELOAD +%token REMOVE_SYM %token RENAME %token REORGANIZE_SYM %token REPAIR @@ -4908,6 +4910,9 @@ alter_commands: | IMPORT TABLESPACE { Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; } | alter_list opt_partitioning + | alter_list + remove_partitioning + | remove_partitioning | partitioning /* This part was added for release 5.1 by Mikael Ronström. @@ -4973,6 +4978,13 @@ alter_commands: | reorg_partition_rule ; +remove_partitioning: + REMOVE_SYM PARTITIONING_SYM + { + Lex->alter_info.flags|= ALTER_REMOVE_PARTITIONING; + } + ; + all_or_alt_part_name_list: ALL { @@ -9326,6 +9338,7 @@ keyword: | PARTITION_SYM {} | PLUGIN_SYM {} | PREPARE_SYM {} + | REMOVE_SYM {} | REPAIR {} | RESET_SYM {} | RESTORE_SYM {} @@ -9500,6 +9513,7 @@ keyword_sp: | ONE_SYM {} | PACK_KEYS_SYM {} | PARTIAL {} + | PARTITIONING_SYM {} | PARTITIONS_SYM {} | PASSWORD {} | PHASE_SYM {} |