summaryrefslogtreecommitdiff
path: root/sql/sql_profile.h
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-10-31 17:24:32 -0400
committercmiller@zippy.cornsilk.net <>2007-10-31 17:24:32 -0400
commite82bbb81d03f08883a8a5c773b0f65eed7767006 (patch)
tree665a520664743bd33169c3aaafedcb407c8c4de5 /sql/sql_profile.h
parent872d65a547b66de71ead4d6ac31de91e644dc12c (diff)
parent8d836dd38a847fbe1c21986dae97faaf5ef83dd5 (diff)
downloadmariadb-git-e82bbb81d03f08883a8a5c773b0f65eed7767006.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
Diffstat (limited to 'sql/sql_profile.h')
-rw-r--r--sql/sql_profile.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 7d2fbb7827d..1a6ebcd0b0e 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -39,6 +39,7 @@ extern const char * const _unknown_func_;
extern ST_FIELD_INFO query_profile_statistics_info[];
int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond);
+int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table);
#define PROFILE_NONE 0
@@ -315,12 +316,6 @@ public:
/* SHOW PROFILES */
bool show_profiles();
- /* SHOW PROFILE FOR QUERY query_id */
- bool show(uint options, uint profiling_query_id);
-
- /* SHOW PROFILE */
- bool show_last(uint options);
-
/* ... from INFORMATION_SCHEMA.PROFILING ... */
int fill_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond);
};