diff options
author | unknown <knielsen@mysql.com> | 2006-03-13 16:07:00 +0100 |
---|---|---|
committer | unknown <knielsen@mysql.com> | 2006-03-13 16:07:00 +0100 |
commit | 357007b3b4d1bc2b6ab1882800baf05c28c3b89b (patch) | |
tree | da9de10edd1cabd451b73701158e76bc67447e79 /storage/innobase | |
parent | 5a07a0986b6c7fed55a8b3324296d50009fc15d6 (diff) | |
download | mariadb-git-357007b3b4d1bc2b6ab1882800baf05c28c3b89b.tar.gz |
Misc. portability compile fixes.
sql/log_event.cc:
Fix Windows compile errors.
storage/innobase/btr/btr0sea.c:
Fix AIX compile error (declarations must come before code in traditional C).
sql/sql_class.h:
Fix HPUX compile problem (HP compiler bug).
Local class of member in derived class has no access to protected members,
so make the class global and a friend.
sql/sql_insert.cc:
Fix HPUX compile problem (HP compiler bug).
Local class of member in derived class has no access to protected members,
so make the class global and a friend.
Diffstat (limited to 'storage/innobase')
-rw-r--r-- | storage/innobase/btr/btr0sea.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c index a2f571f11e9..d8c3cfb7eda 100644 --- a/storage/innobase/btr/btr0sea.c +++ b/storage/innobase/btr/btr0sea.c @@ -1604,12 +1604,12 @@ btr_search_validate(void) mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; - *offsets_ = (sizeof offsets_) / sizeof *offsets_; - /* How many cells to check before temporarily releasing btr_search_latch. */ ulint chunk_size = 10000; + *offsets_ = (sizeof offsets_) / sizeof *offsets_; + rw_lock_x_lock(&btr_search_latch); cell_count = hash_get_n_cells(btr_search_sys->hash_index); |