diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
| commit | 29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4 (patch) | |
| tree | 9e8417877eab9778cb09f99e71c11401e7749bbc /mysys/thr_rwlock.c | |
| parent | 265a6edd23cfdb69c6ac072bf01887f7aed1168c (diff) | |
| parent | 00496b7acd1f2ac8b099ba7e6a4c7bbf09178384 (diff) | |
| download | mariadb-git-29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4.tar.gz | |
Commit on behalf of Dmitry Lenev.
Merge his patch for Bug#52044 into 5.5, and apply
review comments.
Diffstat (limited to 'mysys/thr_rwlock.c')
| -rw-r--r-- | mysys/thr_rwlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_rwlock.c b/mysys/thr_rwlock.c index ba5fe86f1d7..ecd12849822 100644 --- a/mysys/thr_rwlock.c +++ b/mysys/thr_rwlock.c @@ -127,7 +127,7 @@ int my_rw_wrlock(my_rw_lock_t *rwp) pthread_mutex_lock(&rwp->lock); rwp->waiters++; /* another writer queued */ - my_rw_lock_assert_not_owner(rwp); + my_rw_lock_assert_not_write_owner(rwp); while (rwp->state) pthread_cond_wait(&rwp->writers, &rwp->lock); |