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

Merge 11.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/spider/spd_db_mysql.cc
View File

@@ -2529,13 +2529,21 @@ int spider_db_mbase::commit(
int spider_db_mbase::rollback(
int *need_mon
) {
bool is_error;
bool is_error, save_in_before_query;
int error_num= 0;
DBUG_ENTER("spider_db_mbase::rollback");
DBUG_PRINT("info",("spider this=%p", this));
spider_lock_before_query(conn, need_mon);
if (spider_db_query(conn, SPIDER_SQL_ROLLBACK_STR,
SPIDER_SQL_ROLLBACK_LEN, -1, need_mon))
save_in_before_query= conn->in_before_query;
/*
We do not execute the before queries to avoid unnecessary
failures in rollback
*/
conn->in_before_query= TRUE;
error_num= spider_db_query(conn, SPIDER_SQL_ROLLBACK_STR,
SPIDER_SQL_ROLLBACK_LEN, -1, need_mon);
conn->in_before_query= save_in_before_query;
if (error_num)
{
is_error= conn->thd->is_error();
error_num= spider_db_errorno(conn);