diff options
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d6b1c76ea00..1462d705fbd 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -459,8 +459,12 @@ static bool binlog_format_check(sys_var *self, THD *thd, set_var *var) 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; } } |