bzr commit into mysql-5.0-bugteam branch (Sergey.Glukhov:2714) Bug#39541

[Sergey Glukhov]

#At file:///home/gluh/MySQL/mysql-5.0-bug-39541/

 2714 Sergey Glukhov	2008-10-29
      Bug#39541 CHECK TABLE on information_schema myisam tables produces error
      issue 'The storage engine for the table doesn't support check' note for I_S tables
modified:
  mysql-test/r/mysqlcheck.result
  mysql-test/t/mysqlcheck.test
  sql/sql_table.cc

per-file messages:
  mysql-test/r/mysqlcheck.result
    test result
  mysql-test/t/mysqlcheck.test
    test case
  sql/sql_table.cc
    issue 'The storage engine for the table doesn't support check' note for I_S tables
=== modified file 'mysql-test/r/mysqlcheck.result'
--- a/mysql-test/r/mysqlcheck.result	2008-01-27 21:28:50 +0000
+++ b/mysql-test/r/mysqlcheck.result	2008-10-29 12:42:02 +0000
@@ -57,4 +57,10 @@ drop view v_bug25347;
 drop table t_bug25347;
 drop database d_bug25347;
 use test;
+create view v1 as select * from information_schema.routines;
+check table v1, information_schema.routines;
+Table	Op	Msg_type	Msg_text
+test.v1	check	status	OK
+information_schema.routines	check	note	The storage engine for the table doesn't support
check
+drop view v1;
 End of 5.0 tests

=== modified file 'mysql-test/t/mysqlcheck.test'
--- a/mysql-test/t/mysqlcheck.test	2008-01-27 21:28:50 +0000
+++ b/mysql-test/t/mysqlcheck.test	2008-10-29 12:42:02 +0000
@@ -58,4 +58,11 @@ drop table t_bug25347;
 drop database d_bug25347;
 use test;
 
+#
+# Bug#39541 CHECK TABLE on information_schema myisam tables produces error
+#
+create view v1 as select * from information_schema.routines;
+check table v1, information_schema.routines;
+drop view v1;
+
 --echo End of 5.0 tests

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-07-15 14:13:21 +0000
+++ b/sql/sql_table.cc	2008-10-29 12:42:02 +0000
@@ -2322,6 +2322,12 @@ static bool mysql_admin_table(THD* thd, 
       goto send_result;
     }
 
+    if (table->schema_table)
+    {
+      result_code= HA_ADMIN_NOT_IMPLEMENTED;
+      goto send_result;
+    }
+
     if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)
     {
       char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE];