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

Merge 10.5 -> 10.6

Browse Source 
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2024-12-05 09:20:36 +01:00
parent cefdc3e67d 2ab10fbec2
commit 0166c89e02
31 changed files with 578 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@@ -1157,7 +1157,8 @@ static bool wsrep_command_no_result(char command)
{
return (command == COM_STMT_FETCH ||
command == COM_STMT_SEND_LONG_DATA ||
command == COM_STMT_CLOSE);
command == COM_STMT_CLOSE ||
command == COM_STMT_PREPARE);
}
#endif /* WITH_WSREP */
#ifndef EMBEDDED_LIBRARY
@@ -2397,6 +2398,10 @@ resume:
{
WSREP_DEBUG("THD is killed at dispatch_end");
}
if (thd->lex->sql_command != SQLCOM_SET_OPTION)
{
DEBUG_SYNC(thd, "wsrep_at_dispatch_end_before_result");
}
wsrep_after_command_before_result(thd);
if (wsrep_current_error(thd) && !wsrep_command_no_result(command))
{