diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-08-28 19:41:13 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-08-28 19:41:13 +0300 |
| commit | 71931fdf837b88e003998d12442a41c4f2c08c4a (patch) | |
| tree | 3e2681a26b6e71844d708043e38e49dbcd7a6bd9 /storage/myisammrg | |
| parent | 309fe35f295cad9302dcf272d8ac0719f011eddd (diff) | |
| download | mariadb-git-71931fdf837b88e003998d12442a41c4f2c08c4a.tar.gz | |
Fix results for parts/repair_table test after enabling it for MyISAM
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff | 8 |
1 files changed, 4 insertions, 4 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 4346545abcf..35d4f6b63d6 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-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) |