diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /mysys/my_safehash.h | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'mysys/my_safehash.h')
| -rw-r--r-- | mysys/my_safehash.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_safehash.h b/mysys/my_safehash.h index 8a5856b6763..b5c0ca6634b 100644 --- a/mysys/my_safehash.h +++ b/mysys/my_safehash.h @@ -39,9 +39,7 @@ typedef struct st_safe_hash_entry typedef struct st_safe_hash_with_default { -#ifdef THREAD rw_lock_t mutex; -#endif HASH hash; uchar *default_value; SAFE_HASH_ENTRY *root; |