diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-11-02 20:38:05 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-11-02 20:38:05 -0700 |
| commit | 8d612adf70c53dcb741b097133e09d176d0780e1 (patch) | |
| tree | 278a83cc5caaccbfb408471cef6bde5e5171d802 /sql/mysqld.h | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| parent | 32443e744d354fbba93c8761486462b5820b74bb (diff) | |
| download | mariadb-git-8d612adf70c53dcb741b097133e09d176d0780e1.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
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 554c662e90f..7c06cf49f2d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -105,6 +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 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; @@ -433,6 +434,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)); |