diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
commit | 45e6d0aebf023acb50671f82b87e6de5d1e78f5e (patch) | |
tree | c6079a18e158706a0a877d1b522ceb851d6055b5 /mysql-test/mysql-test-run.pl | |
parent | f5cb66fb97101bc0f17ff879025fd7146c032cbc (diff) | |
parent | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (diff) | |
download | mariadb-git-45e6d0aebf023acb50671f82b87e6de5d1e78f5e.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5e6eeb8ede2..9e08427bf3e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4446,6 +4446,7 @@ sub extract_warning_lines ($$) { qr|SSL error: Failed to set ciphers to use|, qr/Plugin 'InnoDB' will be forced to shutdown/, qr|Could not increase number of max_open_files to more than|, + qr|Changed limits: max_open_files|, qr/InnoDB: Error table encrypted but encryption service not available.*/, qr/InnoDB: Could not find a valid tablespace file for*/, qr/InnoDB: Tablespace open failed for*/, |