diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2021-10-21 13:19:13 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2021-10-21 13:19:13 +0530 |
| commit | 49ab94a027d007bd3de4d3a359c0179f3012c29f (patch) | |
| tree | 63564f306d2cd50d532866cdc2e8f38a011fffed | |
| parent | 0ba5859324b9884d26db6b0024e73aec2c93359a (diff) | |
| download | mariadb-git-bb-10.7-MDEV-24621_revised.tar.gz | |
1) Hack to apply bulk buffer insert via versioning related call
2) Removed all the changes in ha_innodb.cc
3) Removed all the changes in row0ins.cc
4) Removed all the changes in trx0trx.cc
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 41186f543f3..3a14da20fc3 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -15584,7 +15584,7 @@ ha_innobase::extra( row_ins_duplicate_error_in_clust() will acquire a shared lock instead of an exclusive lock. */ stmt_boundary: - trx->bulk_insert_apply(); + //trx->bulk_insert_apply(); trx->end_bulk_insert(*m_prebuilt->table); trx->bulk_insert = false; break; @@ -15605,10 +15605,12 @@ ha_innobase::extra( if (trx->is_bulk_insert()) { /* Allow a subsequent INSERT into an empty table if !unique_checks && !foreign_key_checks. */ +#if 0 dberr_t err= trx->bulk_insert_apply(); if (err != DB_SUCCESS) { return err; } +#endif break; } goto stmt_boundary; diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 4e06341fcaa..6b8f18891c0 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -3368,12 +3368,13 @@ row_ins_index_entry( DBUG_SET("-d,row_ins_index_entry_timeout"); return(DB_LOCK_WAIT);}); +#if 0 auto it= thr_get_trx(thr)->check_bulk_buffer(index->table); if (it) { return it->bulk_insert_buffered( entry, index, thr_get_trx(thr)); } - +#endif if (index->is_primary()) { return row_ins_clust_index_entry(index, entry, thr, 0); } else { diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 391af89b612..8e361a5c477 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1637,7 +1637,7 @@ trx_mark_sql_stat_end( /* MDEV-25036 FIXME */ /* InnoDB supports buffered insert only for the first insert statement */ - trx->bulk_insert_apply(); + //trx->bulk_insert_apply(); /* Allow a subsequent INSERT into an empty table if !unique_checks && !foreign_key_checks. */ return; |