Commit 0a837698 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

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.
parent 1d1d8651
...@@ -274,6 +274,8 @@ os_cond_module_init(void) ...@@ -274,6 +274,8 @@ os_cond_module_init(void)
#ifdef __WIN__ #ifdef __WIN__
HMODULE h_dll; HMODULE h_dll;
if (!srv_use_native_conditions)
return;
h_dll = GetModuleHandle("kernel32"); h_dll = GetModuleHandle("kernel32");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment