diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
| commit | f222e7d471079cd164d6cc822fce311b67b92ecd (patch) | |
| tree | a834a40945875291c62f9b9c713728db3a9a1949 /sql/wsrep_var.cc | |
| parent | 61bda9a2f0017b1fbe88c63a0ada68ad1024a72c (diff) | |
| download | mariadb-git-f222e7d471079cd164d6cc822fce311b67b92ecd.tar.gz | |
Merge fixes, now at level 3430 in mariadb-galera-5.5
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 94ac902506f..17e8de9ba6b 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -476,11 +476,11 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var) bool new_wsrep_desync = var->value->val_bool(); if (wsrep_desync == new_wsrep_desync) { if (new_wsrep_desync) { - push_warning (thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning (thd, Sql_condition::WARN_LEVEL_WARN, ER_WRONG_VALUE_FOR_VAR, "'wsrep_desync' is already ON."); } else { - push_warning (thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning (thd, Sql_condition::WARN_LEVEL_WARN, ER_WRONG_VALUE_FOR_VAR, "'wsrep_desync' is already OFF."); } |