summaryrefslogtreecommitdiff
path: root/storage/blackhole
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-25 16:46:45 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-25 16:46:45 +0300
commit3c11750e363da6e1017d5bc86e9e7e03b2c4e101 (patch)
tree3e8e0dbed8da743714f85fb19c404dce34319d8b /storage/blackhole
parente2a34cbf706926e10016079a094a2877eb2f4f18 (diff)
parentbe0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff)
downloadmariadb-git-3c11750e363da6e1017d5bc86e9e7e03b2c4e101.tar.gz
Auto-merge from mysql-next-mr.
Diffstat (limited to 'storage/blackhole')
-rw-r--r--storage/blackhole/ha_blackhole.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 27e4c919911..6aa090263d5 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -377,7 +377,7 @@ static int blackhole_init(void *p)
blackhole_hton->create= blackhole_create_handler;
blackhole_hton->flags= HTON_CAN_RECREATE;
- VOID(pthread_mutex_init(&blackhole_mutex, MY_MUTEX_INIT_FAST));
+ pthread_mutex_init(&blackhole_mutex, MY_MUTEX_INIT_FAST);
(void) my_hash_init(&blackhole_open_tables, system_charset_info,32,0,0,
(my_hash_get_key) blackhole_get_key,
(my_hash_free_key) blackhole_free_key, 0);