diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-24 11:27:15 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-24 11:27:15 +0300 |
commit | 6686dfcbbf74159a47cb1b3ffd36daed8a2fa420 (patch) | |
tree | 731e2288bfe7a903671a011d55c9de1ba863d779 /mysql-test/main/partition_open_files_limit.test | |
parent | a80e41043876b486d94a641e98ce2e6057c0a65e (diff) | |
parent | 52df8040264cc6f3226e78d371e4c1dd88dd22b6 (diff) | |
download | mariadb-git-6686dfcbbf74159a47cb1b3ffd36daed8a2fa420.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/partition_open_files_limit.test')
-rw-r--r-- | mysql-test/main/partition_open_files_limit.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/partition_open_files_limit.test b/mysql-test/main/partition_open_files_limit.test index e62ebd0ade7..5a0bc9c7cb5 100644 --- a/mysql-test/main/partition_open_files_limit.test +++ b/mysql-test/main/partition_open_files_limit.test @@ -4,6 +4,10 @@ DROP TABLE IF EXISTS `t1`; --enable_warnings +call mtr.add_suppression("option 'table_open_cache'"); +call mtr.add_suppression("option 'max_connections'"); + + # On some platforms the lowest possible open_files_limit is too high... let $max_open_files_limit= `SELECT @@open_files_limit > 511`; if ($max_open_files_limit) |