summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-07-28 17:09:54 +0300
committermonty@mysql.com <>2005-07-28 17:09:54 +0300
commit15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c (patch)
treeefa95d21efbbc033b0cabce038118a09be44e9ac /mysys/thr_lock.c
parentb3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (diff)
parent3c12d0ae54eccaef7c265af4f782d95250308dc9 (diff)
downloadmariadb-git-15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c.tar.gz
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysys/thr_lock.c')
-rw-r--r--mysys/thr_lock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 41c3ed6fb5f..1a47a061b97 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -1043,10 +1043,10 @@ void thr_abort_locks(THR_LOCK *lock)
This is used to abort all locks for a specific thread
*/
-bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)
+my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)
{
THR_LOCK_DATA *data;
- bool found= FALSE;
+ my_bool found= FALSE;
DBUG_ENTER("thr_abort_locks_for_thread");
pthread_mutex_lock(&lock->mutex);