diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-19 01:35:32 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-19 01:35:32 -0700 |
| commit | ff3d16fba898efa68677f3b0049668a341f27a06 (patch) | |
| tree | f56fddecdc49cf5ccd55680c14dc5b27371b2f03 /sql/mysqld.cc | |
| parent | 51c77ec5d406843bb8c8131f0687f4f75839d045 (diff) | |
| parent | 7b845f551b8f206c886366499e21b790991f5418 (diff) | |
| download | mariadb-git-ff3d16fba898efa68677f3b0049668a341f27a06.tar.gz | |
Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7394ce5c931..4b6df56d9a8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -446,6 +446,7 @@ ulong opt_replicate_events_marked_for_skip; */ volatile bool mqh_used = 0; my_bool opt_noacl; +my_bool opt_no_stat_tables; my_bool sp_automatic_privileges= 1; ulong opt_binlog_rows_event_max_size; @@ -3685,6 +3686,8 @@ static int init_common_variables() global_system_variables.character_set_results= default_charset_info; global_system_variables.character_set_client= default_charset_info; + global_system_variables.optimizer_use_stat_tables= 0; + if (!(character_set_filesystem= get_charset_by_csname(character_set_filesystem_name, MY_CS_PRIMARY, MYF(MY_WME)))) @@ -4866,6 +4869,11 @@ int mysqld_main(int argc, char **argv) check_performance_schema(); #endif +#if 0 + if (! opt_bootstrap) + init_stat_tables_usage(); +#endif + initialize_information_schema_acl(); execute_ddl_log_recovery(); @@ -6010,6 +6018,7 @@ error: */ struct my_option my_long_options[]= + { {"help", '?', "Display this help and exit.", &opt_help, &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, @@ -6315,6 +6324,11 @@ struct my_option my_long_options[]= &opt_noacl, &opt_noacl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif + {"skip-stat-tables", OPT_SKIP_STAT_TABLES, + "Start without statistical tables. Statistical data on table cardinalities, " + "columns and indexes from these tables become unavailable", + &opt_no_stat_tables, &opt_no_stat_tables, 0, GET_BOOL, NO_ARG, + 0, 0, 0, 0, 0, 0}, {"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"skip-slave-start", 0, @@ -7610,6 +7624,7 @@ mysqld_get_one_option(int optid, break; case OPT_BOOTSTRAP: opt_noacl=opt_bootstrap=1; + opt_no_stat_tables= 1; break; case OPT_SERVER_ID: server_id_supplied = 1; |