diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-03-13 11:38:09 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-03-13 11:41:44 +0200 |
| commit | 691c3069531c066b7a71ddb17e9adaed886344c6 (patch) | |
| tree | 6bcc3033fe9334830aae331223555c8cb1b0ee52 /sql/mysqld.cc | |
| parent | 90ce95de4b6f44735487c700f2b14d5ca1c4a315 (diff) | |
| download | mariadb-git-691c3069531c066b7a71ddb17e9adaed886344c6.tar.gz | |
MDEV-14033: wsrep_on=off + binlog = mixed on MariaDB 10.2.9
If wsrep provider (i.e. galera library) is defined but wsrep_on=OFF
we should not force row binlog row format.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 813f0988b74..917a993ee0a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9494,7 +9494,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr) else global_system_variables.option_bits&= ~OPTION_BIG_SELECTS; - if (!opt_bootstrap && WSREP_PROVIDER_EXISTS && + if (!opt_bootstrap && WSREP_PROVIDER_EXISTS && WSREP_ON && global_system_variables.binlog_format != BINLOG_FORMAT_ROW) { |