diff options
| author | unknown <monty@mysql.com> | 2003-12-11 06:24:32 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-11 06:24:32 +0200 |
| commit | 28b1f63aa7f6ed40d68c932cfe33420c12c7347d (patch) | |
| tree | 35f5e63ae1da09573a4496dfd0ced99b9d70ae97 /mysys/my_init.c | |
| parent | 7cfbc5e9336099d4b850e6a7e8282ade3e7aef19 (diff) | |
| parent | 287661e66cc1fea6730b357bb56d48c6d065ef43 (diff) | |
| download | mariadb-git-28b1f63aa7f6ed40d68c932cfe33420c12c7347d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
mysys/my_thr_init.c:
Auto merged
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index a8a184a2cb4..8d4ba2c97b6 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -62,13 +62,22 @@ static ulong atoi_octal(const char *str) } - /* Init my_sys functions and my_sys variabels */ +/* + Init my_sys functions and my_sys variabels + + SYNOPSIS + my_init() -void my_init(void) + RETURN + 0 ok + 1 Couldn't initialize environment +*/ + +my_bool my_init(void) { my_string str; if (my_init_done) - return; + return 0; my_init_done=1; #if defined(THREAD) && defined(SAFE_MUTEX) safe_mutex_global_init(); /* Must be called early */ @@ -78,7 +87,8 @@ void my_init(void) #if defined(HAVE_PTHREAD_INIT) pthread_init(); /* Must be called before DBUG_ENTER */ #endif - my_thread_global_init(); + if (my_thread_global_init()) + return 1; #if !defined( __WIN__) && !defined(OS2) && !defined(__NETWARE__) sigfillset(&my_signals); /* signals blocked by mf_brkhant */ #endif @@ -110,7 +120,7 @@ void my_init(void) #ifdef __WIN__ win32_init_tcp_ip(); #endif - DBUG_VOID_RETURN; + DBUG_RETURN(0); } } /* my_init */ |