summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmysql/libmysql.c2
-rw-r--r--sql/client_settings.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 9f2ae280cfc..a6718d6f320 100644
--- 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;
}
diff --git a/sql/client_settings.h b/sql/client_settings.h
index 75500574c99..a8cd36af102 100644
--- 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