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

Follow-up for Bug #55930 Assertion `thd->transaction.stmt.is_empty()

Browse Source 
|| thd->in_sub_stmt || (thd->state..

Don't rollback statement transactions if we are in a sub-statement.
This could for example happen for open_ltable() when opening the
general log during execution of a stored procedure.
This commit is contained in:
Jon Olav Hauglid
2010-10-14 11:02:37 +02:00
parent b5be2fbc8d
commit 5a57a45c66
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -5320,7 +5320,8 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
end: end:
if (table == NULL) if (table == NULL)
{ {
trans_rollback_stmt(thd); if (!thd->in_sub_stmt)
trans_rollback_stmt(thd);
close_thread_tables(thd); close_thread_tables(thd);
} }
thd_proc_info(thd, 0); thd_proc_info(thd, 0);