diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-16 16:36:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-16 16:36:54 +0200 |
| commit | d0ae4686fd9faab728082cb6ce063bf5eaa0773c (patch) | |
| tree | 4df9f65921166cea2c1e4486e59acf68ab721020 /storage/innobase/ibuf/ibuf0ibuf.cc | |
| parent | ce55094f4fee3c0ff2c58ac4dd3ef2c16c5e20c3 (diff) | |
| download | mariadb-git-bb-10.2-mdev-11585.tar.gz | |
MDEV-11585 Hard-code the shared InnoDB temporary tablespace ID at -1bb-10.2-mdev-11585
MySQL 5.7 supports only one shared temporary tablespace.
MariaDB 10.2 does not support any other shared InnoDB tablespaces than
the two predefined tablespaces: the persistent InnoDB system tablespace
(default file name ibdata1) and the temporary tablespace
(default file name ibtmp1).
InnoDB is unnecessarily allocating a tablespace ID for the predefined
temporary tablespace on every startup, and it is in several places
testing whether a tablespace ID matches this dynamically generated ID.
We should use a compile-time constant to reduce code size and to avoid
unnecessary updates to the DICT_HDR page at every startup.
Using a hard-coded tablespace ID will should make it easier to remove the
TEMPORARY flag from FSP_SPACE_FLAGS in MDEV-11202.
Diffstat (limited to 'storage/innobase/ibuf/ibuf0ibuf.cc')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index e9ad1a9d8c0..4b1c3704123 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -3727,9 +3727,10 @@ ibuf_insert( op, page_id.space(), page_id.page_no())); ut_ad(dtuple_check_typed(entry)); - ut_ad(page_id.space() != srv_tmp_space.space_id()); + ut_ad(page_id.space() != SRV_TMP_SPACE_ID); ut_a(!dict_index_is_clust(index)); + ut_ad(!dict_table_is_temporary(index->table)); no_counter = use <= IBUF_USE_INSERT; |