Commit 20c04345 authored by unknown's avatar unknown
Browse files

fix indentation 

add space after comma
add space after equal
add comments in vio_close_shared_memory()


include/violite.h:
  fix indentation
sql-common/client.c:
  fix identation
sql/mysqld.cc:
  add space after comma
vio/vio.c:
  add space after equal
  fix identation
vio/viosocket.c:
  add space after comma
  add comments in vio_close_shared_memory()
parent 4e4b3db4

sql/mysqld.cc

+26 −19
Original line number Diff line number Diff line
@@ -3927,13 +3927,20 @@ pthread_handler_decl(handle_connections_shared_memory,arg) 
	      NullS);

      sql_perror(buff);

    }

    if (handle_client_file_map) CloseHandle(handle_client_file_map);

    if (handle_client_map)	UnmapViewOfFile(handle_client_map);

    if (event_server_wrote)	CloseHandle(event_server_wrote);

    if (event_server_read)	CloseHandle(event_server_read);

    if (event_client_wrote)	CloseHandle(event_client_wrote);

    if (event_client_read)	CloseHandle(event_client_read);

    if (event_conn_closed)	CloseHandle(event_conn_closed);

    if (handle_client_file_map) 

      CloseHandle(handle_client_file_map);

    if (handle_client_map)

      UnmapViewOfFile(handle_client_map);

    if (event_server_wrote)

      CloseHandle(event_server_wrote);

    if (event_server_read)

      CloseHandle(event_server_read);

    if (event_client_wrote)

      CloseHandle(event_client_wrote);

    if (event_client_read)

      CloseHandle(event_client_read);

    if (event_conn_closed)

      CloseHandle(event_conn_closed);

    delete thd;

  }

vio/viosocket.c

+14 −5
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ int vio_write_shared_memory(Vio * vio, const gptr buf, int size) 
  current_postion = buf;

  while (remain != 0)

  {

    if (WaitForSingleObject(vio->event_server_read,vio->net->write_timeout*1000) != WAIT_OBJECT_0)

    if (WaitForSingleObject(vio->event_server_read, vio->net->write_timeout*1000) 

                            != WAIT_OBJECT_0)

    {

      DBUG_RETURN(-1);

    };
@@ -467,7 +468,15 @@ int vio_close_shared_memory(Vio * vio) 
  DBUG_ENTER("vio_close_shared_memory");

  if (vio->type != VIO_CLOSED)

  {

    /*

      Set event_conn_closed for notification of both client and server that

      connection is closed

    */

    SetEvent(vio->event_conn_closed);

    /*

      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);

include/violite.h

+11 −11

File changed.

Contains only whitespace changes.

sql-common/client.c

+2 −2

File changed.

Contains only whitespace changes.

vio/vio.c

+11 −11

File changed.

Contains only whitespace changes.