summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-03-19 01:35:32 -0700
committerIgor Babaev <igor@askmonty.org>2012-03-19 01:35:32 -0700
commitff3d16fba898efa68677f3b0049668a341f27a06 (patch)
treef56fddecdc49cf5ccd55680c14dc5b27371b2f03 /sql/mysqld.h
parent51c77ec5d406843bb8c8131f0687f4f75839d045 (diff)
parent7b845f551b8f206c886366499e21b790991f5418 (diff)
downloadmariadb-git-ff3d16fba898efa68677f3b0049668a341f27a06.tar.gz
Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 988584f779a..617ecbb8da2 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 my_bool opt_no_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;
@@ -395,6 +396,7 @@ enum options_mysqld
OPT_SKIP_PRIOR,
OPT_SKIP_RESOLVE,
OPT_SKIP_STACK_TRACE,
+ OPT_SKIP_STAT_TABLES,
OPT_SKIP_SYMLINKS,
OPT_SLOW_QUERY_LOG,
OPT_SSL_CA,