Merge lp:~longbow/percona-server/ps51_log_slow_rate_limit into lp:percona-server/5.1

Proposed by Valentine Gostev
Status: Rejected
Rejected by: Laurynas Biveinis
Proposed branch: lp:~longbow/percona-server/ps51_log_slow_rate_limit
Merge into: lp:percona-server/5.1
Diff against target: 189 lines (+141/-2)
7 files modified
Percona-Server/mysql-test/include/percona_log_slow_rate_limit_show.inc (+4/-0)
Percona-Server/mysql-test/r/percona_log_slow_rate_limit.result (+87/-0)
Percona-Server/mysql-test/r/percona_log_slow_rate_limit_check.result (+16/-0)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+0/-1)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_rate_limit.test (+8/-0)
Percona-Server/mysql-test/t/percona_log_slow_rate_limit_check.test (+26/-0)
To merge this branch: bzr merge lp:~longbow/percona-server/ps51_log_slow_rate_limit
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Needs Fixing
Oleg Tsarev (community) Needs Fixing
Review via email: mp+87226@code.launchpad.net

Description of the change

Added test for log_slow_rate_limit variable

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

Please also add test to sys_vars suite.

review: Needs Fixing
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Try running percona_log_slow_rate_limit, percona_server_variables_debug and percona_server_variables_release -- they are broken.

review: Needs Fixing

Unmerged revisions

414. By Valentine Gostev

