merge fix for 36279
This commit is contained in:
commit
50afc54efa
@ -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
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user