diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
| commit | f192b48d620d0e412a8324dda65a143c2852619e (patch) | |
| tree | 2744c49103142a1db66e2836055c0ec21dffc7cc /storage/xtradb/fsp/fsp0fsp.cc | |
| parent | 71931fdf837b88e003998d12442a41c4f2c08c4a (diff) | |
| parent | 11352d52cd35f89b1d573405fca92932e112cba9 (diff) | |
| download | mariadb-git-f192b48d620d0e412a8324dda65a143c2852619e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/fsp/fsp0fsp.cc')
| -rw-r--r-- | storage/xtradb/fsp/fsp0fsp.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/storage/xtradb/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp.cc index df8c6ffe222..a2c11224ffd 100644 --- a/storage/xtradb/fsp/fsp0fsp.cc +++ b/storage/xtradb/fsp/fsp0fsp.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -2044,15 +2045,6 @@ fseg_create_general( mtr_x_lock(latch, mtr); - if (rw_lock_get_x_lock_count(latch) == 1) { - /* This thread did not own the latch before this call: free - excess pages from the insert buffer free list */ - - if (space == IBUF_SPACE_ID) { - ibuf_free_excess_pages(); - } - } - if (!has_done_reservation) { success = fsp_reserve_free_extents(&n_reserved, space, 2, FSP_NORMAL, mtr); @@ -2623,15 +2615,6 @@ fseg_alloc_free_page_general( mtr_x_lock(latch, mtr); - if (rw_lock_get_x_lock_count(latch) == 1) { - /* This thread did not own the latch before this call: free - excess pages from the insert buffer free list */ - - if (space == IBUF_SPACE_ID) { - ibuf_free_excess_pages(); - } - } - inode = fseg_inode_get(seg_header, space, zip_size, mtr); if (!has_done_reservation |