diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-30 18:07:40 +0400 |
| commit | dc195adf34e58f9e4a7ba677cb0aa008d8a75c37 (patch) | |
| tree | 0a5202757c09044f2c476f93621c75c9df31e32d /sql/sys_vars.cc | |
| parent | 6c64f826eb692dd8344770a32c2b6ff5351f6347 (diff) | |
| parent | 862af4eeaaa89ea4f09491359d0a2dab77399924 (diff) | |
| download | mariadb-git-dc195adf34e58f9e4a7ba677cb0aa008d8a75c37.tar.gz | |
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9294c7b89a4..ca3447dcc82 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -145,7 +145,7 @@ static Sys_var_ulong Sys_pfs_max_mutex_instances( "performance_schema_max_mutex_instances", "Maximum number of instrumented MUTEX objects.", READ_ONLY GLOBAL_VAR(pfs_param.m_mutex_sizing), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024*1024), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 100*1024*1024), DEFAULT(PFS_MAX_MUTEX), BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); @@ -161,7 +161,7 @@ static Sys_var_ulong Sys_pfs_max_rwlock_instances( "performance_schema_max_rwlock_instances", "Maximum number of instrumented RWLOCK objects.", READ_ONLY GLOBAL_VAR(pfs_param.m_rwlock_sizing), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024*1024), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 100*1024*1024), DEFAULT(PFS_MAX_RWLOCK), BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES); @@ -1492,7 +1492,8 @@ static bool fix_read_only(sys_var *self, THD *thd, enum_var_type type) can cause to wait on a read lock, it's required for the client application to unlock everything, and acceptable for the server to wait on all locks. */ - if ((result= close_cached_tables(thd, NULL, FALSE, TRUE))) + if ((result= close_cached_tables(thd, NULL, TRUE, + thd->variables.lock_wait_timeout))) goto end_with_read_lock; if ((result= thd->global_read_lock.make_global_read_lock_block_commit(thd))) @@ -1616,14 +1617,17 @@ static Sys_var_charptr Sys_socket( READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG), IN_FS_CHARSET, DEFAULT(0)); -#ifdef HAVE_THR_SETCONCURRENCY +/* + thread_concurrency is a no-op on all platforms since + MySQL 5.1. It will be removed in the context of + WL#5265 +*/ static Sys_var_ulong Sys_thread_concurrency( "thread_concurrency", "Permits the application to give the threads system a hint for " "the desired number of threads that should be run at the same time", READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1)); -#endif static Sys_var_ulong Sys_thread_stack( "thread_stack", "The stack size for each thread", |