diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 15:08:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 15:08:37 +0300 |
| commit | d476bbb0becb27d7d3cb1fc5cc0ac4d401622893 (patch) | |
| tree | 64caab6e7d4a7167ee56b4f7d6572bb07c30750a /sql/sql_profile.cc | |
| parent | 1a8f08b006616b0bb2a9e9e13969ebe406e9e3f2 (diff) | |
| parent | 16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff) | |
| download | mariadb-git-d476bbb0becb27d7d3cb1fc5cc0ac4d401622893.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 8c9b147089f..69e5bc3cbb4 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))) @@ -415,7 +415,7 @@ bool PROFILING::show_profiles() MYSQL_TYPE_DOUBLE)); field_list.push_back(new Item_empty_string("Query", 40)); - if (thd->protocol->send_fields(&field_list, + if (thd->protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); |