revision-id: e4f69dbc66ebcddf3a3135a62285d84ddcc2fcaa (mariadb-10.1.38-49-ge4f69dbc66e) parent(s): 3b2a568589006681a91ba73cfac5ccbbb4ec77c2 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-13 11:38:09 +0200 message: 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. --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) {