summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-03-04 12:32:28 +0200
committermonty@narttu.mysql.fi <>2003-03-04 12:32:28 +0200
commit28b6e0269a12ebab1461f64fc9aa6c1e3df50f43 (patch)
tree060e05f45d2f301e50dc115b01bde9103d6c51d7 /include
parent61f280a9785e8fa049ca3dc1cf23dbd07cbae6fd (diff)
parent2a7dfa172c9edf84ce503fdde37e22a8227ef9dc (diff)
downloadmariadb-git-28b6e0269a12ebab1461f64fc9aa6c1e3df50f43.tar.gz
Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
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);