diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-25 10:18:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-01-25 10:18:14 +0200 |
| commit | 7bec00e131689f3601b0b176bf331e88bf8b7e1c (patch) | |
| tree | a61dfb5b80ec87fe8cf1f0a683cbef6f8bb86cf5 /storage | |
| parent | fd5e40fa1cb7875a5d9bab453d39f603eb5f25f9 (diff) | |
| parent | 1f9c1f09335080184d4e923e170eaf8b2335b646 (diff) | |
| download | mariadb-git-7bec00e131689f3601b0b176bf331e88bf8b7e1c.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index 03346337d3f..e0aed5d7d21 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/storage/innobase/btr/btr0cur.c @@ -408,7 +408,12 @@ btr_cur_search_to_nth_level( ut_ad(dict_index_check_search_tuple(index, tuple)); ut_ad(!dict_index_is_ibuf(index) || ibuf_inside(mtr)); ut_ad(dtuple_check_typed(tuple)); + ut_ad(index->page != FIL_NULL); + UNIV_MEM_INVALID(&cursor->up_match, sizeof cursor->up_match); + UNIV_MEM_INVALID(&cursor->up_bytes, sizeof cursor->up_bytes); + UNIV_MEM_INVALID(&cursor->low_match, sizeof cursor->low_match); + UNIV_MEM_INVALID(&cursor->low_bytes, sizeof cursor->low_bytes); #ifdef UNIV_DEBUG cursor->up_match = ULINT_UNDEFINED; cursor->low_match = ULINT_UNDEFINED; |