diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-15 17:08:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-15 17:08:38 +0300 |
| commit | 754791258665b05583888a41bf74fa38fe85e452 (patch) | |
| tree | 84e1388f509f40d4b0c59efa292afbeb90cc86c8 /include | |
| parent | e8d19b96182cf3a4584f904a21473d0492e2b3d3 (diff) | |
| parent | aab777ca1ee56688089ecbd1db698095e64cea23 (diff) | |
| download | mariadb-git-754791258665b05583888a41bf74fa38fe85e452.tar.gz | |
Auto-merge from mysql-next-4284.
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_lock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 527d1288fe4..1f4072ca0c5 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -83,7 +83,6 @@ enum enum_thr_lock_result { THR_LOCK_SUCCESS= 0, THR_LOCK_ABORTED= 1, extern ulong max_write_lock_count; -extern ulong table_lock_wait_timeout; extern my_bool thr_lock_inited; extern enum thr_lock_type thr_upgraded_concurrent_insert_lock; |