From 5077cc0b1a0d82c55ce6b6ec643f04099d0e8416 Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Wed, 23 Aug 2017 16:49:42 +0530 Subject: Fix Merge Error --- plugin/wsrep_info/mysql-test/wsrep_info/my.cnf | 2 -- 1 file changed, 2 deletions(-) (limited to 'plugin') diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf index 4af933f1633..70682178ca1 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf +++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf @@ -8,8 +8,6 @@ innodb-autoinc-lock-mode=2 innodb-locks-unsafe-for-binlog=1 wsrep-cluster-address=gcomm:// wsrep_provider=@ENV.WSREP_PROVIDER -# enforce read-committed characteristics across the cluster -wsrep_causal_reads=ON [mysqld.1] #galera_port=@OPT.port -- cgit v1.2.1