diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-28 17:10:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-29 15:20:33 +0300 |
| commit | e04bbf73dc372917cbcdaa965fdc69e8b575d75f (patch) | |
| tree | ae000be72c0db68e6671298d2f217fb642f39021 /storage/innobase | |
| parent | 4b0070f642eb20472991de3a201378534f6f1bd4 (diff) | |
| download | mariadb-git-e04bbf73dc372917cbcdaa965fdc69e8b575d75f.tar.gz | |
MDEV-25496 Assertion 'trx->bulk_insert' failed on INSERT
row_get_prebuilt_insert_row(): Remove some fallback code that had been
added in commit 8ea923f55b7666a359ac2c54f6c10e8609d16846 (MDEV-24818).
It seems that after all, statement boundaries are being reliably
indicated by ha_innobase::start_stmt() or
(for partitioned tables) ha_innobase::external_lock().
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 4adc279fb32..bb85e82cbb8 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -1051,13 +1051,6 @@ row_get_prebuilt_insert_row( if (prebuilt->trx_id == table->def_trx_id && prebuilt->ins_node->entry_list.size() == UT_LIST_GET_LEN(table->indexes)) { - - if (prebuilt->trx->bulk_insert - && prebuilt->ins_node->trx_id - != prebuilt->trx->id) { - prebuilt->trx->bulk_insert = false; - } - return(prebuilt->ins_node->row); } |