diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-10-09 15:59:25 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-10-09 15:59:25 +0200 |
| commit | 0da357645c41867552481b18b7de12806f743fe0 (patch) | |
| tree | 8628f4fb30cdce946155ba0ac7dae5cabe323eac /sql/sql_profile.cc | |
| parent | 220d9b8c4abed2feaa1523e2146e6d472f1c1627 (diff) | |
| download | mariadb-git-0da357645c41867552481b18b7de12806f743fe0.tar.gz | |
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.
Only --enable-profiling is now needed to enable profiling.
It was the only existing "community feature", so there was
no need for both configure options.
Using --enable-community-features will give a warning message
since it no longer exists.
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 8c9b147089f..3801d9a3f8d 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -47,7 +47,7 @@ const char * const _unknown_func_ = "<unknown>"; int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond) { -#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +#if defined(ENABLED_PROFILING) return(thd->profiling.fill_statistics_info(thd, tables, cond)); #else my_error(ER_FEATURE_DISABLED, MYF(0), "SHOW PROFILE", "enable-profiling"); @@ -129,7 +129,7 @@ int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table) } -#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) +#if defined(ENABLED_PROFILING) #define RUSAGE_USEC(tv) ((tv).tv_sec*1000*1000 + (tv).tv_usec) #define RUSAGE_DIFF_USEC(tv1, tv2) (RUSAGE_USEC((tv1))-RUSAGE_USEC((tv2))) |