diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
| commit | 767501a9b1c89e17986d8089131d935d63420ad7 (patch) | |
| tree | b7a5df1540af07a49f7d577804919b7027fc4edf /sql/set_var.cc | |
| parent | 6bee08c61dbb89837edc04de8e49fed411f17770 (diff) | |
| parent | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (diff) | |
| download | mariadb-git-767501a9b1c89e17986d8089131d935d63420ad7.tar.gz | |
Merge community up to enterprise, thus ending the community-server
adventure.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 14ec2e57aab..2cdd306d542 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -567,6 +567,12 @@ static sys_var_thd_bit sys_unique_checks("unique_checks", 0, set_option_bit, OPTION_RELAXED_UNIQUE_CHECKS, 1); +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +static sys_var_thd_bit sys_profiling("profiling", NULL, set_option_bit, + ulonglong(OPTION_PROFILING)); +static sys_var_thd_ulong sys_profiling_history_size("profiling_history_size", + &SV::profiling_history_size); +#endif /* Local state variables */ @@ -730,6 +736,10 @@ sys_var *sys_variables[]= &sys_optimizer_prune_level, &sys_optimizer_search_depth, &sys_preload_buff_size, +#ifdef ENABLED_PROFILING + &sys_profiling, + &sys_profiling_history_size, +#endif &sys_pseudo_thread_id, &sys_query_alloc_block_size, &sys_query_cache_size, @@ -893,6 +903,8 @@ struct show_var_st init_vars[]= { {"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE}, {"have_blackhole_engine", (char*) &have_blackhole_db, SHOW_HAVE}, {"have_compress", (char*) &have_compress, SHOW_HAVE}, + {"have_community_features", (char*) &have_community_features, SHOW_HAVE}, + {"have_profiling", (char*) &have_profiling, SHOW_HAVE}, {"have_crypt", (char*) &have_crypt, SHOW_HAVE}, {"have_csv", (char*) &have_csv_db, SHOW_HAVE}, {"have_dynamic_loading", (char*) &have_dlopen, SHOW_HAVE}, @@ -1048,6 +1060,10 @@ struct show_var_st init_vars[]= { {sys_plugin_dir.name, (char*) &sys_plugin_dir, SHOW_SYS}, {"port", (char*) &mysqld_port, SHOW_INT}, {sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS}, +#ifdef ENABLED_PROFILING + {sys_profiling.name, (char*) &sys_profiling, SHOW_SYS}, + {sys_profiling_history_size.name, (char*) &sys_profiling_history_size, SHOW_SYS}, +#endif {"protocol_version", (char*) &protocol_version, SHOW_INT}, {sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size, SHOW_SYS}, @@ -3027,7 +3043,7 @@ static bool set_option_autocommit(THD *thd, set_var *var) if ((org_options & OPTION_NOT_AUTOCOMMIT)) { /* We changed to auto_commit mode */ - thd->options&= ~(ulong) OPTION_BEGIN; + thd->options&= ~OPTION_BEGIN; thd->transaction.all.modified_non_trans_table= FALSE; thd->server_status|= SERVER_STATUS_AUTOCOMMIT; if (ha_commit(thd)) |