diff options
author | Chad MILLER <chad@mysql.com> | 2009-05-11 10:00:03 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2009-05-11 10:00:03 -0400 |
commit | 3593b73eb1f2f4d4e182b8469310faa0152cf06b (patch) | |
tree | da2edbf7545140c76bc9d1faa026ceee9fc22324 /sql/set_var.cc | |
parent | 767501a9b1c89e17986d8089131d935d63420ad7 (diff) | |
download | mariadb-git-3593b73eb1f2f4d4e182b8469310faa0152cf06b.tar.gz |
Fix improperly-protected variable definition and use.
Also, add CPP so Windows works properly for profiling. Community-server
functionality is required.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 2cdd306d542..7a85c1c0fa3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -736,7 +736,7 @@ sys_var *sys_variables[]= &sys_optimizer_prune_level, &sys_optimizer_search_depth, &sys_preload_buff_size, -#ifdef ENABLED_PROFILING +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) &sys_profiling, &sys_profiling_history_size, #endif @@ -1060,7 +1060,7 @@ 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 +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) {sys_profiling.name, (char*) &sys_profiling, SHOW_SYS}, {sys_profiling_history_size.name, (char*) &sys_profiling_history_size, SHOW_SYS}, #endif |