mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
commit
9fa4492a38
67 changed files with 13605 additions and 23 deletions
|
|
@ -175,7 +175,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax,
|
|||
|
||||
/* for compilers which can not handle inline */
|
||||
static
|
||||
#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi)
|
||||
#if !defined(__USLC__) && !defined(__sgi)
|
||||
inline
|
||||
#endif
|
||||
unsigned int rec_hashnr(HASH *hash,const byte *record)
|
||||
|
|
|
|||
|
|
@ -37,8 +37,7 @@
|
|||
#include <my_bitmap.h>
|
||||
#include <m_string.h>
|
||||
|
||||
|
||||
static inline void bitmap_lock(MY_BITMAP *map)
|
||||
static inline void bitmap_lock(MY_BITMAP* map)
|
||||
{
|
||||
#ifdef THREAD
|
||||
if (map->mutex)
|
||||
|
|
@ -46,8 +45,7 @@ static inline void bitmap_lock(MY_BITMAP *map)
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
static inline void bitmap_unlock(MY_BITMAP *map)
|
||||
static inline void bitmap_unlock(MY_BITMAP* map)
|
||||
{
|
||||
#ifdef THREAD
|
||||
if (map->mutex)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue