database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merged in change sets 3772-3779 from lp:codership-mysql/5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2012-08-30 12:22:37 +03:00
parent ebfa24b1d2
commit 8e84b9e740
15 changed files with 186 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -2535,7 +2535,7 @@ mysql_execute_command(THD *thd)
case SQLCOM_SHOW_STATUS:
{
#ifdef WITH_WSREP
if (WSREP_CLIENT(thd) && wsrep_causal_wait(thd)) goto error;
if (lex->sql_command == SQLCOM_SHOW_STATUS) wsrep_free_status(thd);
#endif /* WITH_WSREP */
execute_show_status(thd, all_tables);
break;