summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-04 12:32:28 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-04 12:32:28 +0200
commit7a88d2ccbdf872e200784a7bdfe497c64d0e4449 (patch)
tree060e05f45d2f301e50dc115b01bde9103d6c51d7 /include
parentaeee04d278ca5aacb081df69e8bbdeaf26027f45 (diff)
parent3446199d8e421da02a5546f439ee76b368594700 (diff)
downloadmariadb-git-7a88d2ccbdf872e200784a7bdfe497c64d0e4449.tar.gz
Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
client/mysqltest.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/handler.cc: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/thr_lock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 6650d25e145..f1bda0ce6b4 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -107,6 +107,7 @@ void thr_unlock(THR_LOCK_DATA *data);
int thr_multi_lock(THR_LOCK_DATA **data,uint count);
void thr_multi_unlock(THR_LOCK_DATA **data,uint count);
void thr_abort_locks(THR_LOCK *lock);
+void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);
void thr_print_locks(void); /* For debugging */
my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);
my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);