diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
| commit | 1b62f0f58c7c5219143b6a87b89b1fa15e2be401 (patch) | |
| tree | 29446273b907c6a46ce222c3c1aec0a4ebf60d32 /sql/mysqld.h | |
| parent | 7760efad74140680b1eefaf2172b0fa26f7b1146 (diff) | |
| parent | e44253a125c3baf7ea448edce77389810425df2a (diff) | |
| download | mariadb-git-1b62f0f58c7c5219143b6a87b89b1fa15e2be401.tar.gz | |
Merge maria-5.5-mwl248 -> 10.0-base.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 8ec7e1ac751..a9b41a5e116 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -106,6 +106,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 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; @@ -437,6 +438,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)); |