diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
commit | 52c66b56710046034fc631df4f3a165ba5a704f7 (patch) | |
tree | b7488b7a2e23cf4b596766c1c84f64235543757a /sql/sql_servers.cc | |
parent | 72a26125e21fc4c654a8a1c9c1841f79f62d4d7a (diff) | |
parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
download | mariadb-git-52c66b56710046034fc631df4f3a165ba5a704f7.tar.gz |
Manual merge/pull from mysql-next-mr.
Conflicts:
- sql/sql_insert.cc
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 b711a273ae8..cde0a5c5069 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -663,8 +663,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: @@ -770,7 +770,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 |