diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 19:51:14 +0200 |
| commit | 589cf8dbf3accf57673d7e2f7a4435f7eaf33565 (patch) | |
| tree | aa38a67d10f71fc781188341857e34d437fa9199 /sql/table.cc | |
| parent | a3531775b1efe06e2439a0c8ab668a2b69c859eb (diff) | |
| parent | e30a05f4540b581df2e7d98bd7e812aeff603744 (diff) | |
| download | mariadb-git-589cf8dbf3accf57673d7e2f7a4435f7eaf33565.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 38777de34a7..084b441e4c6 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -8499,7 +8499,7 @@ int TABLE::period_make_insert(Item *src, Field *dst) { THD *thd= in_use; - file->store_auto_increment(); + ulonglong prev_insert_id= file->next_insert_id; store_record(this, record[1]); int res= src->save_in_field(dst, true); @@ -8519,7 +8519,7 @@ int TABLE::period_make_insert(Item *src, Field *dst) restore_record(this, record[1]); if (res) - file->restore_auto_increment(); + file->restore_auto_increment(prev_insert_id); return res; } |