bk commit into 6.0 tree (ramil:1.2698)

[ramil]

Below is the list of changes that have just been committed into a local
6.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-27 14:12:28+04:00, ramil@stripped +1 -0
  after-merge fix:
    - test result adjusted.

  mysql-test/r/analyze.result@stripped, 2007-11-27 14:12:26+04:00, ramil@stripped +8 -0
    after-merge fix:
      - test result adjusted.

diff -Nrup a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result
--- a/mysql-test/r/analyze.result	2007-11-27 12:31:43 +04:00
+++ b/mysql-test/r/analyze.result	2007-11-27 14:12:26 +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	Index_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