From 2a1afc29f252fb189f6e93a2e0d3a1939f8220d5 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Tue, 8 May 2012 16:42:55 -0700 Subject: Inverted the option --skip-stat-tables for --stat-tables. Set it to 0 by default. Now only the tests that use persistent statistics tables require starting the server with --stat-tables set on. --- sql/mysqld.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/mysqld.h') diff --git a/sql/mysqld.h b/sql/mysqld.h index 6d2da80d7c8..35b395667e3 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -105,7 +105,7 @@ extern char* opt_secure_backup_file_priv; extern size_t opt_secure_backup_file_priv_len; extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements; extern my_bool sp_automatic_privileges, opt_noacl; -extern my_bool opt_no_stat_tables; +extern my_bool opt_with_stat_tables; extern my_bool opt_old_style_user_limits, trust_function_creators; extern uint opt_crash_binlog_innodb; extern char *shared_memory_base_name, *mysqld_unix_port; @@ -396,7 +396,7 @@ enum options_mysqld OPT_SKIP_PRIOR, OPT_SKIP_RESOLVE, OPT_SKIP_STACK_TRACE, - OPT_SKIP_STAT_TABLES, + OPT_WITH_STAT_TABLES, OPT_SKIP_SYMLINKS, OPT_SLOW_QUERY_LOG, OPT_SSL_CA, -- cgit v1.2.1 From f549f495f7f621d2c7e35303ab84392ec519ecb0 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Sat, 2 Jun 2012 17:19:01 -0700 Subject: Removed the server option --stat-tables. Renamed the system variable optimizer_use_stat_tables to use_stat_tables. This variable now has only 3 possible values: 'never', 'complementary', 'preferably'. If the server has been launched with --use-stat-tables='complementary'|'preferably' then the statictics tables can be employed by the optimizer and by the ANALYZE command. --- sql/mysqld.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/mysqld.h') diff --git a/sql/mysqld.h b/sql/mysqld.h index 35b395667e3..69348a45e9a 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -105,7 +105,7 @@ extern char* opt_secure_backup_file_priv; extern size_t opt_secure_backup_file_priv_len; extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements; extern my_bool sp_automatic_privileges, opt_noacl; -extern my_bool opt_with_stat_tables; +extern ulong use_stat_tables; extern my_bool opt_old_style_user_limits, trust_function_creators; extern uint opt_crash_binlog_innodb; extern char *shared_memory_base_name, *mysqld_unix_port; @@ -396,7 +396,6 @@ enum options_mysqld OPT_SKIP_PRIOR, OPT_SKIP_RESOLVE, OPT_SKIP_STACK_TRACE, - OPT_WITH_STAT_TABLES, OPT_SKIP_SYMLINKS, OPT_SLOW_QUERY_LOG, OPT_SSL_CA, -- cgit v1.2.1 From 26947f5adb72cd6b8190ee5d5e6d11be6a2448b5 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Fri, 27 Jul 2012 12:05:23 -0700 Subject: Added missing declaration of statistics_lock. Replaced bzero with memset. Added missing --source include/have_debug_sync.inc into stat_tables.test. --- sql/mysqld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/mysqld.h') diff --git a/sql/mysqld.h b/sql/mysqld.h index 69348a45e9a..526f47d821d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -430,6 +430,7 @@ enum enum_query_type typedef int64 query_id_t; extern query_id_t global_query_id; extern my_atomic_rwlock_t global_query_id_lock; +extern my_atomic_rwlock_t statistics_lock; void unireg_end(void) __attribute__((noreturn)); -- cgit v1.2.1