From 71c56e6e45f9595119c64a7d36030c68dc5319fd Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Thu, 7 Nov 2013 03:45:56 +0400 Subject: [PATCH] .frm file is intact, so the absence of the error message seems to be correct --- mysql-test/suite/storage_engine/misc.result | 5 +++++ mysql-test/suite/storage_engine/parts/repair_table.result | 2 -- .../mysql-test/storage_engine/parts/repair_table.rdiff | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/storage_engine/misc.result b/mysql-test/suite/storage_engine/misc.result index b79c78172ed..8b1d951a73e 100644 --- a/mysql-test/suite/storage_engine/misc.result +++ b/mysql-test/suite/storage_engine/misc.result @@ -42,6 +42,8 @@ db User NULL NULL event db NULL NULL event name NULL NULL func name NULL NULL +gtid_slave_pos domain_id NULL NULL +gtid_slave_pos sub_id NULL NULL help_category help_category_id NULL NULL help_category name NULL NULL help_keyword help_keyword_id NULL NULL @@ -70,6 +72,9 @@ proxies_priv Host NULL NULL proxies_priv Proxied_host NULL NULL proxies_priv Proxied_user NULL NULL proxies_priv User NULL NULL +roles_mapping Host NULL NULL +roles_mapping Role NULL NULL +roles_mapping User NULL NULL servers Server_name NULL NULL table_stats db_name NULL NULL table_stats table_name NULL NULL diff --git a/mysql-test/suite/storage_engine/parts/repair_table.result b/mysql-test/suite/storage_engine/parts/repair_table.result index 8b08ee15fd0..d9ac215797b 100644 --- a/mysql-test/suite/storage_engine/parts/repair_table.result +++ b/mysql-test/suite/storage_engine/parts/repair_table.result @@ -74,7 +74,6 @@ ERROR HY000: Failed to read from the .par file CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check Error Failed to read from the .par file -test.t1 check Error Incorrect information in file: './test/t1.frm' test.t1 check error Corrupt SELECT a,b FROM t1; ERROR HY000: Failed to read from the .par file @@ -83,7 +82,6 @@ ERROR HY000: Failed to read from the .par file REPAIR TABLE t1; Table Op Msg_type Msg_text test.t1 repair Error Failed to read from the .par file -test.t1 repair Error Incorrect information in file: './test/t1.frm' test.t1 repair error Corrupt DROP TABLE t1, t2; call mtr.add_suppression("Got an error from thread_id=.*"); diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff index 2b5d5f68346..59ebb4de421 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff @@ -1,6 +1,6 @@ --- repair_table.result 2013-01-23 01:35:44.388267080 +0400 +++ repair_table.reject 2013-01-23 03:16:26.468307847 +0400 -@@ -1,236 +1,114 @@ +@@ -1,234 +1,114 @@ call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired"); DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; @@ -123,7 +123,6 @@ CHECK TABLE t1; Table Op Msg_type Msg_text -test.t1 check Error Failed to read from the .par file --test.t1 check Error Incorrect information in file: './test/t1.frm' -test.t1 check error Corrupt +test.t1 check Error Table 'test.t1' doesn't exist +test.t1 check status Operation failed @@ -136,7 +135,6 @@ REPAIR TABLE t1; Table Op Msg_type Msg_text -test.t1 repair Error Failed to read from the .par file --test.t1 repair Error Incorrect information in file: './test/t1.frm' -test.t1 repair error Corrupt +test.t1 repair Error Table 'test.t1' doesn't exist +test.t1 repair status Operation failed