From 98519db3416562928c62fc2c05355f1f4ffd9208 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Fri, 25 Apr 2014 10:58:51 -0400 Subject: [PATCH] MDEV#6171: Fix error message for split-brain Using my_message() (instead of my_error()) to send error message to the client. --- sql/sql_parse.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c6a81b878b3..e3db685b439 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -860,8 +860,9 @@ bool do_command(THD *thd) command != COM_TIME && command != COM_END ) { - my_error(ER_UNKNOWN_COM_ERROR, MYF(0), - "WSREP has not yet prepared node for application use"); + my_message(ER_UNKNOWN_COM_ERROR, + "WSREP has not yet prepared node for application use", + MYF(0)); thd->protocol->end_statement(); return_value= FALSE; goto out; @@ -2407,8 +2408,9 @@ mysql_execute_command(THD *thd) strncmp(thd->query(), mysqldump_magic_str, mysqldump_magic_str_len)) { #endif /* DIRTY_HACK */ - my_error(ER_UNKNOWN_COM_ERROR, MYF(0), - "WSREP has not yet prepared node for application use"); + my_message(ER_UNKNOWN_COM_ERROR, + "WSREP has not yet prepared node for application use", + MYF(0)); goto error; #if DIRTY_HACK }