diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-27 20:03:09 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-27 20:03:09 +0400 |
| commit | 061ac4979936b629d7afd08ba7c78d18556dbda6 (patch) | |
| tree | 71dc3d8f0e8bacbbc48f5306ed938841c011405a | |
| parent | 6cbb7d2f7674c8bc559e18abf36668d9b5b6b3b5 (diff) | |
| parent | 51e24c026dc82ae5b6e1f1256dd668d387c677c7 (diff) | |
| download | mariadb-git-061ac4979936b629d7afd08ba7c78d18556dbda6.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.0-engines
into mysql.com:/home/ram/work/b30495/b30495.5.0
| -rw-r--r-- | mysql-test/r/analyze.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/analyze.test | 14 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result index 7b476c3cca2..c3dbb846402 100644 --- a/mysql-test/r/analyze.result +++ b/mysql-test/r/analyze.result @@ -56,3 +56,11 @@ show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 5 NULL NULL YES BTREE drop table t1; +End of 4.1 tests +create table t1(a int); +analyze table t1 extended; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'extended' at line 1 +optimize table t1 extended; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'extended' at line 1 +drop table t1; +End of 5.0 tests diff --git a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test index 7c9830bb468..0903db1eca4 100644 --- a/mysql-test/t/analyze.test +++ b/mysql-test/t/analyze.test @@ -72,4 +72,16 @@ analyze table t1; show index from t1; drop table t1; -# End of 4.1 tests +--echo End of 4.1 tests + +# +# Bug #30495: optimize table t1,t2,t3 extended errors +# +create table t1(a int); +--error 1064 +analyze table t1 extended; +--error 1064 +optimize table t1 extended; +drop table t1; + +--echo End of 5.0 tests diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3401bf739b3..92b8b96378f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3921,7 +3921,7 @@ analyze: lex->no_write_to_binlog= $2; lex->check_opt.init(); } - table_list opt_mi_check_type + table_list {} ; @@ -3966,7 +3966,7 @@ optimize: lex->no_write_to_binlog= $2; lex->check_opt.init(); } - table_list opt_mi_check_type + table_list {} ; |