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 /sql/des_key_file.cc | |
| parent | 39a158221ddac1c83766fe0b4635d854a664f262 (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-68cfabcc10b194e651aa681d804fc15754744204.tar.gz | |
merge
Diffstat (limited to 'sql/des_key_file.cc')
| -rw-r--r-- | sql/des_key_file.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc index 317cb237360..87ad6ff12b0 100644 --- a/sql/des_key_file.cc +++ b/sql/des_key_file.cc @@ -43,7 +43,7 @@ load_des_key_file(const char *file_name) DBUG_ENTER("load_des_key_file"); DBUG_PRINT("enter",("name: %s",file_name)); - VOID(pthread_mutex_lock(&LOCK_des_key_file)); + pthread_mutex_lock(&LOCK_des_key_file); if ((file=my_open(file_name,O_RDONLY | O_BINARY ,MYF(MY_WME))) < 0 || init_io_cache(&io, file, IO_SIZE*2, READ_CACHE, 0, 0, MYF(MY_WME))) goto error; @@ -96,7 +96,7 @@ error: my_close(file,MYF(0)); end_io_cache(&io); } - VOID(pthread_mutex_unlock(&LOCK_des_key_file)); + pthread_mutex_unlock(&LOCK_des_key_file); DBUG_RETURN(result); } #endif /* HAVE_OPENSSL */ |