diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-04-24 18:11:55 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-04-24 18:11:55 -0400 |
| commit | 93e804a6168d6e12deb5fdc26a2422f21a05db92 (patch) | |
| tree | dc6a44bf8c50bd1fc1d33f5a47a8887065892cb4 /sql/sql_profile.cc | |
| parent | bbd8b850cd61b1326849c45153a2a0c694cb12b1 (diff) | |
| download | mariadb-git-93e804a6168d6e12deb5fdc26a2422f21a05db92.tar.gz | |
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.
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 91b0b062e4f..77dea4f9954 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -31,7 +31,7 @@ const char * const _unknown_func_ = "<unknown>"; int fill_query_profile_statistics_info(THD *thd, struct st_table_list *tables, Item *cond) { -#ifdef ENABLED_PROFILING +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) return(thd->profiling.fill_statistics_info(thd, tables, cond)); #else return(1); @@ -62,7 +62,7 @@ ST_FIELD_INFO query_profile_statistics_info[]= {NULL, 0, MYSQL_TYPE_STRING, 0, true, NULL} }; -#ifdef ENABLED_PROFILING +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) #define RUSAGE_USEC(tv) ((tv).tv_sec*1000*1000 + (tv).tv_usec) #define RUSAGE_DIFF_USEC(tv1, tv2) (RUSAGE_USEC((tv1))-RUSAGE_USEC((tv2))) |