diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-24 16:54:59 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-24 16:54:59 +0300 |
| commit | 4cff617c2541279a53b92acbd4e4d8716dc54873 (patch) | |
| tree | 887f74eb880e4d9ff8b76ff93b221f7e6ec7fbe8 /sql/sql_servers.cc | |
| parent | 26cd9abe4fcc058004ad8e656ff5b6713c0118f4 (diff) | |
| download | mariadb-git-4cff617c2541279a53b92acbd4e4d8716dc54873.tar.gz | |
Backport of:
----------------------------------------------------------------------
ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0
Bug#32082 : definition of VOID in my_global.h conflicts with Windows
SDK headers
VOID macro is now removed. Its usage is replaced with void cast.
In some cases, where cast does not make much sense (pthread_*, printf,
hash_delete, my_seek), cast is ommited.
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index be86d1150b7..e5fe06ce39b 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -664,8 +664,8 @@ delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options) server->server_name, server->server_name_length)); - VOID(my_hash_delete(&servers_cache, (uchar*) server)); - + my_hash_delete(&servers_cache, (uchar*) server); + error= 0; end: @@ -771,7 +771,7 @@ int update_server_record_in_cache(FOREIGN_SERVER *existing, /* delete the existing server struct from the server cache */ - VOID(my_hash_delete(&servers_cache, (uchar*)existing)); + my_hash_delete(&servers_cache, (uchar*)existing); /* Insert the altered server struct into the server cache |