Commit f72ddaeb authored by Chad MILLER's avatar Chad MILLER

Fix improperly-protected variable definition and use.

Also, add CPP so Windows works properly for profiling. Community-server
functionality is required.
parent 128afdc3
...@@ -208,6 +208,7 @@ typedef uint rf_SetTimer; ...@@ -208,6 +208,7 @@ typedef uint rf_SetTimer;
/* If query profiling should be enabled by default */ /* If query profiling should be enabled by default */
#define ENABLED_PROFILING 1 #define ENABLED_PROFILING 1
#define COMMUNITY_SERVER 1
/* Convert some simple functions to Posix */ /* Convert some simple functions to Posix */
......
...@@ -736,7 +736,7 @@ sys_var *sys_variables[]= ...@@ -736,7 +736,7 @@ sys_var *sys_variables[]=
&sys_optimizer_prune_level, &sys_optimizer_prune_level,
&sys_optimizer_search_depth, &sys_optimizer_search_depth,
&sys_preload_buff_size, &sys_preload_buff_size,
#ifdef ENABLED_PROFILING #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
&sys_profiling, &sys_profiling,
&sys_profiling_history_size, &sys_profiling_history_size,
#endif #endif
...@@ -1060,7 +1060,7 @@ struct show_var_st init_vars[]= { ...@@ -1060,7 +1060,7 @@ struct show_var_st init_vars[]= {
{sys_plugin_dir.name, (char*) &sys_plugin_dir, SHOW_SYS}, {sys_plugin_dir.name, (char*) &sys_plugin_dir, SHOW_SYS},
{"port", (char*) &mysqld_port, SHOW_INT}, {"port", (char*) &mysqld_port, SHOW_INT},
{sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS}, {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.name, (char*) &sys_profiling, SHOW_SYS},
{sys_profiling_history_size.name, (char*) &sys_profiling_history_size, SHOW_SYS}, {sys_profiling_history_size.name, (char*) &sys_profiling_history_size, SHOW_SYS},
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment