summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/disabled.def1
-rw-r--r--mysql-test/t/flush2-master.opt2
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 53b73363c22..eaea7c710b0 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,5 +12,4 @@
ndb_load : Bug#17233
user_limits : Bug#23921 random failure of user_limits.test
-flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin
diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/t/flush2-master.opt
index ccbd01c91d3..789275fa25e 100644
--- a/mysql-test/t/flush2-master.opt
+++ b/mysql-test/t/flush2-master.opt
@@ -1 +1 @@
---disable-log-bin
+--skip-log-bin