From: Jon Olav Hauglid Date: June 10 2009 7:55am Subject: bzr commit into mysql-5.4-bugfixing branch (jon.hauglid:2798) Bug#44651 List-Archive: http://lists.mysql.com/commits/75980 X-Bug: 44651 Message-Id: <200906100755.n5A7tcgS022460@dm-uk-02.uk.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8551416039779552457==" --===============8551416039779552457== 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:jon.hauglid@stripped 2798 Jon Olav Hauglid 2009-06-10 Bug #44651 "have_community_features" variable should be renamed "have_profiling" 1) Renamed have_community_features server system variable to have_profiling. 2) Removed eable-community-features configure option and ENABLE_COMMUNITY_FEATURES macro. 3) Removed COMMUNITY_SERVER macro and replaced its usage by ENABLED_PROFILING . 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: configure.in include/config-win.h mysql-test/t/profiling.test mysql-test/t/variables+c.test sql/mysql_priv.h sql/mysqld.cc sql/set_var.cc sql/sql_parse.cc mysql-test/include/have_profiling.inc mysql-test/r/have_profiling.require === modified file 'configure.in' --- a/configure.in 2009-05-28 07:41:48 +0000 +++ b/configure.in 2009-06-10 07:55:29 +0000 @@ -639,24 +639,6 @@ then fi fi -AC_MSG_CHECKING(whether features provided by the user community should be included.) -AC_ARG_ENABLE(community-features, - AS_HELP_STRING( - [--enable-community-features], - [Enable additional features provided by the user community.]), - [ ENABLE_COMMUNITY_FEATURES=$enableval ], - [ ENABLE_COMMUNITY_FEATURES=no ] - ) - -if test "$ENABLE_COMMUNITY_FEATURES" = "yes" -then - AC_DEFINE([COMMUNITY_SERVER], [1], - [Whether features provided by the user community should be included]) - AC_MSG_RESULT([yes, community server]) -else - AC_MSG_RESULT([no, enterprise server]) -fi - AC_ARG_WITH(server-suffix, [ --with-server-suffix Append value to the version string.], [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ], === modified file 'include/config-win.h' --- a/include/config-win.h 2009-06-05 08:42:24 +0000 +++ b/include/config-win.h 2009-06-10 07:55:29 +0000 @@ -386,7 +386,6 @@ inline ulonglong double2ulonglong(double #define HAVE_OPENSSL 1 #define HAVE_YASSL 1 -#define COMMUNITY_SERVER 1 #define ENABLED_PROFILING 1 /* === 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-10 07:55:29 +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-10 07:55:29 +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-10 07:55:29 +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-10 07:55:29 +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-29 08:48:50 +0000 +++ b/sql/mysql_priv.h 2009-06-10 07:55:29 +0000 @@ -2130,7 +2130,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-25 07:11:29 +0000 +++ b/sql/mysqld.cc 2009-06-10 07:55:29 +0000 @@ -709,7 +709,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 */ @@ -7357,7 +7357,7 @@ static int show_starttime(THD *thd, SHOW return 0; } -#ifdef COMMUNITY_SERVER +#ifdef ENABLED_PROFILING static int show_flushstatustime(THD *thd, SHOW_VAR *var, char *buff) { var->type= SHOW_LONG; @@ -7855,7 +7855,7 @@ SHOW_VAR status_vars[]= { {"Threads_created", (char*) &thread_created, SHOW_LONG_NOFLUSH}, {"Threads_running", (char*) &thread_running, SHOW_INT}, {"Uptime", (char*) &show_starttime, SHOW_FUNC}, -#ifdef COMMUNITY_SERVER +#ifdef ENABLED_PROFILING {"Uptime_since_flush_status",(char*) &show_flushstatustime, SHOW_FUNC}, #endif {NullS, NullS, SHOW_LONG} @@ -8093,10 +8093,10 @@ static int mysql_init_variables(void) "d:t:i:o,/tmp/mysqld.trace"); #endif opt_error_log= IF_WIN(1,0); -#ifdef COMMUNITY_SERVER - have_community_features = SHOW_OPTION_YES; +#ifdef ENABLED_PROFILING + 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-25 06:46:00 +0000 +++ b/sql/set_var.cc 2009-06-10 07:55:29 +0000 @@ -910,9 +910,9 @@ static sys_var_have_plugin sys_have_ndbc static sys_var_have_variable sys_have_openssl(&vars, "have_openssl", &have_ssl); static sys_var_have_variable sys_have_ssl(&vars, "have_ssl", &have_ssl); 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_profiling(&vars, "have_profiling", &have_profiling); 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_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 */ === modified file 'sql/sql_parse.cc' --- a/sql/sql_parse.cc 2009-05-25 07:11:29 +0000 +++ b/sql/sql_parse.cc 2009-06-10 07:55:29 +0000 @@ -413,7 +413,7 @@ void execute_init_command(THD *thd, sys_ Vio* save_vio; ulong save_client_capabilities; -#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +#if defined(ENABLED_PROFILING) thd->profiling.start_new_query(); thd->profiling.set_query_source(init_command_var->value, init_command_var->value_length); @@ -441,7 +441,7 @@ void execute_init_command(THD *thd, sys_ thd->client_capabilities= save_client_capabilities; thd->net.vio= save_vio; -#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +#if defined(ENABLED_PROFILING) thd->profiling.finish_current_query(); #endif } @@ -551,7 +551,7 @@ pthread_handler_t handle_bootstrap(void bootstrap_error= thd->is_error(); thd->protocol->end_statement(); -#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +#if defined(ENABLED_PROFILING) thd->profiling.finish_current_query(); #endif --===============8551416039779552457== 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: 337379a455ca5aba254632e3c8a293be2989596f # timestamp: 2009-06-10 09:55:37 +0200 # base_revision_id: jon.hauglid@stripped\ # o27d1guc3g6qmk5r # # Begin bundle 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 --===============8551416039779552457==--