summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-01-27 15:33:31 -0700
committerunknown <sasha@mysql.sashanet.com>2001-01-27 15:33:31 -0700
commitdbe03fb0bce93ae750db6c0cd346e87bc82201ab (patch)
treeb2d2f6b0dd73eec46bc4a16978de2f24b148927a /mysys/thr_lock.c
parenteb5706d128539f1aa98690793e9344df280f98c8 (diff)
downloadmariadb-git-dbe03fb0bce93ae750db6c0cd346e87bc82201ab.tar.gz
fixed up lock counting code - Monty's suggestions
updated manual about table lock counter fixed coredump in DROP DATABASE with long bogus name by non-root user fixed bug in handling STOP immediately after ROTATE added test case for buffer overrun on DROP DATABASE by non-root user added test case for the STOP bug in replication Docs/manual.texi: updates for Table_locks_immediate and Table_locks_waited include/thr_lock.h: fixes suggested by Monty to lock counts mysql-test/r/status.result: clean up of result for changes in the test case mysql-test/t/status.test: make it produce the same results if the had been some activity on the server already mysys/thr_lock.c: fixes suggested by Monty sql/mysqld.cc: fixes suggested by Monty sql/slave.cc: fixed bug in processing STOP event after rotate sql/sql_base.cc: fixes suggested by Monty sql/sql_parse.cc: fixed coredump in drop database with long name by a non-root user sql/sql_repl.cc: better status message
Diffstat (limited to 'mysys/thr_lock.c')
-rw-r--r--mysys/thr_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 6f5f8afac3c..348c7bae74f 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -387,7 +387,7 @@ static my_bool wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
else
{
result=0;
- ++locks_waited;
+ statistic_increment(locks_waited, &THR_LOCK_lock);
if (data->lock->get_status)
(*data->lock->get_status)(data->status_param);
check_locks(data->lock,"got wait_for_lock",0);