Commit 195b8ac5 authored by unknown's avatar unknown

Fix for #2126

additional changes (after discussion with Monty)


libmysql/libmysql.c:
  it's good to check my_thread_init() result as well
sql/client_settings.h:
  0 is more relevant here
parent 886307f2
...@@ -136,7 +136,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) ...@@ -136,7 +136,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)
} }
#ifdef THREAD #ifdef THREAD
else else
my_thread_init(); /* Init if new thread */ result= (int)my_thread_init(); /* Init if new thread */
#endif #endif
return result; return result;
} }
......
...@@ -32,5 +32,5 @@ ...@@ -32,5 +32,5 @@
#undef HAVE_SMEM #undef HAVE_SMEM
#undef _CUSTOMCONFIG_ #undef _CUSTOMCONFIG_
#define mysql_server_init(a,b,c) FALSE #define mysql_server_init(a,b,c) 0
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