summaryrefslogtreecommitdiff
path: root/mysql-test/suite/engines
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-09-21 22:02:21 +0200
committerSergei Golubchik <serg@mariadb.org>2017-09-21 22:02:21 +0200
commit2e3a16e3666ee1c4bdb15f9525eefe7e78ce1d91 (patch)
treeb6ae5d8147b45f46e2e9b46ab1c7c0954231b711 /mysql-test/suite/engines
parentbb7a70c9551c1756b1d1736ca4f6a0a965795873 (diff)
parent8d0448d5075fe822e37f81b740e83f03ab318448 (diff)
downloadmariadb-git-2e3a16e3666ee1c4bdb15f9525eefe7e78ce1d91.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/suite/engines')
-rw-r--r--mysql-test/suite/engines/funcs/t/rpl_insert.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/engines/funcs/t/rpl_insert.test b/mysql-test/suite/engines/funcs/t/rpl_insert.test
index 763a484ea5d..f57a6e226d1 100644
--- a/mysql-test/suite/engines/funcs/t/rpl_insert.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_insert.test
@@ -2,9 +2,9 @@
--echo # Bug#20821: INSERT DELAYED fails to write some rows to binlog
--echo #
---source include/master-slave.inc
--source include/not_embedded.inc
--source include/not_windows.inc
+--source include/master-slave.inc
--disable_warnings
CREATE SCHEMA IF NOT EXISTS mysqlslap;