diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-01-22 17:46:33 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-01-23 01:06:31 +0200 |
| commit | 31031a52da6e88d27c3149b06d9beb9704d0b96c (patch) | |
| tree | 33b1b0930cc552a04679734b4e569849e644260f /sql/sys_vars.cc | |
| parent | beeacd228792a082bbb6c2c12c9fea543a7a2394 (diff) | |
| download | mariadb-git-31031a52da6e88d27c3149b06d9beb9704d0b96c.tar.gz | |
MDEV-11870 Message "MariaDB Galera and flashback does not support"
Fixed the typo, updated result file and suppression in the test
file which did not work anyway
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 057e18f8f06..c21fc4f7f49 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -454,12 +454,12 @@ static bool binlog_format_check(sys_var *self, THD *thd, set_var *var) { // Push a warning to the error log. push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, - "MariaDB Galera and flashback does not support binlog format: %s", + "MariaDB Galera and flashback do not support binlog format: %s", binlog_format_names[var->save_result.ulonglong_value]); if (var->type == OPT_GLOBAL) { - WSREP_ERROR("MariaDB Galera and flashback does not support binlog format: %s", + WSREP_ERROR("MariaDB Galera and flashback do not support binlog format: %s", binlog_format_names[var->save_result.ulonglong_value]); return true; } |