diff options
| author | monty@mysql.com <> | 2004-10-20 16:24:28 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-20 16:24:28 +0300 |
| commit | e1218474b87e1c28f080207558966fac6f4eb292 (patch) | |
| tree | f3f6e81dac72352598beb9c21f116d2ef7f9c3ef /mysys | |
| parent | f9cd4a60e466a211024e5efb6840b79a3066f3c8 (diff) | |
| parent | b32ffec8fdc9d05377e69c8b1abb92d562670324 (diff) | |
| download | mariadb-git-e1218474b87e1c28f080207558966fac6f4eb292.tar.gz | |
Merge with 4.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index d9e46fe1beb..d47ca8de183 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -552,8 +552,14 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) !lock->write_wait.data && lock->write.data->type == TL_WRITE_ALLOW_WRITE)) { - /* We have already got a write lock or all locks are - TL_WRITE_ALLOW_WRITE */ + /* + We have already got a write lock or all locks are + TL_WRITE_ALLOW_WRITE + */ + DBUG_PRINT("info", ("write_wait.data: 0x%lx old_type: %d", + (ulong) lock->write_wait.data, + lock->write.data->type)); + (*lock->write.last)=data; /* Add to running fifo */ data->prev=lock->write.last; lock->write.last= &data->next; @@ -568,6 +574,8 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) } else { + DBUG_PRINT("info", ("write_wait.data: 0x%lx", + (ulong) lock->write_wait.data)); if (!lock->write_wait.data) { /* no scheduled write locks */ if (lock_type == TL_WRITE_CONCURRENT_INSERT && |