diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 08:47:55 +0300 |
| commit | 6749d39a954c84bc4610acf6e5337c484afcde9a (patch) | |
| tree | 0b5dd374810ca9d9ffbd1efc3aeda19ceb02f349 /storage/myisammrg | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| parent | 1b41a54fc98dab0e05523c36b53bd62d7e7f28b4 (diff) | |
| download | mariadb-git-6749d39a954c84bc4610acf6e5337c484afcde9a.tar.gz | |
Merge 10.2 into bb-10.2-ext
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) |