diff options
| author | forkfun <alice.sherepa@gmail.com> | 2021-12-09 16:29:22 +0100 |
|---|---|---|
| committer | forkfun <alice.sherepa@gmail.com> | 2021-12-09 16:29:22 +0100 |
| commit | eafa2a1411d373fc21e82cc49cc1e6d7a33c127a (patch) | |
| tree | a1c6d65a8663de3e6221e8a6554c222f17e47a4e | |
| parent | f974062c519e95a00dbd5a1711e2bb95490eb4dc (diff) | |
| download | mariadb-git-eafa2a1411d373fc21e82cc49cc1e6d7a33c127a.tar.gz | |
enable partition_open_files_limit testbb-10.2-alice
| -rw-r--r-- | mysql-test/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/r/partition_open_files_limit.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_sf.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/compound.test | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/mysql-test/disabled.def b/mysql-test/disabled.def index 8ba5b271c2b..6ae67e00eca 100644 --- a/mysql-test/disabled.def +++ b/mysql-test/disabled.def @@ -16,4 +16,3 @@ mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 chang #show_explain : Psergey: random timeout in range-checked-for-each record query. file_contents : MDEV-6526 these files are not installed anymore max_statement_time : cannot possibly work, depends on timing -partition_open_files_limit : open_files_limit check broken by MDEV-18360 diff --git a/mysql-test/r/partition_open_files_limit.result b/mysql-test/r/partition_open_files_limit.result index fed32a69c44..327fe24d27d 100644 --- a/mysql-test/r/partition_open_files_limit.result +++ b/mysql-test/r/partition_open_files_limit.result @@ -1,4 +1,6 @@ DROP TABLE IF EXISTS `t1`; +call mtr.add_suppression("option 'table_open_cache'"); +call mtr.add_suppression("option 'max_connections'"); # Bug#46922: crash when adding partitions and open_files_limit is reached CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=MyISAM PARTITION BY KEY () PARTITIONS 1; diff --git a/mysql-test/suite/binlog/t/binlog_sf.test b/mysql-test/suite/binlog/t/binlog_sf.test index 05b31afcb58..fecc4736972 100644 --- a/mysql-test/suite/binlog/t/binlog_sf.test +++ b/mysql-test/suite/binlog/t/binlog_sf.test @@ -1,4 +1,3 @@ --- source include/have_log_bin.inc # We change binlog format inside the test, so no need to re-run with # more than one binlog_format. @@ -9,13 +8,9 @@ # save status -let $oblf=`select @@SESSION.BINLOG_FORMAT`; let $otfc=`select @@log_bin_trust_function_creators`; - set global log_bin_trust_function_creators=0; - - # fail *on definition* set binlog_format=STATEMENT; @@ -186,6 +181,7 @@ drop function fn16456; # restore status --disable_query_log -eval set binlog_format=$oblf; +set binlog_format=STATEMENT; eval set global log_bin_trust_function_creators=$otfc; +reset master; --enable_query_log diff --git a/mysql-test/t/compound.test b/mysql-test/t/compound.test index 7583bc1cca9..046a9b9767e 100644 --- a/mysql-test/t/compound.test +++ b/mysql-test/t/compound.test @@ -1,7 +1,7 @@ # # MDEV-5317 Compound statement / anonymous blocks # -source include/have_log_bin.inc; +source include/have_binlog_format_mixed_or_statement.inc; delimiter |; CREATE TABLE t1 (a INT PRIMARY KEY)| |