Commit 19758ce6 authored by unknown's avatar unknown
Browse files

Fix for dropping a table with frm file consisting of "junk" 


mysql-test/r/show_check.result:
  Move result to correct place
sql/sql_table.cc:
  Reset error if table_type is unknown. ie. the .frm file could not be opened
parent d29ecd5e

mysql-test/r/show_check.result

+7 −7
Original line number Diff line number Diff line
@@ -512,6 +512,13 @@ t1 CREATE TABLE `t1` ( 
  KEY `c2` USING BTREE (`c2`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

flush tables;

SHOW TABLE STATUS like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	NULL	NULL	NULL	NULL	#	#	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Incorrect information in file: './test/t1.frm'

show create table t1;

ERROR HY000: Incorrect information in file: './test/t1.frm'

drop table t1;

CREATE TABLE txt1(a int);

CREATE TABLE tyt2(a int);

CREATE TABLE urkunde(a int);
@@ -557,10 +564,3 @@ DROP TABLE tyt2; 
DROP TABLE urkunde;

SHOW TABLES FROM non_existing_database;

ERROR 42000: Unknown database 'non_existing_database'
 
flush tables;

SHOW TABLE STATUS like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	NULL	NULL	NULL	NULL	#	#	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Incorrect information in file: './test/t1.frm'

show create table t1;

ERROR HY000: Incorrect information in file: './test/t1.frm'

drop table t1;

sql/sql_table.cc

+2 −1
Original line number Diff line number Diff line
@@ -273,7 +273,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, 
      *(end=fn_ext(path))=0;			// Remove extension for delete

      error= ha_delete_table(thd, table_type, path, table->table_name,

                             !dont_log_query);

      if ((error == ENOENT || error == HA_ERR_NO_SUCH_TABLE) && if_exists)

      if ((error == ENOENT || error == HA_ERR_NO_SUCH_TABLE) && 

	  (if_exists || table_type == DB_TYPE_UNKNOWN))

	error= 0;

      if (error == HA_ERR_ROW_IS_REFERENCED)

      {