bzr commit into mysql-5.5-next-mr branch (vvaintroub:2987) Bug#50057

[Vladislav Vaintroub]

#At file:///H:/bzr/mysql-next-mr-bugfixing/ based on revid:vvaintroub@stripped

 2987 Vladislav Vaintroub	2010-02-05
      Bug#50057: SHOW PROFILE CPU for Windows
      
      On QA request, adding test that causes new code to be called. 
      Even if we cannot validate the result, this will at least increase the code coverage.

    added:
      mysql-test/r/show_profile.result
      mysql-test/t/show_profile.test
=== added file 'mysql-test/r/show_profile.result'
--- a/mysql-test/r/show_profile.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/show_profile.result	2010-02-05 16:31:34 +0000
@@ -0,0 +1,10 @@
+SET profiling = 1;
+SELECT 1;
+1
+1
+SHOW PROFILES;
+Query_ID	Duration	Query
+1	#	SELECT 1
+SHOW PROFILE FOR QUERY 1;
+SHOW PROFILE CPU FOR QUERY 1;
+SET profiling = 0;

=== added file 'mysql-test/t/show_profile.test'
--- a/mysql-test/t/show_profile.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/show_profile.test	2010-02-05 16:31:34 +0000
@@ -0,0 +1,18 @@
+#
+# Test for show profiles
+# No meaningful check is possible. 
+# So it only checks that SET profiling is possible and
+# that SHOW PROFILES, SHOW PROFILE FOR QUERY and SHOW PROFILE CPU FOR QUERY
+# do not cause syntax errors. It also increases code coverage for sql_profile.cc
+
+--source include/have_profiling.inc
+SET profiling = 1;
+SELECT 1;
+--replace_column 2 #
+SHOW PROFILES;
+--disable_result_log
+SHOW PROFILE FOR QUERY 1;
+SHOW PROFILE CPU FOR QUERY 1;
+--enable_result_log 
+SET profiling = 0;
+


Attachment: [text/bzr-bundle] bzr/[e-mail]