diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
| commit | ab83952f293ea46c00e421c81b81a394c9cae2b4 (patch) | |
| tree | 6a3e995bd1330828a0e988d896bca218863fc74c /mysys/my_thr_init.c | |
| parent | 055b62f404ee0a0463ee8ff98a0e24c083b95f1d (diff) | |
| parent | 5267af5e9e5e601d4f4b1ef40730da1e36d38d9d (diff) | |
| download | mariadb-git-ab83952f293ea46c00e421c81b81a394c9cae2b4.tar.gz | |
10.0-base merge
Diffstat (limited to 'mysys/my_thr_init.c')
| -rw-r--r-- | mysys/my_thr_init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 7c64faa7a28..4e5bed84637 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -425,7 +425,12 @@ struct st_my_thread_var *_my_thread_var(void) my_thread_id my_thread_dbug_id() { - return my_thread_var->id; + /* + We need to do this test as some system thread may not yet have called + my_thread_init(). + */ + struct st_my_thread_var *tmp= my_thread_var; + return tmp ? tmp->id : 0; } #ifdef DBUG_OFF |