From: Jon Olav Hauglid Date: June 4 2009 2:00pm Subject: bzr commit into mysql-azalea branch (jon.hauglid:2791) Bug#44651 List-Archive: http://lists.mysql.com/commits/75620 X-Bug: 44651 Message-Id: <200906041400.n54E0Qs7007006@dm-uk-02.uk.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5972233363308643360==" --===============5972233363308643360== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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 */ --===============5972233363308643360== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jon.hauglid@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@stripped # target_branch: file:///export/home/z/mysql-azalea-bugfixing-\ # bug44651/ # testament_sha1: 5425ceb9db42247a5c5b94693af69ea9d91798d2 # timestamp: 2009-06-04 16:00:25 +0200 # base_revision_id: magne.mahre@stripped\ # oo2390nb71mzsir5 # # Begin bundle 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 --===============5972233363308643360==--