Commit 2e4f86af authored by Sergey Glukhov's avatar Sergey Glukhov
Browse files

5.0-bugteam->5.1-bugteam automerge(bug#39541)

parents 6c0b87f5 90548bc6

mysql-test/r/mysqlcheck.result

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ 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

create table t1(a int);

create view v1 as select * from t1;

mysql-test/t/mysqlcheck.test

+7 −0
Original line number Diff line number Diff line
@@ -71,6 +71,13 @@ 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



#

sql/sql_table.cc

+6 −0
Original line number Diff line number Diff line
@@ -4293,6 +4293,12 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, 
      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)

    {

      /* purecov: begin inspected */