diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-03 09:55:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-03 09:55:08 +0200 |
| commit | 5d16592d44d8dd7147ee868c661af842ec0f1568 (patch) | |
| tree | 57f83c95bf23bdb90bd05e1134ffaaa0e015249f /mysys | |
| parent | 2d687cad5d1154418603a16e58772d91f37d4cbd (diff) | |
| parent | c1fd09f3d4848ae59605564ded9628307d59dd27 (diff) | |
| download | mariadb-git-5d16592d44d8dd7147ee868c661af842ec0f1568.tar.gz | |
mysql-5.5.38 merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_thr_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index b9ad379f4c4..3e4d091944b 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -306,6 +306,9 @@ my_bool my_thread_init(void) struct st_my_thread_var *tmp; my_bool error=0; + if (!my_thread_global_init_done) + return 1; /* cannot proceed with unintialized library */ + #ifdef EXTRA_DEBUG_THREADS fprintf(stderr,"my_thread_init(): pthread_self: %p\n", pthread_self()); #endif |