From 2b4a89561378fb1dca2a70e52afb2ca0562e12ee Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Apr 2007 18:11:55 -0400 Subject: Wrap code specific to the comunity-server in additional CPP #ifdef . Add a new autoconf paremeter --{en,dis}able-community-features . The default is disable for enterprise servers. Though this is a 5.0 tree, it is only to be merged into the 5.0-community tree and the global 5.1 tree, never to the 5.0-enterprise tree. configure.in: Add a new configure parameter, --enable-community-features for community features. mysql-test/t/profiling.test: Add testing for whether profiling is enabled or not. sql/mysqld.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/set_var.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_class.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_class.h: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_parse.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_prepare.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_profile.cc: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_profile.h: Add additional "COMMUNITY_SERVER" cpp definition test. sql/sql_show.cc: Add "COMMUNITY_SERVER" cpp definition test. mysql-test/include/profiling.inc: Add testing for whether profiling is enabled or not. mysql-test/r/profiling.require: Add testing for whether profiling is enabled or not. --- sql/sql_profile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_profile.h') diff --git a/sql/sql_profile.h b/sql/sql_profile.h index b82b5ce090c..c070f2f72d7 100644 --- a/sql/sql_profile.h +++ b/sql/sql_profile.h @@ -53,7 +53,7 @@ int fill_query_profile_statistics_info(THD *thd, struct st_table_list *tables, I #define PROFILE_ALL (~0) -#ifndef ENABLED_PROFILING +#if !defined(ENABLED_PROFILING) || !defined(COMMUNITY_SERVER) # define thd_proc_info(thd, msg) do { (thd)->proc_info= (msg); } while (0) -- cgit v1.2.1