diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-13 17:45:01 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-13 17:45:01 -0300 |
| commit | 1cf02d95a768198755f830e5eb83b7688bded66e (patch) | |
| tree | 3877d60cdb1c86ba99bcaeee0daf9942a9ad644b /sql-common | |
| parent | 10e90a1fe5154e78402fe4b3868e79d1f2076239 (diff) | |
| parent | 97dbd987f0f7d32b846b4ee7e311c8b35d1c431e (diff) | |
| download | mariadb-git-1cf02d95a768198755f830e5eb83b7688bded66e.tar.gz | |
Merge from mysql-5.0-bugteam.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 06ab3e0b632..5a9ea84b498 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -933,6 +933,9 @@ void end_server(MYSQL *mysql) { init_sigpipe_variables DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio))); +#ifdef MYSQL_SERVER + slave_io_thread_detach_vio(); +#endif set_sigpipe(mysql); vio_delete(mysql->net.vio); reset_sigpipe(mysql); |