diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2007-07-02 07:27:39 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2007-07-02 07:27:39 -0400 |
commit | 358b942b20bf04a2393487b4dded9b60ac5a2ef7 (patch) | |
tree | 43cc3ae86d4795b1879f740d76ea9c9ea63a3599 /sql/sql_profile.h | |
parent | d29f4da4fcbd1284c1fec7722f651331c7606ef9 (diff) | |
download | mariadb-git-358b942b20bf04a2393487b4dded9b60ac5a2ef7.tar.gz |
Unify profiling SHOW code and INFORMATION_SCHEMA code for
profiling. Also,
Bug#26938: profiling client hang if used before enabled
In the SHOW command, not sending header data because we had no
rows to send was a protocol violation. Porting the SHOW PROFILE
command to use the Information Schema table avoids that problem.
mysql-test/r/profiling.result:
Add headers of pre-profile SHOW test.
mysql-test/t/profiling.test:
Verify that the protocol isn't violated if we ask for profiling
info before profiling has recorded anything.
sql/sql_parse.cc:
Remove SQLCOM_SHOW_PROFILE and add a I_S schema table entry.
sql/sql_profile.cc:
Add SHOW column-names and a new function that takes profile options
set in the parser and packs a list of selected fields from the
I_S table implementation.
sql/sql_profile.h:
Remove unused functions and add a new function.
sql/sql_show.cc:
Add a pointer to the function that selects fields from I_S table
for SHOW command.
sql/sql_yacc.yy:
Prepare an I_S table for SHOW PROFILE.
sql/table.h:
Rename to match the intention.
Diffstat (limited to 'sql/sql_profile.h')
-rw-r--r-- | sql/sql_profile.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h index b82b5ce090c..56022de0dcc 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, struct st_table_list *tables, Item *cond); +int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table); #define PROFILE_NONE 0 @@ -332,12 +333,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, struct st_table_list *tables, Item *cond); }; |