diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-30 10:27:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-30 10:27:59 +0200 |
| commit | ffc0a08d05d98b282b7844a9d865747d8cf39ef3 (patch) | |
| tree | c3836e0f25ffe9c7e834f292c9527d3afd993b60 /sql/handler.cc | |
| parent | 071feae31958bdaaba37c896e9957a0e86112346 (diff) | |
| parent | 02e30069573b09f5d26b6c357cd8aee3e876385a (diff) | |
| download | mariadb-git-ffc0a08d05d98b282b7844a9d865747d8cf39ef3.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 78c61ddf70a..aa3815b2de3 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1513,7 +1513,8 @@ int ha_commit_trans(THD *thd, bool all) #if 1 // FIXME: This should be done in ha_prepare(). if (rw_trans || (thd->lex->sql_command == SQLCOM_ALTER_TABLE && - thd->lex->alter_info.flags & ALTER_ADD_SYSTEM_VERSIONING)) + thd->lex->alter_info.flags & ALTER_ADD_SYSTEM_VERSIONING && + is_real_trans)) { ulonglong trx_start_id= 0, trx_end_id= 0; for (Ha_trx_info *ha_info= trans->ha_list; ha_info; ha_info= ha_info->next()) |