diff options
| author | monty@tik.mysql.fi <> | 2001-05-23 02:40:20 +0300 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-05-23 02:40:20 +0300 |
| commit | 30dcb41f0bc7b39de7fd9978989faba51bb4f282 (patch) | |
| tree | 5cfeb4797dcf12adce2ff584d8919b58a2516885 /mysys | |
| parent | 54e36baf114a6cc79aa1658b1089b3b7920df4c6 (diff) | |
| parent | 684082ce79f78d43b7ade6236c8abbe5abd79ce4 (diff) | |
| download | mariadb-git-30dcb41f0bc7b39de7fd9978989faba51bb4f282.tar.gz | |
Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 74548b7fa12..7c92a7fa5fa 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -449,7 +449,7 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) check_locks(lock,"read lock with old write lock",0); if (lock->get_status) (*lock->get_status)(data->status_param); - ++locks_immediate; + statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } if (lock->write.data->type == TL_WRITE_ONLY) @@ -473,7 +473,7 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) if ((int) lock_type == (int) TL_READ_NO_INSERT) lock->read_no_write_count++; check_locks(lock,"read lock with no write locks",0); - ++locks_immediate; + statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } /* Can't get lock yet; Wait for it */ @@ -505,7 +505,7 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) data->cond=get_cond(); if (lock->get_status) (*lock->get_status)(data->status_param); - ++locks_immediate; + statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } } @@ -540,7 +540,7 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) check_locks(lock,"second write lock",0); if (data->lock->get_status) (*data->lock->get_status)(data->status_param); - ++locks_immediate; + statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } DBUG_PRINT("lock",("write locked by thread: %ld", @@ -566,7 +566,7 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) if (data->lock->get_status) (*data->lock->get_status)(data->status_param); check_locks(lock,"only write lock",0); - ++locks_immediate; + statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } } |