diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-25 19:20:30 +0200 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2022-10-17 15:24:44 +0300 |
| commit | 2ac796320df049ba791c1d85ff6fa66c9793a4f4 (patch) | |
| tree | e8383de5e904f1704198da8509947f6f3f3ded14 | |
| parent | 776479dd5ade4cf9a574598c855b37799d6d5573 (diff) | |
| download | mariadb-git-2ac796320df049ba791c1d85ff6fa66c9793a4f4.tar.gz | |
remove handler::open_read_view()
use ht->start_consistent_snapshot() instead
| -rw-r--r-- | sql/handler.h | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 14 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 1 |
4 files changed, 1 insertions, 17 deletions
diff --git a/sql/handler.h b/sql/handler.h index 8490e53f11a..dc44742b160 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -3566,7 +3566,6 @@ public: /** to be actually called to get 'check()' functionality*/ int ha_check(THD *thd, HA_CHECK_OPT *check_opt); int ha_repair(THD* thd, HA_CHECK_OPT* check_opt); - virtual void open_read_view(){} void ha_start_bulk_insert(ha_rows rows, uint flags= 0) { DBUG_ENTER("handler::ha_start_bulk_insert"); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 6b0a3bef006..23b4a95f9d5 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -12040,7 +12040,7 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to, if (ht->start_consistent_snapshot) { thd->tx_isolation= ISO_REPEATABLE_READ; - from->file->open_read_view(); + error= ht->start_consistent_snapshot(ht, thd); } } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 8965ada4d46..d075338d55e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -21312,17 +21312,3 @@ buf_pool_size_align( return (size / m + 1) * m; } } - -void ha_innobase::open_read_view() -{ - trx_t *trx= m_prebuilt->trx; - auto thd_iso= thd_get_trx_isolation(m_user_thd); - - trx->isolation_level= innobase_map_isolation_level(thd_iso); - ut_ad(trx->isolation_level == TRX_ISO_REPEATABLE_READ); - ut_ad(!trx_is_started(trx)); - - trx_start_if_not_started_xa(trx, false); - - trx->read_view.open(m_prebuilt->trx); -} diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index b350b935d47..01acde3d8e6 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -444,7 +444,6 @@ public: const KEY_PART_INFO& old_part, const KEY_PART_INFO& new_part) const override; - void open_read_view() override; protected: dberr_t innobase_get_autoinc(ulonglong* value); dberr_t innobase_lock_autoinc(); |