diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-20 14:11:26 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-20 14:11:26 +0200 |
| commit | 3fa2803a7737cd01aea6babd1c601649cab7968c (patch) | |
| tree | 898b685d518963d9a6d7f6e604be7e6c3e68827f /include | |
| parent | efd91dff2cb010e792bea1e812d95513be24504a (diff) | |
| parent | bf9c8b8a104f9a0e61a1fb4aa867b8608f109345 (diff) | |
| download | mariadb-git-3fa2803a7737cd01aea6babd1c601649cab7968c.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.hasky
storage/maria/ma_key_recover.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/lf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/lf.h b/include/lf.h index 8d26efd1232..d4c5c64a01b 100644 --- a/include/lf.h +++ b/include/lf.h @@ -168,15 +168,15 @@ void lf_pinbox_destroy(LF_PINBOX *pinbox); lock_wrap(lf_pinbox_get_pins, LF_PINS *, (LF_PINBOX *pinbox, void *stack_end), (pinbox, stack_end), - &pinbox->pinarray.lock); + &pinbox->pinarray.lock) lock_wrap_void(lf_pinbox_put_pins, (LF_PINS *pins), (pins), - &pins->pinbox->pinarray.lock); + &pins->pinbox->pinarray.lock) lock_wrap_void(lf_pinbox_free, (LF_PINS *pins, void *addr), (pins, addr), - &pins->pinbox->pinarray.lock); + &pins->pinbox->pinarray.lock) /* memory allocator, lf_alloc-pin.c @@ -211,7 +211,7 @@ uint lf_alloc_pool_count(LF_ALLOCATOR *allocator); lock_wrap(lf_alloc_new, void *, (LF_PINS *pins), (pins), - &pins->pinbox->pinarray.lock); + &pins->pinbox->pinarray.lock) /* extendible hash, lf_hash.c |