mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 10:57:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix results for parts/repair_table test after enabling it for MyISAM

Browse source
This commit is contained in:
Elena Stepanova 2017-08-28 19:41:13 +03:00
commit 71931fdf83
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/storage_engine/parts/repair_table.opt Normal file
View file

@ -0,0 +1 @@
--myisam-recover-options=DEFAULT

1
mysql-test/suite/storage_engine/parts/repair_table.result
View file

@ -88,6 +88,7 @@ call mtr.add_suppression("Got an error from thread_id=.*");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
call mtr.add_suppression(" '\..test.t1'");
call mtr.add_suppression("Couldn't repair table: test.t1");
call mtr.add_suppression("Table 't1' is marked as crashed.*");
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
REPAIR TABLE t1;
Table Op Msg_type Msg_text

8
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
View file

@ -1,6 +1,6 @@
--- suite/storage_engine/parts/repair_table.result 2017-05-20 03:58:19.451939791 +0300
+++ ../storage/myisammrg/mysql-test/storage_engine/parts/repair_table.reject 2017-05-24 02:42:31.130318292 +0300
@@ -1,234 +1,115 @@
--- 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 @@
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;
@ -144,7 +144,7 @@
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
call mtr.add_suppression(" '\..test.t1'");
call mtr.add_suppression("Couldn't repair table: test.t1");
+call mtr.add_suppression("Table 't1' is marked as crashed.*");
call mtr.add_suppression("Table 't1' is marked as crashed.*");
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
+ERROR HY000: Engine cannot be used in partitioned tables
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)