diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 23:21:37 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 23:21:37 +0200 |
| commit | 29bf657581d0725dcd4519b7e956923804288baf (patch) | |
| tree | d0466ca4034e1d07eff0edc5392f8e0818a15349 /sql | |
| parent | bb1c6bf6e42f74276c67fcaac9eb1b0891fadb01 (diff) | |
| parent | 167d54cd63795a91b4e9b10226504b632c3b33b7 (diff) | |
| download | mariadb-git-29bf657581d0725dcd4519b7e956923804288baf.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/knielsen/tmp-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ef2f52a33df..004b1761c77 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -986,6 +986,10 @@ static void __cdecl kill_server(int sig_ptr) pthread_join(select_thread, NULL); // wait for main thread #endif /* __NETWARE__ */ +#if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2)) + my_thread_end(); +#endif + pthread_exit(0); /* purecov: deadcode */ #endif /* EMBEDDED_LIBRARY */ |