diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
| commit | c1599821a55ac4f59c5c799480a07913e1c26daa (patch) | |
| tree | 0c064252ad3959fcd53b0f06a40b98d691fe070e /mysys | |
| parent | 624dd71b9419555eca8baadc695e3376de72286f (diff) | |
| parent | c4fd167d5a740f67ee5287a9b05b5383403b9ed0 (diff) | |
| download | mariadb-git-c1599821a55ac4f59c5c799480a07913e1c26daa.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_mutex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index 85d42d4fd0a..568ed3ecb46 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -237,6 +237,8 @@ int safe_mutex_lock(safe_mutex_t *mp, myf my_flags, const char *file, int error; DBUG_PRINT("mutex", ("%s (0x%lx) locking", mp->name ? mp->name : "Null", (ulong) mp)); + + pthread_mutex_lock(&mp->global); if (!mp->file) { fprintf(stderr, @@ -245,8 +247,6 @@ int safe_mutex_lock(safe_mutex_t *mp, myf my_flags, const char *file, fflush(stderr); abort(); } - - pthread_mutex_lock(&mp->global); if (mp->count > 0) { /* |