From: Vladislav Vaintroub
Date: February 5 2010 4:31pm
Subject: bzr commit into mysql-5.5-next-mr branch (vvaintroub:2987) Bug#50057
List-Archive: http://lists.mysql.com/commits/99485
X-Bug: 50057
Message-Id: <0KXD00B9CN92GJC0@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_eyjKssLk+pWD3iYQ8y5/OA)"

--Boundary_(ID_eyjKssLk+pWD3iYQ8y5/OA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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;
+


--Boundary_(ID_eyjKssLk+pWD3iYQ8y5/OA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/vvaintroub@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/vvaintroub@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@stripped
# target_branch: file:///H:/bzr/mysql-next-mr-bugfixing/
# testament_sha1: b20fbdf0a5a6f8e5fe79aa1b251b318249bc9d95
# timestamp: 2010-02-05 17:31:41 +0100
# base_revision_id: vvaintroub@stripped\
#   wae3b2wp8cj78k1t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcI2oFIAAkNfgEAwWWf//39l
/6C////wUAWjPUClm1pbaWjNVrhJIQEaCeplP0TJmmpP0QTRkaHpqaekNNpMhxkyZMRiYATJgmQA
0YRgCGASgimamQ1PQ0no1NTR7IoaHqeoB6hoDQAcZMmTEYmAEyYJkANGEYAhgEkkwptABNCp+JoZ
U09R6T1NGnqD1PSB6jTahRe075svdVO/y0L9eJcOTM7PJxUd226qPV015MmUGbI2l87405uLE48J
qGkAwmGt6fK/QS17ps6oWW03r7edEsGdyvyxkg5S3c0peDrDamWHHuETbRYdHVzvkPThCHjxW63k
B9vCH8zMU/1jFok/56yeuEckdUzwWUTI8OiBAy3IeuiJ3KTD0uE/RjiaIjPPi2YQ8PY95A4b7I6z
uxs+CIz2uAe76vayNP8oO70vIh7dBqJJgYDe/xNIGRh8ayJEDOhLXPrjpgYwSthK0XmhAvvgTXSn
RuXGMFdXgIFw5JcRnpLiPHERsAIJJ1BoeFSnUe6gDfoUugDMqBq3oD89nY8ObYRhlED9ILE38lWp
jxqmBSZ7Y68meBNU/IZuifGvEAbBJbAyLxhxjAeSCBExChF5QQGPl4qQ11QFRsLagNdkCorLFJ6c
WnKuvfTMC6wKALPuebiBeE42gVF/rK4fOQ15Bd++keXK64lQCY7CqRQGZ82Y9SwHmw5da5aKDVOQ
HCsUCFpXkg2+UiYKwsKiPHaA2OktVp5aT1majYGBAqLK1wMWMBhxSUMUwkcDBVFgxgA9Wn/EDVE2
GZndfYM+8iNtLHzYy1A8HnShCKjnZMiqhUbrzvqic1NoWXE6zmDOLaqobBiz8rn6XxuI2c+wF6Xo
DMmN2DADl5dn9SjZY1tE5OQ/gIlE8R6+Yh8yU6ZO3iIC4CJoCOAMlZRUL1ETQPeKAwzDDDRT0OgG
AnZahDUCWZ02C6kVBjjxEd4MW84EyphgLASLlx5nk5SVdsLXvsXsPoOhIZH++iF5fbV7y5Z6nmV0
vDAChecFG46JbkxTJc7fbtXfyDwUpjJQL3zL5xlJTp3T47Vli73wD8CosCg8WHlYbuodlTfdM9Dm
pdUWk6K+y0E5PIsR8U2btpaQB4NNBKtWupNF13vnZPoBPrd04TkD61QzGqOONknMP0VmkwKIi+48
lzF0rr10tqUhqKF1yyJFDexUaJbiDkzZj3RzyucZFELKqoG3pu2g5Y85GWJ6TJMFFgpMg2D0P0p1
nPWZ8TM5HE3qlbytKwqTksc+WmIUNGaQiFU29rxUyToNnjJPR501nETcV594Di55xNw+SVMCRoiG
ERrtveB2xNnBbuCEd0CHey3o+N00Tb97fXqQuyU68kHMCg3V7UDPtpkL9SyLsNbldVWRGiE1pPzO
C4hMQL7+fshXpGZAYVGM+N7VEVVoyjMF6lBiy77Ws6uEQS9KDUKr9ujCZpcElq19WPf6goEs8/c+
tgGvqLqocmGFFCV6CDOdBoceKUsZSiTCZdEMnL+fayUzrMkuUzjxK6ItwRooVCGTuZ6YwlNcSFhu
GxLA9bAOtcl5WWagtgrQ0v1HP2JOE05jP4Z7AKDH5zEAavbb1MX26wIoejpUbCOoDrWXgzDzPvea
2VFZCtZ6CVDBsdBIxUXSMcgFcVdjJ0m5Z3nFWyH21lNmnqVpOl6x9+bDNSVIIHhaUMdN0lyQpsVm
sa5gLUMJYun0i2UWln9NLiyYYzei/gVAX4qTAYlOCjwoH5X9i1DgZhXbxxqodNE12sARYMXBFC6U
+HkbNuzoKBSNfxHtdeUjVAqXeFKjJzd8M6DEBs4Waj3jgYjP6drhZrA81RjfDjSK57a2ZjuNvO1J
N9ZVNdz9IyiOIu5IpwoSGEbUCkA=


--Boundary_(ID_eyjKssLk+pWD3iYQ8y5/OA)--