diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-03-12 20:17:32 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-03-12 20:17:32 -0700 |
| commit | f87b3ee44deb4221b525a16a376e2e1f77d964d9 (patch) | |
| tree | 479dd490b5d379c89c00078b36cfb7a02d867866 /sql/sql_class.cc | |
| parent | 76d77185fe6d4a2d66aed021e3aa42643e6a63a9 (diff) | |
| download | mariadb-git-f87b3ee44deb4221b525a16a376e2e1f77d964d9.tar.gz | |
untested changes to close socket on slave stop for OS's that do not
interrupt I/O after thr_alarm_kill()
test case for order by desc coredump
mysql-test/t/order_by.test:
added test case for order by desc bug
sql/slave.cc:
close socket on slave stop
sql/slave.h:
close socket on slave stop
sql/sql_class.cc:
close socket on slave stop
sql/sql_class.h:
close socket on slave stop
sql/sql_parse.cc:
changed kill_one_thread to use prepare_to_die()
sql/sql_repl.cc:
close socket on slave stop
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 30eeb2e5e2c..1bced49be57 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -84,6 +84,10 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), query_start_used=0; query_length=col_access=0; query_error=0; +#ifdef STOP_IO_WITH_FD_CLOSE + active_fd = -1; + pthread_mutex_init(&active_fd_lock, NULL); +#endif server_id = ::server_id; server_status=SERVER_STATUS_AUTOCOMMIT; next_insert_id=last_insert_id=0; @@ -182,6 +186,9 @@ THD::~THD() safeFree(ip); free_root(&mem_root,MYF(0)); mysys_var=0; // Safety (shouldn't be needed) +#ifdef STOP_IO_WITH_FD_CLOSE + pthread_mutex_destroy(&active_fd_lock); +#endif DBUG_VOID_RETURN; } |