bk commit into 5.0 tree (ramil:1.2578) BUG#30495

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-21 11:11:22+04:00, ramil@stripped +3 -0
  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@stripped, 2007-11-21 11:11:20+04:00, ramil@stripped +8 -0
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test result.

  mysql-test/t/analyze.test@stripped, 2007-11-21 11:11:20+04:00, ramil@stripped +13 -1
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test case.

  sql/sql_yacc.yy@stripped, 2007-11-21 11:11:20+04:00, ramil@stripped +2 -2
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize: 

diff -Nrup a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result
--- a/mysql-test/r/analyze.result	2006-05-29 19:27:03 +05:00
+++ b/mysql-test/r/analyze.result	2007-11-21 11:11:20 +04:00
@@ -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 -Nrup a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test
--- a/mysql-test/t/analyze.test	2006-05-29 19:27:39 +05:00
+++ b/mysql-test/t/analyze.test	2007-11-21 11:11:20 +04:00
@@ -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 -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-10-25 10:32:33 +05:00
+++ b/sql/sql_yacc.yy	2007-11-21 11:11:20 +04:00
@@ -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
 	{}
 	;