summaryrefslogtreecommitdiff
path: root/innobase/btr/btr0btr.c
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2003-01-13 15:52:39 +0200
committerunknown <heikki@hundin.mysql.fi>2003-01-13 15:52:39 +0200
commitd0551ec55be01abbefdb244daf8dc074506276f9 (patch)
tree86b36cbd88f1b66a7c790eb9c632247d03023c72 /innobase/btr/btr0btr.c
parenteaebef2ab64b65a275c6ddeb5864326d2e3b0571 (diff)
downloadmariadb-git-d0551ec55be01abbefdb244daf8dc074506276f9.tar.gz
btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:
Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/row/row0purge.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/btr/btr0cur.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/btr/btr0btr.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/include/btr0btr.h: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/include/btr0cur.h: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
Diffstat (limited to 'innobase/btr/btr0btr.c')
-rw-r--r--innobase/btr/btr0btr.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c
index a1665aefab7..51c164b7cef 100644
--- a/innobase/btr/btr0btr.c
+++ b/innobase/btr/btr0btr.c
@@ -135,7 +135,7 @@ btr_page_insert_fits(
/******************************************************************
Gets the root node of a tree and x-latches it. */
-static
+
page_t*
btr_root_get(
/*=========*/
@@ -146,9 +146,6 @@ btr_root_get(
ulint space;
ulint root_page_no;
page_t* root;
-
- ut_ad(mtr_memo_contains(mtr, dict_tree_get_lock(tree), MTR_MEMO_X_LOCK)
- || mtr_memo_contains(mtr, dict_tree_get_lock(tree), MTR_MEMO_S_LOCK));
space = dict_tree_get_space(tree);
root_page_no = dict_tree_get_page(tree);
@@ -334,8 +331,6 @@ btr_page_alloc(
page_t* new_page;
ulint new_page_no;
- ut_ad(mtr_memo_contains(mtr, dict_tree_get_lock(tree),
- MTR_MEMO_X_LOCK));
if (tree->type & DICT_IBUF) {
return(btr_page_alloc_for_ibuf(tree, mtr));