diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 20:00:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:41 +0100 |
| commit | 0508d327aef520d3131ff8a85ed610337149fffc (patch) | |
| tree | 7e04769f49b4aded9053adcad442fe00eb487d98 /sql/mysqld.cc | |
| parent | bb8c82c66abddf796e8d44f817518e5ab38ae6e4 (diff) | |
| parent | 34db9958e28c325b0f708f78b7ff029de810d5ea (diff) | |
| download | mariadb-git-0508d327aef520d3131ff8a85ed610337149fffc.tar.gz | |
Merge branch '10.1' into 10.2
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 1352bb64be8..b985607eeb1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9613,7 +9613,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr) global_system_variables.binlog_format= BINLOG_FORMAT_ROW; } - if (!opt_bootstrap && WSREP_PROVIDER_EXISTS && + if (!opt_bootstrap && WSREP_PROVIDER_EXISTS && WSREP_ON && global_system_variables.binlog_format != BINLOG_FORMAT_ROW) { |