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-19 16:24:10 +0200 |
| commit | 8375a2c1cec3c386f6db797d75f64b8f03c83b37 (patch) | |
| tree | 3ccb76d486f6949dd9120d85884366da7f0feff6 /storage/innobase/dict/dict0crea.cc | |
| parent | c35b8c46b404d035e54a23d667da5dff6502fc2e (diff) | |
| download | mariadb-git-8375a2c1cec3c386f6db797d75f64b8f03c83b37.tar.gz | |
MDEV-11585 Hard-code the shared InnoDB temporary tablespace ID at -1
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/dict/dict0crea.cc')
| -rw-r--r-- | storage/innobase/dict/dict0crea.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index 2d891854c03..cfea64d51c2 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -571,8 +571,7 @@ dict_build_tablespace_for_table( supports Redundant and Compact */ ut_ad(dict_tf_get_rec_format(table->flags) != REC_FORMAT_COMPRESSED); - table->space = static_cast<uint32_t>( - srv_tmp_space.space_id()); + table->space = SRV_TMP_SPACE_ID; } else { /* Create in the system tablespace. */ ut_ad(table->space == srv_sys_space.space_id()); |