From f222e7d471079cd164d6cc822fce311b67b92ecd Mon Sep 17 00:00:00 2001 From: Seppo Jaakola Date: Mon, 7 Oct 2013 11:35:19 +0300 Subject: Merge fixes, now at level 3430 in mariadb-galera-5.5 --- sql/wsrep_var.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/wsrep_var.cc') 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."); } -- cgit v1.2.1