diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-15 17:12:04 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-15 17:12:04 +0100 |
| commit | d82dc6350cacc369f26c10e07c0d66e3978bd00b (patch) | |
| tree | c7efca70ed66eaf11d68daefff4f2410b83adb9a /mysql-test/r | |
| parent | f0ca24442fca1a73e17ada70458773b9208ccbd4 (diff) | |
| parent | ea21b3a5ae0985bebc530ca907af0e8c520d1767 (diff) | |
| download | mariadb-git-d82dc6350cacc369f26c10e07c0d66e3978bd00b.tar.gz | |
merge. Disabled the added test in merge.test from 5.1.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/merge.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 6e4e6c5a443..cd56b5eca5c 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -2403,6 +2403,11 @@ REPAIR TABLE m1; Table Op Msg_type Msg_text test.m1 repair note The storage engine for the table doesn't support repair DROP TABLE m1, t1; +# +# BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD +# CRASHES SERVER +# +# Disabled in 5.5 by Mattias. TODO: FIX THIS! End of 5.1 tests # # An additional test case for Bug#27430 Crash in subquery code diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 42fb1945d8b..2f71084564d 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -206,6 +206,7 @@ DROP TABLE `@`; CREATE TABLE `я` (a INT) engine=myisam; SET NAMES DEFAULT; mysqlcheck --default-character-set="latin1" --databases test +call mtr.add_suppression("Can't find file: '..test.@003f.frm'"); test.? Error : Table doesn't exist status : Operation failed |