summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-26 03:30:16 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-26 03:30:16 +0200
commit00d82156b2f713963edb0cfbf40273eb27c00138 (patch)
tree5af6c2ffd0a12a6830b9504e665f80be858ad71d /mysys
parentc9fde1557e0be7b022c883548e7901d0629b029a (diff)
parent0c9d051c1624b6c097b6c254b9350f919ad01eb9 (diff)
downloadmariadb-git-00d82156b2f713963edb0cfbf40273eb27c00138.tar.gz
merge
Docs/manual.texi: Auto merged sql/mysqld.cc: Auto merged sql/records.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/bdb-crash.test: Auto merged sql/sql_repl.cc: use local file
Diffstat (limited to 'mysys')
-rw-r--r--mysys/thr_lock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 10c803378df..aa50877072d 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -913,7 +913,8 @@ void thr_multi_unlock(THR_LOCK_DATA **data,uint count)
DBUG_VOID_RETURN;
}
-/* Abort all threads waiting for a lock. The lock will be upgraded to a
+/*
+ Abort all threads waiting for a lock. The lock will be upgraded to
TL_WRITE_ONLY to abort any new accesses to the lock
*/