diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-08-08 18:01:33 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-08-08 18:01:33 +0200 |
| commit | 0a837698959111a5dbbaf4c9bf9af39d4f6fdba2 (patch) | |
| tree | 2c48325bbc7efd0fddf15d2fcabe6e33f2c87093 | |
| parent | 1d1d8651d3c4d398ec7f9988d56c88086ea19668 (diff) | |
| download | mariadb-git-0a837698959111a5dbbaf4c9bf9af39d4f6fdba2.tar.gz | |
LPBUG#882689 - crash during startup on XP.
The reason for the crash is Innodb assertion after trying to load condition variables function
dynamically and not finding them
The fix is to skip dynamic loading if srv_use_native_conditions is FALSE. srv_use_native_conditions
is derived from Windows version and would be FALSE on XP and TRUE on later Windows.
This is the same handling as in MySQL 5.. In Maria 5.3 srv_use_native_conditions check was
presumably lost in the downporting.
| -rw-r--r-- | storage/xtradb/os/os0sync.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/xtradb/os/os0sync.c b/storage/xtradb/os/os0sync.c index 75bd6d44c2e..12153c309c0 100644 --- a/storage/xtradb/os/os0sync.c +++ b/storage/xtradb/os/os0sync.c @@ -274,6 +274,8 @@ os_cond_module_init(void) #ifdef __WIN__ HMODULE h_dll; + if (!srv_use_native_conditions) + return; h_dll = GetModuleHandle("kernel32"); |