diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 07:36:47 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 07:36:47 +0200 |
| commit | 4a3d51c76c131e7b5348d7c714a619f82de32d39 (patch) | |
| tree | 4fb180861c733e364af930529565a7b799c4833a /plugin | |
| parent | d9fe615ef6862c85c5aada96d4f5b62b7093177c (diff) | |
| parent | 50653e021f1678c3c28c6b5886fadb9fcf8d87ff (diff) | |
| download | mariadb-git-4a3d51c76c131e7b5348d7c714a619f82de32d39.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/my.cnf | 1 |
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 |