Commit 18851d9e authored by unknown's avatar unknown

Fix for bug #30495: optimize table t1,t2,t3 extended errors

Problem: we have CHECK TABLE options allowed (by accident?) for
ANALYZE/OPTIMIZE TABLE.

Fix: disable them.

Note: it might require additional fixes in 5.1/6.0


mysql-test/r/analyze.result:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - test result.
mysql-test/t/analyze.test:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - test case.
sql/sql_yacc.yy:
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
    - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize:
parent 3f43b07b
......@@ -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
......@@ -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
......@@ -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
{}
;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment