summaryrefslogtreecommitdiff
path: root/innobase/include/sync0rw.ic
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-07-26 08:26:07 +0400
committerunknown <aivanov@mysql.com>2006-07-26 08:26:07 +0400
commit820840a02682dd12de5090db608ff669a7455008 (patch)
treec0c4b00da4e4a17001a2dbc33b0dfef6c84b554b /innobase/include/sync0rw.ic
parentd8bb59fc2f57de2a7676154a401ea16b70f8f773 (diff)
downloadmariadb-git-820840a02682dd12de5090db608ff669a7455008.tar.gz
Applied innodb-5.0-ss660 snapshot.
innobase/btr/btr0cur.c: Applied innodb-5.0-ss660 snapshot. btr_cur_search_to_nth_level(): Reacquire btr_search_latch after inserting to the insert buffer. This was noticed while analyzing Bug#19081 but this shold not fix this bug since according to Heikki, btr_search_latch is not reserved during an insert. innobase/ibuf/ibuf0ibuf.c: Applied innodb-5.0-ss660 snapshot. ibuf_fixed_addr_page(): Add parameter space. As the insert buffer B-tree is only located in the system tablespace (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0. innobase/include/sync0rw.ic: Applied innodb-5.0-ss660 snapshot. rw_lock_s_unlock_func(): Change a debug assertion to a production assertion in order to track down Bug#19081.
Diffstat (limited to 'innobase/include/sync0rw.ic')
-rw-r--r--innobase/include/sync0rw.ic2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/sync0rw.ic b/innobase/include/sync0rw.ic
index b1ae636010a..9e15475ae53 100644
--- a/innobase/include/sync0rw.ic
+++ b/innobase/include/sync0rw.ic
@@ -362,7 +362,7 @@ rw_lock_s_unlock_func(
/* Reset the shared lock by decrementing the reader count */
- ut_ad(lock->reader_count > 0);
+ ut_a(lock->reader_count > 0);
lock->reader_count--;
#ifdef UNIV_SYNC_DEBUG