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

Merge lp:~percona-dev/percona-server/release-5.1.47-11-slow_query_log-test into lp:percona-server/release-5.1.47-11

  1. release-5.1.47-11-slow_query_log-test
  2. Merge into release-5.1.47-11
Proposed by Oleg Tsarev
Status: Merged
Merged at revision: 20
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-slow_query_log-test
Merge into: lp:percona-server/release-5.1.47-11
Diff against target: 275 lines (+171/-8)
14 files modified
mysql-test/percona_slow_query_log-log_slow_filter-master.opt (+1/-0)
mysql-test/percona_slow_query_log-log_slow_filter.result (+23/-0)
mysql-test/percona_slow_query_log-log_slow_filter.test (+27/-0)
mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt (+1/-0)
mysql-test/percona_slow_query_log-log_slow_verbosity.result (+9/-0)
mysql-test/percona_slow_query_log-log_slow_verbosity.test (+11/-0)
mysql-test/percona_slow_query_log-long_query_time.result (+2/-4)
mysql-test/percona_slow_query_log-long_query_time.test (+2/-4)
mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt (+1/-0)
mysql-test/percona_slow_query_log-min_examined_row_limit.result (+23/-0)
mysql-test/percona_slow_query_log-min_examined_row_limit.test (+27/-0)
mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt (+1/-0)
mysql-test/percona_slow_query_log-use_global_long_query_time.result (+24/-0)
mysql-test/percona_slow_query_log-use_global_long_query_time.test (+19/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-slow_query_log-test
Reviewer Review Type Date Requested Status
Yasufumi Kinoshita (community) Approve
Review via email: mp+26309@code.launchpad.net

Description of the change

Add test for slow_query_log

To post a comment you must log in.
Revision history for this message
Yasufumi Kinoshita (yasufumi-kinoshita) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'mysql-test/percona_slow_query_log-log_slow_filter-master.opt'
2--- mysql-test/percona_slow_query_log-log_slow_filter-master.opt 1970-01-01 00:00:00 +0000
3+++ mysql-test/percona_slow_query_log-log_slow_filter-master.opt 2010-05-28 14:32:30 +0000
4@@ -0,0 +1,1 @@
5+--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
6\ No newline at end of file
7
8=== added file 'mysql-test/percona_slow_query_log-log_slow_filter.result'
9--- mysql-test/percona_slow_query_log-log_slow_filter.result 1970-01-01 00:00:00 +0000
10+++ mysql-test/percona_slow_query_log-log_slow_filter.result 2010-05-28 14:32:30 +0000
11@@ -0,0 +1,23 @@
12+drop table if exists t;
13+# Create test table
14+create table t(id INT PRIMARY KEY) engine=InnoDB;
15+# Insert two rows to test table
16+insert into t values(1);
17+insert into t values(2);
18+insert into t values(3);
19+SELECT sleep(2);
20+sleep(2)
21+0
22+set log_slow_filter=full_join;
23+SELECT sleep(2) union select t2.id from t as t1,t as t2;
24+sleep(2)
25+0
26+1
27+2
28+3
29+SELECT sleep(2);
30+sleep(2)
31+0
32+drop table if exists t;
33+cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
34+2
35
36=== added file 'mysql-test/percona_slow_query_log-log_slow_filter.test'
37--- mysql-test/percona_slow_query_log-log_slow_filter.test 1970-01-01 00:00:00 +0000
38+++ mysql-test/percona_slow_query_log-log_slow_filter.test 2010-05-28 14:32:30 +0000
39@@ -0,0 +1,27 @@
40+source include/have_innodb.inc;
41+
42+--disable_warnings
43+drop table if exists t;
44+--enable_warnings
45+
46+--echo # Create test table
47+create table t(id INT PRIMARY KEY) engine=InnoDB;
48+--echo # Insert two rows to test table
49+insert into t values(1);
50+insert into t values(2);
51+insert into t values(3);
52+
53+SELECT sleep(2);
54+
55+set log_slow_filter=full_join;
56+
57+SELECT sleep(2) union select t2.id from t as t1,t as t2;
58+SELECT sleep(2);
59+
60+--disable_warnings
61+drop table if exists t;
62+--enable_warnings
63+
64+let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
65+echo $cmd;
66+exec $cmd;
67
68=== added file 'mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt'
69--- mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt 1970-01-01 00:00:00 +0000
70+++ mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt 2010-05-28 14:32:30 +0000
71@@ -0,0 +1,1 @@
72+--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
73\ No newline at end of file
74
75=== added file 'mysql-test/percona_slow_query_log-log_slow_verbosity.result'
76--- mysql-test/percona_slow_query_log-log_slow_verbosity.result 1970-01-01 00:00:00 +0000
77+++ mysql-test/percona_slow_query_log-log_slow_verbosity.result 2010-05-28 14:32:30 +0000
78@@ -0,0 +1,9 @@
79+SELECT sleep(2);
80+sleep(2)
81+0
82+set log_slow_verbosity=innodb;
83+SELECT sleep(2);
84+sleep(2)
85+0
86+cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l
87+1
88
89=== added file 'mysql-test/percona_slow_query_log-log_slow_verbosity.test'
90--- mysql-test/percona_slow_query_log-log_slow_verbosity.test 1970-01-01 00:00:00 +0000
91+++ mysql-test/percona_slow_query_log-log_slow_verbosity.test 2010-05-28 14:32:30 +0000
92@@ -0,0 +1,11 @@
93+source include/have_innodb.inc;
94+
95+SELECT sleep(2);
96+
97+set log_slow_verbosity=innodb;
98+
99+SELECT sleep(2);
100+
101+let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l;
102+echo $cmd;
103+exec $cmd;
104
105=== modified file 'mysql-test/percona_slow_query_log-long_query_time.result'
106--- mysql-test/percona_slow_query_log-long_query_time.result 2010-05-26 14:18:37 +0000
107+++ mysql-test/percona_slow_query_log-long_query_time.result 2010-05-28 14:32:30 +0000
108@@ -7,8 +7,7 @@
109 SELECT sleep(5);
110 sleep(5)
111 0
112-set global long_query_time=4;
113-set global use_global_long_query_time=1;
114+set long_query_time=4;
115 SELECT sleep(1);
116 sleep(1)
117 0
118@@ -18,7 +17,6 @@
119 SELECT sleep(5);
120 sleep(5)
121 0
122-set global long_query_time=2;
123-set global use_global_long_query_time=0;
124+set long_query_time=2;
125 cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
126 3
127
128=== modified file 'mysql-test/percona_slow_query_log-long_query_time.test'
129--- mysql-test/percona_slow_query_log-long_query_time.test 2010-05-26 14:18:37 +0000
130+++ mysql-test/percona_slow_query_log-long_query_time.test 2010-05-28 14:32:30 +0000
131@@ -4,15 +4,13 @@
132 SELECT sleep(3);
133 SELECT sleep(5);
134
135-set global long_query_time=4;
136-set global use_global_long_query_time=1;
137+set long_query_time=4;
138
139 SELECT sleep(1);
140 SELECT sleep(3);
141 SELECT sleep(5);
142
143-set global long_query_time=2;
144-set global use_global_long_query_time=0;
145+set long_query_time=2;
146
147 let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
148 echo $cmd;
149
150=== added file 'mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt'
151--- mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt 1970-01-01 00:00:00 +0000
152+++ mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt 2010-05-28 14:32:30 +0000
153@@ -0,0 +1,1 @@
154+--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
155\ No newline at end of file
156
157=== added file 'mysql-test/percona_slow_query_log-min_examined_row_limit.result'
158--- mysql-test/percona_slow_query_log-min_examined_row_limit.result 1970-01-01 00:00:00 +0000
159+++ mysql-test/percona_slow_query_log-min_examined_row_limit.result 2010-05-28 14:32:30 +0000
160@@ -0,0 +1,23 @@
161+drop table if exists t;
162+# Create test table
163+create table t(id INT PRIMARY KEY) engine=InnoDB;
164+# Insert two rows to test table
165+insert into t values(1);
166+insert into t values(2);
167+insert into t values(3);
168+SELECT sleep(2);
169+sleep(2)
170+0
171+set min_examined_row_limit=5;
172+SELECT sleep(2) union select t2.id from t as t1,t as t2;
173+sleep(2)
174+0
175+1
176+2
177+3
178+SELECT sleep(2);
179+sleep(2)
180+0
181+drop table if exists t;
182+cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
183+2
184
185=== added file 'mysql-test/percona_slow_query_log-min_examined_row_limit.test'
186--- mysql-test/percona_slow_query_log-min_examined_row_limit.test 1970-01-01 00:00:00 +0000
187+++ mysql-test/percona_slow_query_log-min_examined_row_limit.test 2010-05-28 14:32:30 +0000
188@@ -0,0 +1,27 @@
189+source include/have_innodb.inc;
190+
191+--disable_warnings
192+drop table if exists t;
193+--enable_warnings
194+
195+--echo # Create test table
196+create table t(id INT PRIMARY KEY) engine=InnoDB;
197+--echo # Insert two rows to test table
198+insert into t values(1);
199+insert into t values(2);
200+insert into t values(3);
201+
202+SELECT sleep(2);
203+
204+set min_examined_row_limit=5;
205+
206+SELECT sleep(2) union select t2.id from t as t1,t as t2;
207+SELECT sleep(2);
208+
209+--disable_warnings
210+drop table if exists t;
211+--enable_warnings
212+
213+let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
214+echo $cmd;
215+exec $cmd;
216
217=== added file 'mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt'
218--- mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt 1970-01-01 00:00:00 +0000
219+++ mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt 2010-05-28 14:32:30 +0000
220@@ -0,0 +1,1 @@
221+--slow-query-log-file=percona_slow_query_log.log --long-query-time=2
222\ No newline at end of file
223
224=== added file 'mysql-test/percona_slow_query_log-use_global_long_query_time.result'
225--- mysql-test/percona_slow_query_log-use_global_long_query_time.result 1970-01-01 00:00:00 +0000
226+++ mysql-test/percona_slow_query_log-use_global_long_query_time.result 2010-05-28 14:32:30 +0000
227@@ -0,0 +1,24 @@
228+SELECT sleep(1);
229+sleep(1)
230+0
231+SELECT sleep(3);
232+sleep(3)
233+0
234+SELECT sleep(5);
235+sleep(5)
236+0
237+set global long_query_time=4;
238+set global use_global_long_query_time=1;
239+SELECT sleep(1);
240+sleep(1)
241+0
242+SELECT sleep(3);
243+sleep(3)
244+0
245+SELECT sleep(5);
246+sleep(5)
247+0
248+set global long_query_time=2;
249+set global use_global_long_query_time=0;
250+cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
251+3
252
253=== added file 'mysql-test/percona_slow_query_log-use_global_long_query_time.test'
254--- mysql-test/percona_slow_query_log-use_global_long_query_time.test 1970-01-01 00:00:00 +0000
255+++ mysql-test/percona_slow_query_log-use_global_long_query_time.test 2010-05-28 14:32:30 +0000
256@@ -0,0 +1,19 @@
257+source include/have_innodb.inc;
258+
259+SELECT sleep(1);
260+SELECT sleep(3);
261+SELECT sleep(5);
262+
263+set global long_query_time=4;
264+set global use_global_long_query_time=1;
265+
266+SELECT sleep(1);
267+SELECT sleep(3);
268+SELECT sleep(5);
269+
270+set global long_query_time=2;
271+set global use_global_long_query_time=0;
272+
273+let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
274+echo $cmd;
275+exec $cmd;

Subscribers

People subscribed via source and target branches

to all changes: