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 | 41e46f32038a9637c00b6204856cfdb1b6425bd8 (patch) | |
| tree | c7efca70ed66eaf11d68daefff4f2410b83adb9a /mysql-test/t/mysqlcheck.test | |
| parent | 7a2664746bae36fd5d9eea6d7e089e26a019e9b7 (diff) | |
| parent | e5cb28793385566e22d5a82efdf3f6cb8dbe5cbc (diff) | |
| download | mariadb-git-41e46f32038a9637c00b6204856cfdb1b6425bd8.tar.gz | |
merge. Disabled the added test in merge.test from 5.1.
Diffstat (limited to 'mysql-test/t/mysqlcheck.test')
| -rw-r--r-- | mysql-test/t/mysqlcheck.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test index 8f93ac7b864..d9aa13ac7b9 100644 --- a/mysql-test/t/mysqlcheck.test +++ b/mysql-test/t/mysqlcheck.test @@ -146,6 +146,7 @@ CREATE TABLE `я` (a INT) engine=myisam; SET NAMES DEFAULT; --echo mysqlcheck --default-character-set="latin1" --databases test # Error returned depends on platform, replace it with "Table doesn't exist" +call mtr.add_suppression("Can't find file: '..test.@003f.frm'"); --replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist" --exec $MYSQL_CHECK --default-character-set="latin1" --databases test --echo mysqlcheck --default-character-set="utf8" --databases test |