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 | c15886a111953200c6be4e67decad891ed2986dd (patch) | |
| tree | 84e1388f509f40d4b0c59efa292afbeb90cc86c8 /sql/sys_vars.cc | |
| parent | cb7078f57a3ca5bc42b18a79381248246e71e851 (diff) | |
| parent | 03672b9696fd255d97bf1e1ecef0f16c8575a5b7 (diff) | |
| download | mariadb-git-c15886a111953200c6be4e67decad891ed2986dd.tar.gz | |
Auto-merge from mysql-next-4284.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9f8914ac3fe..4575ca79049 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1954,13 +1954,6 @@ static Sys_var_ulong Sys_table_cache_size( VALID_RANGE(1, 512*1024), DEFAULT(TABLE_OPEN_CACHE_DEFAULT), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_table_lock_wait_timeout( - "table_lock_wait_timeout", - "Timeout in seconds to wait for a table level lock before returning an " - "error. Used only if the connection has active cursors", - GLOBAL_VAR(table_lock_wait_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, 1024*1024*1024), DEFAULT(50), BLOCK_SIZE(1)); - static Sys_var_ulong Sys_thread_cache_size( "thread_cache_size", "How many threads we should keep in a cache for reuse", |