diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-01-30 10:00:14 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-01-30 10:00:14 +0100 |
| commit | e8631758fe6bac6b13187f372809366792920cd7 (patch) | |
| tree | b4e7251729b81216e6d66d5bf8dee7d7c315cc26 /mysys/my_thr_init.c | |
| parent | acb7de23306ce0b311344d679e8c63160ad32a49 (diff) | |
| parent | e9bce6c9d4bde35306b845e22e9b5ada69c4512f (diff) | |
| download | mariadb-git-e8631758fe6bac6b13187f372809366792920cd7.tar.gz | |
Automerge from main into MariaDB 5.1.42 release branch.
Diffstat (limited to 'mysys/my_thr_init.c')
| -rw-r--r-- | mysys/my_thr_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index e105b48f386..9de8b2764da 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -317,7 +317,7 @@ my_bool my_thread_init(void) /* Skip initialization if the thread specific variable is already initialized */ - if (THR_KEY_mysys.id) + if (THR_KEY_mysys.init) goto end; tmp= &THR_KEY_mysys; #endif |