diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-04 20:34:15 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-04 20:34:15 +0300 |
| commit | a9e22b589677df9035c73e61b80be0fc54d175a5 (patch) | |
| tree | bf6e8bd7de75f7f9ec6dbf8903d150ed3511a6da /sql/lock.cc | |
| parent | 1edca1d7ef6a77d406ea2c1bcaf5d9aff2f4c04c (diff) | |
| parent | 8dfc3fbbab0dc7b3be98a47423ae74a6b4933864 (diff) | |
| download | mariadb-git-a9e22b589677df9035c73e61b80be0fc54d175a5.tar.gz | |
Merge next-mr -> next-4284-merge.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 08d854c4926..f34b6c80872 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -1492,7 +1492,7 @@ bool Global_read_lock::make_global_read_lock_block_commit(THD *thd) Due to a bug in a threading library it could happen that a signal did not reach its target. A condition for this was that the same condition variable was used with different mutexes in - pthread_cond_wait(). Some time ago we changed LOCK_open to + mysql_cond_wait(). Some time ago we changed LOCK_open to LOCK_global_read_lock in global read lock handling. So COND_refresh was used with LOCK_open and LOCK_global_read_lock. |