diff options
| author | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
| commit | d70aead730c1043ddcee0a8cd8a1f5dffafaf402 (patch) | |
| tree | 7f3dd2c80370d2c811475198141e5ab89b19adb0 /include | |
| parent | 8bb396dc1442861e11758c8ac410af129a5c359e (diff) | |
| parent | 90e41facf78150df4f8d387f6d44647957c7a8a0 (diff) | |
| download | mariadb-git-d70aead730c1043ddcee0a8cd8a1f5dffafaf402.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/thr_lock.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Simple merge
Diffstat (limited to 'include')
| -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 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); |