Added test for log_slow_rate_limit variable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Percona-Server/mysql-test/include/percona_log_slow_rate_limit_show.inc'
2--- Percona-Server/mysql-test/include/percona_log_slow_rate_limit_show.inc 1970-01-01 00:00:00 +0000
3+++ Percona-Server/mysql-test/include/percona_log_slow_rate_limit_show.inc 2012-01-02 07:34:25 +0000
4@@ -0,0 +1,4 @@
5+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
6+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
7+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
8+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
9
10=== added file 'Percona-Server/mysql-test/r/percona_log_slow_rate_limit.result'
11--- Percona-Server/mysql-test/r/percona_log_slow_rate_limit.result 1970-01-01 00:00:00 +0000
12+++ Percona-Server/mysql-test/r/percona_log_slow_rate_limit.result 2012-01-02 07:34:25 +0000
13@@ -0,0 +1,87 @@
14++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
15+
16+2589
17++Variable_name Value
18+
19+2590
20++log_slow_rate_limit 1
21+
22+2591
23++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
24+
25+2592
26++Variable_name Value
27+
28+2593
29++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
30+
31+2594
32++VARIABLE_NAME VARIABLE_VALUE
33+
34+2595
35++LOG_SLOW_RATE_LIMIT 1
36+
37+2596
38++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
39+
40+2597
41++VARIABLE_NAME VARIABLE_VALUE
42+
43+2598
44++SET GLOBAL log_slow_rate_limit=2;
45+
46+2599
47++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
48+
49+2600
50++Variable_name Value
51+
52+2601
53++log_slow_rate_limit 2
54+
55+2602
56++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
57+
58+2603
59++Variable_name Value
60+
61+2604
62++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
63+
64+2605
65++VARIABLE_NAME VARIABLE_VALUE
66+
67+2606
68++LOG_SLOW_RATE_LIMIT 2
69+
70+2607
71++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
72+
73+2608
74++VARIABLE_NAME VARIABLE_VALUE
75+
76+2609
77++SET GLOBAL log_slow_rate_limit=100;
78+
79+2610
80+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
81+Variable_name Value
82+log_slow_rate_limit 100
83+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
84+Variable_name Value
85+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
86+VARIABLE_NAME VARIABLE_VALUE
87+LOG_SLOW_RATE_LIMIT 100
88+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
89+VARIABLE_NAME VARIABLE_VALUE
90+SET GLOBAL log_slow_rate_limit=default;
91+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
92+Variable_name Value
93+log_slow_rate_limit 1
94+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
95+Variable_name Value
96+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
97+VARIABLE_NAME VARIABLE_VALUE
98+LOG_SLOW_RATE_LIMIT 1
99+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
100+VARIABLE_NAME VARIABLE_VALUE
101
102=== added file 'Percona-Server/mysql-test/r/percona_log_slow_rate_limit_check.result'
103--- Percona-Server/mysql-test/r/percona_log_slow_rate_limit_check.result 1970-01-01 00:00:00 +0000
104+++ Percona-Server/mysql-test/r/percona_log_slow_rate_limit_check.result 2012-01-02 07:34:25 +0000
105@@ -0,0 +1,16 @@
106+DROP TABLE IF EXISTS t1;
107+CREATE TABLE t1 (a INT);
108+INSERT INTO t1 VALUES (123);
109+SET GLOBAL use_global_log_slow_control='long_query_time';
110+SET GLOBAL long_query_time=0;
111+SET GLOBAL log_slow_rate_limit=2;
112+[log_start.inc] percona_log_slow_rate_limit_check_slowlog
113+SELECT COUNT(*) FROM t1;
114+COUNT(*)
115+1
116+SELECT COUNT(*) FROM t1;
117+COUNT(*)
118+1
119+[log_stop.inc] percona_log_slow_rate_limit_check_slowlog
120+[log_grep.inc] file: percona_log_slow_rate_limit_check_slowlog pattern: SELECT COUNT
121+[log_grep.inc] lines: 1
122
123=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_debug.result'
124--- Percona-Server/mysql-test/r/percona_server_variables_debug.result 2011-12-28 09:51:02 +0000
125+++ Percona-Server/mysql-test/r/percona_server_variables_debug.result 2012-01-02 07:34:25 +0000
126@@ -189,7 +189,6 @@
127 LOG_SLOW_ADMIN_STATEMENTS
128 LOG_SLOW_FILTER
129 LOG_SLOW_QUERIES
130-LOG_SLOW_RATE_LIMIT
131 LOG_SLOW_SLAVE_STATEMENTS
132 LOG_SLOW_SP_STATEMENTS
133 LOG_SLOW_TIMESTAMP_EVERY
134
135=== modified file 'Percona-Server/mysql-test/r/percona_server_variables_release.result'
136--- Percona-Server/mysql-test/r/percona_server_variables_release.result 2011-11-24 02:01:33 +0000
137+++ Percona-Server/mysql-test/r/percona_server_variables_release.result 2012-01-02 07:34:25 +0000
138@@ -187,7 +187,6 @@
139 LOG_SLOW_ADMIN_STATEMENTS
140 LOG_SLOW_FILTER
141 LOG_SLOW_QUERIES
142-LOG_SLOW_RATE_LIMIT
143 LOG_SLOW_SLAVE_STATEMENTS
144 LOG_SLOW_SP_STATEMENTS
145 LOG_SLOW_TIMESTAMP_EVERY
146
147=== added file 'Percona-Server/mysql-test/t/percona_log_slow_rate_limit.test'
148--- Percona-Server/mysql-test/t/percona_log_slow_rate_limit.test 1970-01-01 00:00:00 +0000
149+++ Percona-Server/mysql-test/t/percona_log_slow_rate_limit.test 2012-01-02 07:34:25 +0000
150@@ -0,0 +1,8 @@
151+--source include/percona_log_slow_rate_limit_show.inc
152+SET GLOBAL log_slow_rate_limit=2;
153+--source include/percona_log_slow_rate_limit_show.inc
154+SET GLOBAL log_slow_rate_limit=100;
155+--source include/percona_log_slow_rate_limit_show.inc
156+SET GLOBAL log_slow_rate_limit=default;
157+--source include/percona_log_slow_rate_limit_show.inc
158+
159
160=== added file 'Percona-Server/mysql-test/t/percona_log_slow_rate_limit_check.test'
161--- Percona-Server/mysql-test/t/percona_log_slow_rate_limit_check.test 1970-01-01 00:00:00 +0000
162+++ Percona-Server/mysql-test/t/percona_log_slow_rate_limit_check.test 2012-01-02 07:34:25 +0000
163@@ -0,0 +1,26 @@
164+--let log_file=percona_log_slow_rate_limit_check_slowlog
165+--disable_warnings
166+DROP TABLE IF EXISTS t1;
167+--enable_warnings
168+
169+CREATE TABLE t1 (a INT);
170+INSERT INTO t1 VALUES (123);
171+SET GLOBAL use_global_log_slow_control='long_query_time';
172+SET GLOBAL long_query_time=0;
173+SET GLOBAL log_slow_rate_limit=2;
174+--source include/log_start.inc
175+connect (conn1,localhost,root,,);
176+connect (conn2,localhost,root,,);
177+connection conn1;
178+SELECT COUNT(*) FROM t1;
179+connection conn2;
180+SELECT COUNT(*) FROM t1;
181+connection default;
182+--source include/log_stop.inc
183+
184+--let grep_pattern = SELECT COUNT
185+--source include/log_grep.inc
186+DROP TABLE t1;
187+SET GLOBAL use_global_log_slow_control='';
188+SET GLOBAL long_query_time=default;
189+SET GLOBAL log_slow_rate_limit=default;

Subscribers

People subscribed via source and target branches