diff options
author | unknown <serg@serg.mysql.com> | 2001-10-12 17:47:13 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-12 17:47:13 +0200 |
commit | 6db2120514c3e7442f69c99be017b2baa03bb09a (patch) | |
tree | 224ae04fa4b6a74f056f956de4f2ebb6423c1838 /innobase/btr/btr0btr.c | |
parent | 239e8da92637685a4112c99cb198e02f4d10fdc8 (diff) | |
parent | be31ffa2e46cac314694452b51935ec841b8f06e (diff) | |
download | mariadb-git-6db2120514c3e7442f69c99be017b2baa03bb09a.tar.gz |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/fulltext_order_by.result:
Auto merged
mysql-test/r/fulltext_multi.result:
Auto merged
mysql-test/r/fulltext_cache.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/r/fulltext_left_join.result:
Auto merged
sql/handler.h:
Auto merged
Diffstat (limited to 'innobase/btr/btr0btr.c')
-rw-r--r-- | innobase/btr/btr0btr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c index 6da323867fb..e4e957ea7b6 100644 --- a/innobase/btr/btr0btr.c +++ b/innobase/btr/btr0btr.c @@ -2347,6 +2347,8 @@ btr_validate_level( mtr_start(&mtr); + mtr_x_lock(dict_tree_get_lock(tree), &mtr); + page = btr_root_get(tree, &mtr); space = buf_frame_get_space_id(page); |