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

bzr merge -r4123..4144 codership/5.6

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-09-30 18:06:15 -04:00
parent c916085e27
commit 9a57de86be
68 changed files with 3065 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -975,12 +975,8 @@ bool do_command(THD *thd)
thd->wsrep_query_state= QUERY_EXEC;
mysql_mutex_unlock(&thd->LOCK_wsrep_thd);
}
if ((WSREP(thd) && packet_length == packet_error) ||
(!WSREP(thd) && (packet_length == packet_error)))
#else
if (packet_length == packet_error)
#endif /* WITH_WSREP */
if (packet_length == packet_error)
{
DBUG_PRINT("info",("Got error %d reading command from socket %s",
net->error,