Commit 98519db3 authored by Nirbhay Choubey's avatar Nirbhay Choubey

MDEV#6171: Fix error message for split-brain

Using my_message() (instead of my_error()) to send
error message to the client.
parent 2ab55902
...@@ -860,8 +860,9 @@ bool do_command(THD *thd) ...@@ -860,8 +860,9 @@ bool do_command(THD *thd)
command != COM_TIME && command != COM_TIME &&
command != COM_END command != COM_END
) { ) {
my_error(ER_UNKNOWN_COM_ERROR, MYF(0), my_message(ER_UNKNOWN_COM_ERROR,
"WSREP has not yet prepared node for application use"); "WSREP has not yet prepared node for application use",
MYF(0));
thd->protocol->end_statement(); thd->protocol->end_statement();
return_value= FALSE; return_value= FALSE;
goto out; goto out;
...@@ -2407,8 +2408,9 @@ mysql_execute_command(THD *thd) ...@@ -2407,8 +2408,9 @@ mysql_execute_command(THD *thd)
strncmp(thd->query(), mysqldump_magic_str, mysqldump_magic_str_len)) strncmp(thd->query(), mysqldump_magic_str, mysqldump_magic_str_len))
{ {
#endif /* DIRTY_HACK */ #endif /* DIRTY_HACK */
my_error(ER_UNKNOWN_COM_ERROR, MYF(0), my_message(ER_UNKNOWN_COM_ERROR,
"WSREP has not yet prepared node for application use"); "WSREP has not yet prepared node for application use",
MYF(0));
goto error; goto error;
#if DIRTY_HACK #if DIRTY_HACK
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment