2731 Vladislav Vaintroub 2008-09-01 [merge]
null merge from bugteam-5.1
2730 Vladislav Vaintroub 2008-09-01
Fix "make dist" error - remove Visual Studio project files from
distribution
modified:
extra/yassl/Makefile.am
extra/yassl/taocrypt/Makefile.am
2729 Vladislav Vaintroub 2008-09-01
Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.
Bug#33031 app linked to libmysql.lib crash if run as service in vista under
localsystem
There are some problems using DllMain hook functions on Windows that
automatically do global and per-thread initialization for libmysqld.dll
1)per-thread initialization(DLL_THREAD_ATTACH)
MySQL internally counts number of active threads that and causes a delay in in
my_end() if not all threads are exited. But,there are threads that can be
started either by Windows internally (often in TCP/IP scenarios) or by user
himself - those threads are not necessarily using libmysql.dll functionality,
but nonetheless the contribute to the count of open threads.
2)process-initialization (DLL_PROCESS_ATTACH)
my_init() calls WSAStartup that itself loads DLLs and can lead to a deadlock in
Windows loader.
Fix is to remove dll initialization code from libmysql.dll in general case. I
still leave an environment variable LIBMYSQL_DLLINIT, which if set to any value
will cause the old behavior (DLL init hooks will be called). This env.variable
exists only to prevent breakage of existing Windows-only applications that
don't do mysql_thread_init() and work ok today. Use of LIBMYSQL_DLLINIT is
discouraged and it will be removed in 6.0
modified:
libmysql/dll.c
=== modified file 'extra/yassl/Makefile.am'
--- a/extra/yassl/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/extra/yassl/Makefile.am 2008-09-01 21:27:14 +0000
@@ -1,6 +1,5 @@
SUBDIRS = taocrypt src testsuite
-EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \
- CMakeLists.txt
+EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
=== modified file 'extra/yassl/taocrypt/Makefile.am'
--- a/extra/yassl/taocrypt/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/extra/yassl/taocrypt/Makefile.am 2008-09-01 21:27:14 +0000
@@ -1,5 +1,5 @@
SUBDIRS = src test benchmark
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp)
+EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
# Don't update the files from bitkeeper
%::SCCS/s.%
| Thread |
|---|
| • bzr push into mysql-5.1 branch (vvaintroub:2729 to 2731) | Vladislav Vaintroub | 2 Sep |