Commit 50afc54e authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge fix for 36279

parents 9a063775 60d5e900
...@@ -320,8 +320,6 @@ static void my_win_init(void) ...@@ -320,8 +320,6 @@ static void my_win_init(void)
const char *targetKey = "Software\\MySQL" ; const char *targetKey = "Software\\MySQL" ;
DBUG_ENTER("my_win_init"); DBUG_ENTER("my_win_init");
setlocale(LC_CTYPE, ""); /* To get right sortorder */
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if _MSC_VER < 1300 #if _MSC_VER < 1300
/* /*
......
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