diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2018-05-03 20:54:23 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2018-05-03 20:54:23 +0300 |
| commit | d36034b6d836fb696e253695f1cab77c98d21720 (patch) | |
| tree | 0af69b12ca9550b2426f8088176a129b33319b3f /storage/myisammrg | |
| parent | ca174051d85e93369c0567781c7c8a890cc2a75d (diff) | |
| download | mariadb-git-d36034b6d836fb696e253695f1cab77c98d21720.tar.gz | |
Follow up for 9a8498066865b5 - adjustments to storage_engine tests
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff | 7 | ||||
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff | 5 |
2 files changed, 7 insertions, 5 deletions
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 35d4f6b63d6..17fd0f124eb 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 @@ --- suite/storage_engine/parts/repair_table.result 2017-08-28 19:29:20.491633306 +0300 +++ suite/storage_engine/parts/repair_table.reject 2017-08-28 19:34:41.723633059 +0300 -@@ -1,235 +1,115 @@ +@@ -1,236 +1,116 @@ call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired"); DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2; @@ -165,6 +165,9 @@ REPAIR TABLE t1 USE_FRM; Table Op Msg_type Msg_text -test.t1 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + db.opt -t1#P#p0.MYD -t1#P#p0.MYI -t1#P#p1.MYD @@ -296,7 +299,5 @@ -15 o -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -# If you got a difference in error message, just add it to rdiff file -+test.t1 repair Error Table 'test.t1' doesn't exist -+test.t1 repair status Operation failed DROP TABLE t1; +ERROR 42S02: Unknown table 'test.t1' diff --git a/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff index 79f6c7040e0..d6c46b8c5b8 100644 --- a/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff @@ -71,7 +71,7 @@ DROP TABLE t1, t2; call mtr.add_suppression("Got an error from thread_id=.*"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); -@@ -63,45 +57,32 @@ +@@ -63,46 +57,33 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; REPAIR TABLE t1; Table Op Msg_type Msg_text @@ -87,9 +87,10 @@ Table Op Msg_type Msg_text -test.t1 repair warning Number of rows changed from 0 to 3 -test.t1 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair + db.opt -t1.MYD -t1.MYI -+test.t1 repair note The storage engine for the table doesn't support repair +t1.MRG t1.frm INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); |