Fix for #2126

additional changes (after discussion with Monty)

Fix for #2126
additional changes (after discussion with Monty)
de470e6f · hf@deer.(none) · 42799cc5 · de470e6f · de470e6f
Commit de470e6f authored Dec 18, 2003 by hf@deer.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

libmysql/libmysql.c libmysql/libmysql.c +1 -1

sql/client_settings.h sql/client_settings.h +1 -1

No files found.
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -136,7 +136,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)
  }
 #ifdef THREAD
  else
-    my_thread_init();         /* Init if new thread */
+    result= (int)my_thread_init();         /* Init if new thread */
 #endif
  return result;
 }

--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -32,5 +32,5 @@
 #undef HAVE_SMEM
 #undef _CUSTOMCONFIG_

-#define mysql_server_init(a,b,c) FALSE
+#define mysql_server_init(a,b,c) 0