Commit d346054c authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files

merge fix for 36279

parents 0d2cbe95 d60da1c2

mysys/my_init.c

+0 −2
Original line number Diff line number Diff line
@@ -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

  /*