• unknown's avatar
    A patch for BUG#19723: kill of active connection yields · 91f00139
    unknown authored
    different error code depending on platform.
    
    On Mac OS X, KILL statement issued to kill the current
    connection would return a different error code and message than on
    other platforms ('MySQL server has gone away' instead of 'Shutdown
    in progress').
    
    The reason for this difference was that on Mac OS X we have macro
    SIGNAL_WITH_VIO_CLOSE defined. This macro forces KILL
    implementation to close the communication socket of the thread
    that is being killed. SIGNAL_WITH_VIO_CLOSE macro is defined on
    platforms where just sending a signal is not a reliable mechanism
    to interrupt the thread from sleeping on a blocking system call.
    In a nutshell, closing the socket is a hack to work around an
    operating system bug and awake the blocked thread no matter what.
    
    However, if the thread that is being killed is the same
    thread that issued KILL statement, closing the socket leads to a
    prematurely lost connection. At the same time it is not necessary
    to close the socket in this case, since the thread in question
    is not inside a blocking system call.
    
    The fix, therefore, is to not close the socket if the thread that
    is being killed is the same that issued KILL statement, even with
    defined SIGNAL_WITH_VIO_CLOSE.
    
    
    mysql-test/r/kill.result:
      Update result file.
    mysql-test/t/kill.test:
      Added a test case for BUG#19723: kill of active connection yields
      different error code depending on platform.
    sql/sql_class.cc:
      Call close_active_vio() only if we're killing another thread.
    91f00139
sql_class.cc 94.3 KB