diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
| commit | f66d1850ac30922eaa49c0131d89efc8357155ff (patch) | |
| tree | cb69c43694146bb7993078e76e203ded4ca48a5e /plugin | |
| parent | 772c5f3c78fcdaea2169ba435bac8d851c7945c7 (diff) | |
| parent | 1135244a647e423f6a7b2122ad9c305253039399 (diff) | |
| download | mariadb-git-f66d1850ac30922eaa49c0131d89efc8357155ff.tar.gz | |
Merge branch '10.3' into 10.4
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 1c7a8ad4122..8f62cfd0cc9 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf +++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf @@ -4,7 +4,6 @@ [mysqld] binlog-format=row innodb-autoinc-lock-mode=2 -innodb-locks-unsafe-for-binlog=1 wsrep_provider=@ENV.WSREP_PROVIDER [mysqld.1] |