diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-25 15:20:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-25 15:20:14 +0100 |
| commit | 68cfabcc10b194e651aa681d804fc15754744204 (patch) | |
| tree | e06536a82dab9f0549416006195fc1371ff528db /storage/federated | |
| parent | 39a158221ddac1c83766fe0b4635d854a664f262 (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-68cfabcc10b194e651aa681d804fc15754744204.tar.gz | |
merge
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 05be8b27a8b..c582adc43e6 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -465,7 +465,7 @@ int federated_db_init(void *p) DBUG_RETURN(FALSE); } - VOID(pthread_mutex_destroy(&federated_mutex)); + pthread_mutex_destroy(&federated_mutex); error: DBUG_RETURN(TRUE); } @@ -484,7 +484,7 @@ error: int federated_done(void *p) { my_hash_free(&federated_open_tables); - VOID(pthread_mutex_destroy(&federated_mutex)); + pthread_mutex_destroy(&federated_mutex); return 0; } @@ -1562,7 +1562,7 @@ static int free_share(FEDERATED_SHARE *share) { my_hash_delete(&federated_open_tables, (uchar*) share); thr_lock_delete(&share->lock); - VOID(pthread_mutex_destroy(&share->mutex)); + pthread_mutex_destroy(&share->mutex); free_root(&mem_root, MYF(0)); } pthread_mutex_unlock(&federated_mutex); |