diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-07-02 07:27:39 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-07-02 07:27:39 -0400 |
| commit | 01f572052d0d50a06745d5b6d96e20db81530d7b (patch) | |
| tree | 43cc3ae86d4795b1879f740d76ea9c9ea63a3599 /mysql-test | |
| parent | f3c5627a792fc5b1b531e13bb15921a4de244a33 (diff) | |
| download | mariadb-git-01f572052d0d50a06745d5b6d96e20db81530d7b.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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/profiling.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/profiling.test | 5 |
2 files changed, 9 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 diff --git a/mysql-test/t/profiling.test b/mysql-test/t/profiling.test index fd7562f6f16..960aa496731 100644 --- a/mysql-test/t/profiling.test +++ b/mysql-test/t/profiling.test @@ -1,3 +1,8 @@ +# Verify that the protocol isn't violated if we ask for profiling info +# before profiling has recorded anything. +show profiles; +show profile all; + # default is OFF show session variables like 'profil%'; select @@profiling; |