summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-07-27 13:24:59 +0300
committermonty@mysql.com <>2005-07-27 13:24:59 +0300
commit24d45c5c305b0137caa50ff9b58da195c6f02f90 (patch)
tree7f3dd2c80370d2c811475198141e5ab89b19adb0 /mysys
parent3f6023c76e231a7126eef76b97075056348a55bf (diff)
parent4098c40d87ac11fe5043061f16a95a455376a782 (diff)
downloadmariadb-git-24d45c5c305b0137caa50ff9b58da195c6f02f90.tar.gz
Merge mysql.com:/home/my/mysql-4.0
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'mysys')
-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 fbdf344e29a..dc4959f23c1 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -966,10 +966,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);