diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
| commit | b0fcbc84ef609b1147c3624e90fe3dac66ef8c1d (patch) | |
| tree | ee09976ab4dd9dee924a4c7e30eb0fc9f5e7d63f /include/thr_lock.h | |
| parent | a15d25f07e56cbd80aecbeadef635d3b55e00e85 (diff) | |
| parent | 11570d64fcffa66feaf1fdb8072fdfb9dbd865ca (diff) | |
| download | mariadb-git-b0fcbc84ef609b1147c3624e90fe3dac66ef8c1d.tar.gz | |
merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.
Diffstat (limited to 'include/thr_lock.h')
| -rw-r--r-- | include/thr_lock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 261f596f911..c523207638f 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -160,7 +160,8 @@ void thr_multi_unlock(THR_LOCK_DATA **data,uint count); void thr_abort_locks(THR_LOCK *lock, my_bool upgrade_lock); my_bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread); void thr_print_locks(void); /* For debugging */ -my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data); +my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data, + enum thr_lock_type new_lock_type); void thr_downgrade_write_lock(THR_LOCK_DATA *data, enum thr_lock_type new_lock_type); my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data); |