summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-06-12 16:28:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-06-12 16:28:45 +0300
commit90fec9602f2e24abd9cbb3cd2e1cadaa436a7ceb (patch)
treef73865336bfd46af7fdcc293528e7ebb8e00ba87 /plugin
parent94e665596d13191da49c12469178a44d9ebae82a (diff)
parentefc3cb9322df26e957f55dcd42f679251e273c68 (diff)
downloadmariadb-git-90fec9602f2e24abd9cbb3cd2e1cadaa436a7ceb.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'plugin')
-rw-r--r--plugin/wsrep_info/mysql-test/wsrep_info/my.cnf1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
index 70682178ca1..52c7789e9f7 100644
--- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
+++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
@@ -5,7 +5,6 @@
wsrep-on=1
binlog-format=row
innodb-autoinc-lock-mode=2
-innodb-locks-unsafe-for-binlog=1
wsrep-cluster-address=gcomm://
wsrep_provider=@ENV.WSREP_PROVIDER