diff options
| author | istruewing@stella.local <> | 2008-02-14 16:53:03 +0100 |
|---|---|---|
| committer | istruewing@stella.local <> | 2008-02-14 16:53:03 +0100 |
| commit | 9a4d57e31964634785c6f941c3714ce5a46d7bd4 (patch) | |
| tree | a49c7a5dd76561facfd53b760feaadf0369e787b /mysys | |
| parent | fb20c9dd5e3f7fb5c45d649c30a2932d337bc35f (diff) | |
| parent | 301ab0d8b72bea5a924cd996f0a0378b3175e9db (diff) | |
| download | mariadb-git-9a4d57e31964634785c6f941c3714ce5a46d7bd4.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 7f7be4835a5..afe8f289089 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -405,6 +405,8 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, wait->last= &data->next; } + statistic_increment(locks_waited, &THR_LOCK_lock); + /* Set up control struct to allow others to abort locks */ thread_var->current_mutex= &data->lock->mutex; thread_var->current_cond= cond; @@ -469,7 +471,6 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, else { result= THR_LOCK_SUCCESS; - statistic_increment(locks_waited, &THR_LOCK_lock); if (data->lock->get_status) (*data->lock->get_status)(data->status_param, 0); check_locks(data->lock,"got wait_for_lock",0); |