database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV#6171: Fix error message for split-brain

Browse Source 
Using my_message() (instead of my_error()) to send
error message to the client.
This commit is contained in:
Nirbhay Choubey
2014-04-25 10:58:51 -04:00
parent 2ab559023a
commit 98519db341
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@ -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)
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
} }