Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~percona-dev/percona-server/release-5.1.49-12-618573 into lp:percona-server/release-5.1.49-12

  1. release-5.1.49-12-618573
  2. Merge into release-5.1.49-12
Proposed by Oleg Tsarev
Status: Merged
Approved by: Percona
Approved revision: no longer in the source branch.
Merged at revision: 100
Proposed branch: lp:~percona-dev/percona-server/release-5.1.49-12-618573
Merge into: lp:percona-server/release-5.1.49-12
Diff against target: 87 lines (+11/-7)
4 files modified
mysql-test/percona_query_response_time-stored.result (+10/-5)
mysql-test/percona_query_response_time-stored.test (+1/-0)
mysql-test/percona_query_response_time_stored_procedure.result (+0/-1)
mysql-test/percona_query_response_time_stored_procedure.test (+0/-1)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.49-12-618573
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+32740@code.launchpad.net

Description of the change

fix bug 618573

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/percona_query_response_time-stored.result'
2--- mysql-test/percona_query_response_time-stored.result 2010-08-15 00:33:51 +0000
3+++ mysql-test/percona_query_response_time-stored.result 2010-08-16 09:42:41 +0000
4@@ -4,6 +4,7 @@
5 DECLARE first VARCHAR(5);
6 DECLARE second VARCHAR(5);
7 DECLARE result VARCHAR(20);
8+SELECT SLEEP(1.11) INTO first;
9 SET first= 'Hello';
10 SET second=', ';
11 SET result= CONCAT(first,second);
12@@ -96,8 +97,8 @@
13 (SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
14 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
15 count query_count not_zero_region_count region_count
16+1 5 2 44
17 4 5 2 44
18-1 5 2 44
19 SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
20 region_count
21 44
22@@ -166,7 +167,8 @@
23 (SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
24 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
25 count query_count not_zero_region_count region_count
26-2 2 1 14
27+1 2 2 14
28+1 2 2 14
29 SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
30 region_count
31 14
32@@ -205,7 +207,8 @@
33 (SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
34 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
35 count query_count not_zero_region_count region_count
36-2 2 1 17
37+1 2 2 17
38+1 2 2 17
39 SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
40 region_count
41 17
42@@ -247,7 +250,8 @@
43 (SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
44 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
45 count query_count not_zero_region_count region_count
46-2 2 1 7
47+1 2 2 7
48+1 2 2 7
49 SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
50 region_count
51 7
52@@ -279,7 +283,8 @@
53 (SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
54 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count > 0;
55 count query_count not_zero_region_count region_count
56-2 2 1 6
57+1 2 2 6
58+1 2 2 6
59 SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
60 region_count
61 6
62
63=== modified file 'mysql-test/percona_query_response_time-stored.test'
64--- mysql-test/percona_query_response_time-stored.test 2010-08-15 00:33:51 +0000
65+++ mysql-test/percona_query_response_time-stored.test 2010-08-16 09:42:41 +0000
66@@ -7,6 +7,7 @@
67 DECLARE first VARCHAR(5);
68 DECLARE second VARCHAR(5);
69 DECLARE result VARCHAR(20);
70+ SELECT SLEEP(1.11) INTO first;
71 SET first= 'Hello';
72 SET second=', ';
73 SET result= CONCAT(first,second);
74
75=== removed file 'mysql-test/percona_query_response_time_stored_procedure.result'
76--- mysql-test/percona_query_response_time_stored_procedure.result 2010-08-15 00:33:51 +0000
77+++ mysql-test/percona_query_response_time_stored_procedure.result 1970-01-01 00:00:00 +0000
78@@ -1,1 +0,0 @@
79-test
80\ No newline at end of file
81
82=== removed file 'mysql-test/percona_query_response_time_stored_procedure.test'
83--- mysql-test/percona_query_response_time_stored_procedure.test 2010-08-15 00:33:51 +0000
84+++ mysql-test/percona_query_response_time_stored_procedure.test 1970-01-01 00:00:00 +0000
85@@ -1,1 +0,0 @@
86-echo "test";
87\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: