diff options
| author | unknown <monty@work.mysql.com> | 2001-05-23 22:52:21 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-05-23 22:52:21 +0200 |
| commit | 7927e83e4c91b25226efebcb3bcd7d92192fe642 (patch) | |
| tree | 6e2818b4d9cb93ed1f630c53a9551b05425ca541 /mysys | |
| parent | 607c8d8bd4a4647cd118d2ff308e08b6df7a8b98 (diff) | |
| parent | d02aaab42602445a16d81afb8e6ffa5031fd781c (diff) | |
| download | mariadb-git-7927e83e4c91b25226efebcb3bcd7d92192fe642.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
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; } } |