diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
| commit | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (patch) | |
| tree | 14698de1876a7bea69d52b7f7ddaedbf0877551f /sql/sql_profile.cc | |
| parent | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (diff) | |
| download | mariadb-git-4822696ecb7302efc543e0be109f1c2a8f1bdf4e.tar.gz | |
Pull 5.1 treatment of community features into 5.0.
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 6ae70ab1d13..551a103da10 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) +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) 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) +#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))) |