diff options
| author | Magne Mahre <magne.mahre@oracle.com> | 2011-01-11 10:07:37 +0100 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@oracle.com> | 2011-01-11 10:07:37 +0100 |
| commit | 8ede0759c30bb49025b466a69951d5f36d2b6b92 (patch) | |
| tree | 5aa89e155e701ad4709cbd1e6a9efc5b5f1bb755 /storage/heap/heapdef.h | |
| parent | 5511a9d7ba6e60cfff30ae414155e8aba6e3d30a (diff) | |
| download | mariadb-git-8ede0759c30bb49025b466a69951d5f36d2b6b92.tar.gz | |
Remove configuration preprocessor symbols 'THREAD'
and 'THREAD_SAFE_CLIENT'.
As of MySQL 5.5, we no longer support non-threaded
builds. This patch removes all references to the
obsolete THREAD and THREAD_SAFE_CLIENT preprocessor
symbols. These were used to distinguish between
threaded and non-threaded builds.
Diffstat (limited to 'storage/heap/heapdef.h')
| -rw-r--r-- | storage/heap/heapdef.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/heap/heapdef.h b/storage/heap/heapdef.h index bc3c6bf7239..87866678c2f 100644 --- a/storage/heap/heapdef.h +++ b/storage/heap/heapdef.h @@ -17,9 +17,7 @@ #include <my_base.h> /* This includes global */ C_MODE_START -#ifdef THREAD #include <my_pthread.h> -#endif #include "heap.h" /* Structs & some defines */ #include "my_tree.h" @@ -102,14 +100,11 @@ extern void hp_clear(HP_SHARE *info); extern void hp_clear_keys(HP_SHARE *info); extern uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, key_part_map keypart_map); -#ifdef THREAD + extern mysql_mutex_t THR_LOCK_heap; -#endif #ifdef HAVE_PSI_INTERFACE -#ifdef THREAD extern PSI_mutex_key hp_key_mutex_HP_SHARE_intern_lock; -#endif /* THREAD */ void init_heap_psi_keys(); #endif /* HAVE_PSI_INTERFACE */ |