summaryrefslogtreecommitdiff
path: root/mysql-test/r/profiling.result
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-07-02 07:27:39 -0400
committerunknown <cmiller@zippy.cornsilk.net>2007-07-02 07:27:39 -0400
commit358b942b20bf04a2393487b4dded9b60ac5a2ef7 (patch)
tree43cc3ae86d4795b1879f740d76ea9c9ea63a3599 /mysql-test/r/profiling.result
parentd29f4da4fcbd1284c1fec7722f651331c7606ef9 (diff)
downloadmariadb-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 'mysql-test/r/profiling.result')
-rw-r--r--mysql-test/r/profiling.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
index 9f478d68b8d..b99870e3564 100644
--- a/mysql-test/r/profiling.result
+++ b/mysql-test/r/profiling.result
@@ -1,3 +1,7 @@
+show profiles;
+Query_ID Duration Query
+show profile all;
+Status Duration CPU_user CPU_system Context_voluntary Context_involuntary Block_ops_in Block_ops_out Messages_sent Messages_received Page_faults_major Page_faults_minor Swaps Source_function Source_file Source_line
show session variables like 'profil%';
Variable_name Value
profiling OFF