diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
| commit | 1ef07d0845300ad200671f9809dcd9ee8b2ff837 (patch) | |
| tree | 5c22187a94c73c7f8099a5d366ab3fd425f8e578 /sql/mysqld.h | |
| parent | 421bbdcf1004806ccbee7b45d55e90ddc15c76ae (diff) | |
| parent | f853333e09b222f6d6d76d9343b6202b4769ffab (diff) | |
| download | mariadb-git-1ef07d0845300ad200671f9809dcd9ee8b2ff837.tar.gz | |
Merge 10.0-base -> 10.0.
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
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 a07efa9178f..e0efbe60390 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -107,6 +107,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; @@ -573,6 +574,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)); |