merge fix for 36279

This commit is contained in:
Vladislav Vaintroub 2008-11-10 21:38:45 +01:00
commit 50afc54efa

View File

@ -320,8 +320,6 @@ static void my_win_init(void)
const char *targetKey = "Software\\MySQL" ;
DBUG_ENTER("my_win_init");
setlocale(LC_CTYPE, ""); /* To get right sortorder */
#if defined(_MSC_VER)
#if _MSC_VER < 1300
/*