Commit 725b2d35 authored by ramil/ram@mysql.com/ramil.myoffice.izhnet.ru's avatar ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
Browse files

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
parent ad721c89

mysql-test/r/analyze.result

+8 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/analyze.test

+13 −1
Original line number Diff line number Diff line
@@ -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

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -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

	{}

	;