5.0 -> 5.1 merge

configure.in:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/ha_innodb.cc:
  manual merge
sql/sql_insert.cc:
  manual merge

1 files changed, 14 insertions, 8 deletions

diff --git a/vio/viosocket.c b/vio/viosocket.c
index 5e0ed20b039..710f7a93607 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -560,14 +560,20 @@ int vio_close_shared_memory(Vio * vio)
       Close all handlers. UnmapViewOfFile and CloseHandle return non-zero
       result if they are success.
     */
-    r= UnmapViewOfFile(vio->handle_map) || CloseHandle(vio->event_server_wrote) ||
-       CloseHandle(vio->event_server_read) || CloseHandle(vio->event_client_wrote) ||
-       CloseHandle(vio->event_client_read) || CloseHandle(vio->handle_file_map);
-    if (!r)
-    {
-      DBUG_PRINT("vio_error", ("close() failed, error: %d",r));
-      /* FIXME: error handling (not critical for MySQL) */
-    }
+    if (UnmapViewOfFile(vio->handle_map) == 0) 
+      DBUG_PRINT("vio_error", ("UnmapViewOfFile() failed"));
+    if (CloseHandle(vio->event_server_wrote) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->esw) failed"));
+    if (CloseHandle(vio->event_server_read) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->esr) failed"));
+    if (CloseHandle(vio->event_client_wrote) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->ecw) failed"));
+    if (CloseHandle(vio->event_client_read) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->ecr) failed"));
+    if (CloseHandle(vio->handle_file_map) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->hfm) failed"));
+    if (CloseHandle(vio->event_conn_closed) == 0)
+      DBUG_PRINT("vio_error", ("CloseHandle(vio->ecc) failed"));
   }
   vio->type= VIO_CLOSED;
   vio->sd=   -1;