diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 20:30:18 +0300 |
| commit | 01209de7637a7206c18788e08919b5ccf0b3d700 (patch) | |
| tree | cb436bf0815ce83cda99844a256a0cde359d2f03 /plugin | |
| parent | 352d27ce36bc807f0c3c803e192ad1851f7f86a0 (diff) | |
| parent | bbfd53cd32c1cf8be30f1d18225adb7fc5f6faf9 (diff) | |
| download | mariadb-git-01209de7637a7206c18788e08919b5ccf0b3d700.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1
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 |