manually merged

configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged

1 files changed, 12 insertions, 10 deletions

diff --git a/vio/vio.c b/vio/vio.c
index 39b5f843e5e..ea254e2ed5a 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -172,22 +172,24 @@ Vio *vio_new_win32pipe(HANDLE hPipe)
 #ifdef HAVE_SMEM
 Vio *vio_new_win32shared_memory(NET *net,HANDLE handle_file_map, HANDLE handle_map,
                                 HANDLE event_server_wrote, HANDLE event_server_read,
-                                HANDLE event_client_wrote, HANDLE event_client_read)
+                                HANDLE event_client_wrote, HANDLE event_client_read,
+                                HANDLE event_conn_closed)
 {
   Vio *vio;
   DBUG_ENTER("vio_new_win32shared_memory");
   if ((vio = (Vio*) my_malloc(sizeof(Vio),MYF(MY_WME))))
   {
     vio_reset(vio, VIO_TYPE_SHARED_MEMORY, 0, 0, TRUE);
-    vio->handle_file_map = handle_file_map;
-    vio->handle_map = handle_map;
-    vio->event_server_wrote = event_server_wrote;
-    vio->event_server_read = event_server_read;
-    vio->event_client_wrote = event_client_wrote;
-    vio->event_client_read = event_client_read;
-    vio->shared_memory_remain = 0;
-    vio->shared_memory_pos = handle_map;
-    vio->net = net;
+    vio->handle_file_map= handle_file_map;
+    vio->handle_map= handle_map;
+    vio->event_server_wrote= event_server_wrote;
+    vio->event_server_read= event_server_read;
+    vio->event_client_wrote= event_client_wrote;
+    vio->event_client_read= event_client_read;
+    vio->event_conn_closed= event_conn_closed;
+    vio->shared_memory_remain= 0;
+    vio->shared_memory_pos= handle_map;
+    vio->net= net;
     strmov(vio->desc, "shared memory");
   }
   DBUG_RETURN(vio);