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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-31 10:28:59 +03:00
parent 0bf843cd13 6da14d7b4a
commit 4a0b56f604
141 changed files with 3170 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_sequence.cc
View File

@ -354,8 +354,10 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *org_table_list)
seq->reserved_until= seq->start;
error= seq->write_initial_sequence(table);
trans_commit_stmt(thd);
trans_commit_implicit(thd);
if (trans_commit_stmt(thd))
error= 1;
if (trans_commit_implicit(thd))
error= 1;
if (!temporary_table)
{