diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-05 21:04:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-09 12:05:07 +0200 |
| commit | c868acdf656213cdc081c4c965a1bcf3d22558bb (patch) | |
| tree | 4d778e25b6213938c5624afd393495a7d4b1d512 /storage/innobase/include/buf0buf.ic | |
| parent | b0266b6a606479f183315248e10eb1624200c06b (diff) | |
| download | mariadb-git-c868acdf656213cdc081c4c965a1bcf3d22558bb.tar.gz | |
MDEV-11487 Revert InnoDB internal temporary tables from WL#7682
WL#7682 in MySQL 5.7 introduced the possibility to create light-weight
temporary tables in InnoDB. These are called 'intrinsic temporary tables'
in InnoDB, and in MySQL 5.7, they can be created by the optimizer for
sorting or buffering data in query processing.
In MariaDB 10.2, the optimizer temporary tables cannot be created in
InnoDB, so we should remove the dead code and related data structures.
Diffstat (limited to 'storage/innobase/include/buf0buf.ic')
| -rw-r--r-- | storage/innobase/include/buf0buf.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index 6d602120e70..9ff2a1bfab5 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -926,7 +926,7 @@ buf_block_modify_clock_inc( #ifdef UNIV_DEBUG buf_pool_t* buf_pool = buf_pool_from_bpage((buf_page_t*) block); - /* No latch is acquired if block belongs to intrinsic table. */ + /* No latch is acquired for the shared temporary tablespace. */ if (!fsp_is_system_temporary(block->page.id.space())) { ut_ad((buf_pool_mutex_own(buf_pool) && (block->page.buf_fix_count == 0)) @@ -949,7 +949,7 @@ buf_block_get_modify_clock( buf_block_t* block) /*!< in: block */ { #ifdef UNIV_DEBUG - /* No latch is acquired if block belongs to intrinsic table. */ + /* No latch is acquired for the shared temporary tablespace. */ if (!fsp_is_system_temporary(block->page.id.space())) { ut_ad(rw_lock_own(&(block->lock), RW_LOCK_S) || rw_lock_own(&(block->lock), RW_LOCK_X) |