diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-10 14:19:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-10 14:19:02 +0200 |
| commit | c4e336e01ebff51f9e338eeb2815a3417cf8004b (patch) | |
| tree | d5241325b8dc0045188292ef7ba3f10a5c62b112 /mysql-test | |
| parent | affff1aefc81ea0a3cb778a6617504ccd1e905fc (diff) | |
| download | mariadb-git-c4e336e01ebff51f9e338eeb2815a3417cf8004b.tar.gz | |
fix the encryption.filekeys_nofile test
and move the error reporting where it belongs
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/encryption/r/filekeys_nofile.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/t/filekeys_nofile.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/encryption/r/filekeys_nofile.result b/mysql-test/suite/encryption/r/filekeys_nofile.result index 558ea1ce88c..690f2e61df0 100644 --- a/mysql-test/suite/encryption/r/filekeys_nofile.result +++ b/mysql-test/suite/encryption/r/filekeys_nofile.result @@ -1,7 +1,7 @@ -call mtr.add_suppression("File '' not found"); +call mtr.add_suppression("file-key-management-filename is not set"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error"); call mtr.add_suppression("Plugin 'file_key_management' registration.*failed"); -FOUND /File '' not found/ in mysqld.1.err +FOUND /file-key-management-filename is not set/ in mysqld.1.err create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1; ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") select plugin_status from information_schema.plugins diff --git a/mysql-test/suite/encryption/t/filekeys_nofile.test b/mysql-test/suite/encryption/t/filekeys_nofile.test index c4505ebec81..46f5cd462d7 100644 --- a/mysql-test/suite/encryption/t/filekeys_nofile.test +++ b/mysql-test/suite/encryption/t/filekeys_nofile.test @@ -1,2 +1,2 @@ -let SEARCH_PATTERN=File '' not found; +let SEARCH_PATTERN=file-key-management-filename is not set; source filekeys_badtest.inc; |