diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-07 23:51:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-07 23:51:18 +0400 |
| commit | 314350a722e65081472113c53657ad239f3bef72 (patch) | |
| tree | 8b72cd2bf6f2b352b379dbfcbb1a99a48c422335 /sql/sys_vars.cc | |
| parent | 39e31671935bc019f556e945571f37d2d1f3a77f (diff) | |
| parent | c619fbeafe8d5019e37fcb7ba5e1a6ce2d431270 (diff) | |
| download | mariadb-git-314350a722e65081472113c53657ad239f3bef72.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index bbd5777fa15..c2a5e183187 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -456,11 +456,22 @@ static bool binlog_format_check(sys_var *self, THD *thd, set_var *var) push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, "MariaDB Galera and flashback do not support binlog format: %s", binlog_format_names[var->save_result.ulonglong_value]); + /* + We allow setting up binlog_format other then ROW for session scope when + wsrep/flasback is enabled.This is done because of 2 reasons + 1. User might want to run pt-table-checksum. + 2. SuperUser knows what is doing :-) + For refrence:- MDEV-7322 + */ if (var->type == OPT_GLOBAL) { - WSREP_ERROR("MariaDB Galera and flashback do not support binlog format: %s", - binlog_format_names[var->save_result.ulonglong_value]); + if (WSREP(thd)) + WSREP_ERROR("MariaDB Galera does not support binlog format: %s", + binlog_format_names[var->save_result.ulonglong_value]); + else + my_error(ER_FLASHBACK_NOT_SUPPORTED,MYF(0),"binlog_format", + binlog_format_names[var->save_result.ulonglong_value]); return true; } } |