bzr commit into mysql-azalea branch (jon.hauglid:2791) Bug#44651

[Jon Olav Hauglid]

#At file:///export/home/z/mysql-azalea-bugfixing-bug44651/ based on revid:magne.mahre@stripped

 2791 Jon Olav Hauglid	2009-06-04
      Bug #44651 "have_community_features" variable should be renamed 
                 "have_profiling"
      
      Variable renamed. 
      Mysql-test files refering to the variable also renamed.

    renamed:
      mysql-test/include/have_community_features.inc => mysql-test/include/have_profiling.inc
      mysql-test/r/have_community_features.require => mysql-test/r/have_profiling.require
    modified:
      mysql-test/t/profiling.test
      mysql-test/t/variables+c.test
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/set_var.cc
      mysql-test/include/have_profiling.inc
      mysql-test/r/have_profiling.require
=== renamed file 'mysql-test/include/have_community_features.inc' => 'mysql-test/include/have_profiling.inc'
--- a/mysql-test/include/have_community_features.inc	2008-07-04 18:48:25 +0000
+++ b/mysql-test/include/have_profiling.inc	2009-06-04 14:00:16 +0000
@@ -1,4 +1,4 @@
---require r/have_community_features.require
+--require r/have_profiling.require
 --disable_query_log
-show variables like 'have_community_features';
+show variables like 'have_profiling';
 --enable_query_log

=== renamed file 'mysql-test/r/have_community_features.require' => 'mysql-test/r/have_profiling.require'
--- a/mysql-test/r/have_community_features.require	2007-05-02 18:13:33 +0000
+++ b/mysql-test/r/have_profiling.require	2009-06-04 14:00:16 +0000
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_community_features	YES
+have_profiling  YES

=== modified file 'mysql-test/t/profiling.test'
--- a/mysql-test/t/profiling.test	2008-09-10 10:50:39 +0000
+++ b/mysql-test/t/profiling.test	2009-06-04 14:00:16 +0000
@@ -1,4 +1,4 @@
---source include/have_community_features.inc
+--source include/have_profiling.inc
 
 # Verify that the protocol isn't violated if we ask for profiling info
 # before profiling has recorded anything.

=== modified file 'mysql-test/t/variables+c.test'
--- a/mysql-test/t/variables+c.test	2007-05-02 18:13:33 +0000
+++ b/mysql-test/t/variables+c.test	2009-06-04 14:00:16 +0000
@@ -1,4 +1,4 @@
---source include/have_community_features.inc
+--source include/have_profiling.inc
 
 #
 # Bug#24822: Patch: uptime_since_flush_status

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-05-14 21:49:53 +0000
+++ b/sql/mysql_priv.h	2009-06-04 14:00:16 +0000
@@ -2129,7 +2129,7 @@ extern uint server_command_flags[];
 extern TYPELIB log_output_typelib;
 
 /* optional things, have_* variables */
-extern SHOW_COMP_OPTION have_community_features;
+extern SHOW_COMP_OPTION have_profiling;
 extern handlerton *partition_hton;
 extern handlerton *myisam_hton;
 extern handlerton *maria_hton;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-05-11 17:58:07 +0000
+++ b/sql/mysqld.cc	2009-06-04 14:00:16 +0000
@@ -707,7 +707,7 @@ MY_LOCALE *my_default_lc_time_names;
 SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache;
 SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 SHOW_COMP_OPTION have_crypt, have_compress;
-SHOW_COMP_OPTION have_community_features;
+SHOW_COMP_OPTION have_profiling;
 
 /* Thread specific variables */
 
@@ -8088,9 +8088,9 @@ static int mysql_init_variables(void)
 #endif
   opt_error_log= IF_WIN(1,0);
 #ifdef COMMUNITY_SERVER
-    have_community_features = SHOW_OPTION_YES;
+    have_profiling = SHOW_OPTION_YES;
 #else
-    have_community_features = SHOW_OPTION_NO;
+    have_profiling = SHOW_OPTION_NO;
 #endif
   global_system_variables.ndb_index_stat_enable=FALSE;
   max_system_variables.ndb_index_stat_enable=TRUE;

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-05-14 21:49:53 +0000
+++ b/sql/set_var.cc	2009-06-04 14:00:16 +0000
@@ -916,7 +916,7 @@ static sys_var_have_variable sys_have_ss
 static sys_var_have_plugin sys_have_partition_db(&vars, "have_partitioning", C_STRING_WITH_LEN("partition"), MYSQL_STORAGE_ENGINE_PLUGIN);
 static sys_var_have_variable sys_have_query_cache(&vars, "have_query_cache",
                                            &have_query_cache);
-static sys_var_have_variable sys_have_community_features(&vars, "have_community_features", &have_community_features);
+static sys_var_have_variable sys_have_profiling(&vars, "have_profiling", &have_profiling);
 static sys_var_have_variable sys_have_rtree_keys(&vars, "have_rtree_keys", &have_rtree_keys);
 static sys_var_have_variable sys_have_symlink(&vars, "have_symlink", &have_symlink);
 /* Global read-only variable describing server license */


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