diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-27 10:14:46 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-27 10:14:46 +0400 |
| commit | 7eb5a83de6af972fa296606c0b5bf5b1f55c5030 (patch) | |
| tree | b363e150e005437d780db90741fd13e67cfa982e /sql/sql_yacc.yy | |
| parent | c20245d2e7026de481502e0ca05de7dfe8cbea9e (diff) | |
| parent | 18851d9ea771499f5e84267d2ed5c16768942f86 (diff) | |
| download | mariadb-git-7eb5a83de6af972fa296606c0b5bf5b1f55c5030.tar.gz | |
Merge mysql.com:/home/ram/work/b30495/b30495.5.0
into mysql.com:/home/ram/work/b30495/b30495.5.1
mysql-test/r/analyze.result:
Auto merged
mysql-test/t/analyze.test:
Auto merged
sql/sql_yacc.yy:
5.0 -> 5.1 manual merging (see bug #30495: optimize table t1,t2,t3 extended errors):
CHECK options disabled for ANALYZE/OPTIMIZE PARTITION.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 66316d1ab5c..65e30c7b59b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5439,7 +5439,7 @@ alter_commands: lex->no_write_to_binlog= $3; lex->check_opt.init(); } - opt_no_write_to_binlog opt_mi_check_type + opt_no_write_to_binlog | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog all_or_alt_part_name_list { @@ -5448,7 +5448,6 @@ alter_commands: lex->no_write_to_binlog= $3; lex->check_opt.init(); } - opt_mi_check_type | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list { LEX *lex= Lex; @@ -5931,7 +5930,7 @@ analyze: lex->no_write_to_binlog= $2; lex->check_opt.init(); } - table_list opt_mi_check_type + table_list {} ; @@ -5987,7 +5986,7 @@ optimize: lex->no_write_to_binlog= $2; lex->check_opt.init(); } - table_list opt_mi_check_type + table_list {} ; |