Merge mysql.com:/home/my/mysql-4.0

into  mysql.com:/home/my/mysql-4.1

1 files changed, 1 insertions, 1 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index fbedaf1601d..7459ab7aefc 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -111,7 +111,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);
-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);
 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);