diff options
| author | unknown <hf@deer.(none)> | 2003-12-18 18:12:00 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-12-18 18:12:00 +0400 |
| commit | 195b8ac5dc7c721b78b99507af80049583a55b10 (patch) | |
| tree | 19829d755df844c74c405856a21d5f4ce87535e3 | |
| parent | 886307f28275c29e2ca1e833081d2c4a01ef10b7 (diff) | |
| download | mariadb-git-195b8ac5dc7c721b78b99507af80049583a55b10.tar.gz | |
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
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | sql/client_settings.h | 2 |
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 |