database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merging changes from maria-5.5-galera and

Browse Source 
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
This commit is contained in:
Nirbhay Choubey
2014-05-22 18:31:04 -04:00
parent 0bf3ed12a5
commit ab4947463e
22 changed files with 425 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@ -1071,8 +1071,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;
@ -2642,8 +2643,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
}