summaryrefslogtreecommitdiff
path: root/innobase/btr/btr0cur.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/btr0cur.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/btr0cur.c')
-rw-r--r--innobase/btr/btr0cur.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index 24f0447d55d..df24689a422 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -3180,7 +3180,7 @@ btr_store_big_rec_extern_fields(
ut_ad(mtr_memo_contains(local_mtr, dict_tree_get_lock(index->tree),
MTR_MEMO_X_LOCK));
- ut_ad(mtr_memo_contains(local_mtr, buf_block_align(data),
+ ut_ad(mtr_memo_contains(local_mtr, buf_block_align(rec),
MTR_MEMO_PAGE_X_FIX));
ut_a(index->type & DICT_CLUSTERED);
@@ -3315,7 +3315,13 @@ void
btr_free_externally_stored_field(
/*=============================*/
dict_index_t* index, /* in: index of the data, the index
- tree MUST be X-latched */
+ tree MUST be X-latched; if the tree
+ height is 1, then also the root page
+ must be X-latched! (this is relevant
+ in the case this function is called
+ from purge where 'data' is located on
+ an undo log page, not an index
+ page) */
byte* data, /* in: internally stored data
+ reference to the externally
stored part */