diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-14 15:36:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-31 19:28:58 +0200 |
| commit | b2865a437f45922c2f31f2bffe0f7d6134a8720e (patch) | |
| tree | 581045b1cd5f0deef8af13cdbfc73c7dfb1c26af /mysql-test/suite/encryption/r/filekeys_encfile_badfile.result | |
| parent | d6d994bf42be0b855e3eb1c4d672a4871a186652 (diff) | |
| download | mariadb-git-b2865a437f45922c2f31f2bffe0f7d6134a8720e.tar.gz | |
search_pattern_in_file.inc changes
1. Special mode to search in error logs: if SEARCH_RANGE is not set,
the file is considered an error log and the search is performed
since the last CURRENT_TEST: line
2. Number of matches is printed too. "FOUND 5 /foo/ in bar".
Use greedy .* at the end of the pattern if number of matches
isn't stable. If nothing is found it's still "NOT FOUND",
not "FOUND 0".
3. SEARCH_ABORT specifies the prefix of the output.
Can be "NOT FOUND" or "FOUND" as before,
but also "FOUND 5 " if needed.
Diffstat (limited to 'mysql-test/suite/encryption/r/filekeys_encfile_badfile.result')
| -rw-r--r-- | mysql-test/suite/encryption/r/filekeys_encfile_badfile.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result b/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result index 98e2266f3f2..7e244c2c381 100644 --- a/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result +++ b/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result @@ -1,7 +1,7 @@ call mtr.add_suppression("File 'bad' not found"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error"); call mtr.add_suppression("Plugin 'file_key_management' registration.*failed"); -FOUND /File 'bad' not found/ in mysqld.1.err +FOUND 1 /File 'bad' not found/ 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 |