diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-08-23 16:49:42 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-08-23 16:49:42 +0530 |
| commit | 5077cc0b1a0d82c55ce6b6ec643f04099d0e8416 (patch) | |
| tree | eeca5d1938aa46bf6cbe6ebd375aee2f246e508d /plugin | |
| parent | 0aeff8c36add46db1de4287a9461d084b148c31f (diff) | |
| download | mariadb-git-5077cc0b1a0d82c55ce6b6ec643f04099d0e8416.tar.gz | |
Fix Merge Error
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/my.cnf | 2 |
1 files changed, 0 insertions, 2 deletions
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 |