diff options
| author | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-20 21:58:33 -0400 |
|---|---|---|
| committer | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-20 21:58:33 -0400 |
| commit | a3fe765249cd6b23dcd59a9bda3f310606877dc8 (patch) | |
| tree | 67806b9ee022b7209440238f0cf7228d9e910a58 /include/thr_lock.h | |
| parent | bf4dfde9fc729894eb745b58ced160133ecde510 (diff) | |
| parent | af1dfb613b7ce6343f461d6f4c3def6af9354814 (diff) | |
| download | mariadb-git-a3fe765249cd6b23dcd59a9bda3f310606877dc8.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
include/thr_lock.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Manual merge after 4.0 fix
Diffstat (limited to 'include/thr_lock.h')
| -rw-r--r-- | include/thr_lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 947b17bf2b6..fbedaf1601d 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); -void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread); +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); |