diff options
| author | unknown <msvensson@neptunus.mysql.com> | 2005-10-24 15:05:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.mysql.com> | 2005-10-24 15:05:06 +0200 |
| commit | 33f457721c2ce6d2925978faf745c0e4da4ad44a (patch) | |
| tree | a709b552f6ef1d8ff515117f55ce11628625fce3 /mysql-test | |
| parent | c924903db904c4127fca26a3c02ea8dce58e3e07 (diff) | |
| download | mariadb-git-33f457721c2ce6d2925978faf745c0e4da4ad44a.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/show_check.result | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 20f695d9ac0..fdb0db602ff 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -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; |