diff options
| author | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-21 01:29:57 -0400 |
|---|---|---|
| committer | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-21 01:29:57 -0400 |
| commit | 0b732c47973622384b97caccb9703b9bd5a4a93e (patch) | |
| tree | f28d036bdc60c31c38b1d066b2d9e02fa4e980e6 /include/thr_lock.h | |
| parent | 1ef3c69685de83a28ce44588f70df808c16df1ce (diff) | |
| parent | 31ebc6ef71afaf4605ab5d00ddaf8d548683212d (diff) | |
| download | mariadb-git-0b732c47973622384b97caccb9703b9bd5a4a93e.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
include/my_sys.h:
Auto merged
include/thr_lock.h:
Auto merged
sql/handler.cc:
Auto merged
sql-common/client.c:
Auto merged
client/mysqldump.c:
Manual merge
include/mysql.h:
Manual merge
libmysql/libmysql.c:
Manual merge
myisam/rt_split.c:
Manual merge
mysys/thr_lock.c:
Manual merge
sql/lock.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_table.cc:
Manual merge
tests/mysql_client_test.c:
Manual merge
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 8c6540d83e2..ef4e6a7e97b 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -144,7 +144,7 @@ enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_OWNER *owner); 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); |