bzr commit into mysql-5.0 branch (chad:2782)

[Chad MILLER]

#At file:///home/cmiller/work/mysqlbzr/mysql-5.0/ based on revid:chad@stripped

 2782 Chad MILLER	2009-05-11
      Fix improperly-protected variable definition and use.
      
      Also, add CPP so Windows works properly for profiling. Community-server
      functionality is required.

    modified:
      include/config-win.h
      sql/set_var.cc
=== modified file 'include/config-win.h'
--- a/include/config-win.h	2009-04-14 17:20:13 +0000
+++ b/include/config-win.h	2009-05-11 14:00:03 +0000
@@ -208,6 +208,7 @@ typedef uint rf_SetTimer;
 
 /* If query profiling should be enabled by default */
 #define ENABLED_PROFILING 1
+#define COMMUNITY_SERVER 1
 
 /* Convert some simple functions to Posix */
 

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-05-06 13:06:32 +0000
+++ b/sql/set_var.cc	2009-05-11 14:00:03 +0000
@@ -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


Attachment: [text/bzr-bundle] bzr/[e-mail]