mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal:/home/bk/mysql-5.1-new

Browse source 
into  mysql.com:/usr/local/mysql/tmp-5.1


libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge.
This commit is contained in:
unknown 2006-05-17 15:09:40 +02:00
commit 15e4938baa
8 changed files with 247 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/mysqld.cc
View file

@ -1075,6 +1075,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 */