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

Merge lp:~akopytov/percona-server/bug830286-5.5 into lp:percona-server/5.5

  1. bug830286-5.5
  2. Merge into 5.5
Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 369
Proposed branch: lp:~akopytov/percona-server/bug830286-5.5
Merge into: lp:percona-server/5.5
Diff against target: 475 lines (+393/-11)
8 files modified
Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc (+50/-0)
Percona-Server/mysql-test/r/percona_bug830286.result (+15/-0)
Percona-Server/mysql-test/r/percona_processlist_row_stats.result (+9/-9)
Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result (+172/-0)
Percona-Server/mysql-test/t/percona_bug830286.test (+58/-0)
Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test (+87/-0)
Percona-Server/sql/log.cc (+1/-1)
Percona-Server/sql/sql_show.cc (+1/-1)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug830286-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
George Ormond Lorch III (community) g2 Approve
Vlad Lesin (community) Approve
Review via email: mp+131721@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/563/

Revision history for this message
Vlad Lesin (vlad-lesin) wrote :

Reviewed.

review: Approve
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Same typo as in 5.1.

review: Approve

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_slow_extended_error_on_quit.inc'
2--- Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc 1970-01-01 00:00:00 +0000
3+++ Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc 2012-10-27 06:47:21 +0000
4@@ -0,0 +1,50 @@
5+--echo ################################################################################
6+--let grep_pattern=CREATE
7+--source include/log_grep.inc
8+--let grep_pattern=INSERT
9+--source include/log_grep.inc
10+--let grep_pattern=SELECT
11+--source include/log_grep.inc
12+--let grep_pattern=Quit
13+--source include/log_grep.inc
14+--let grep_pattern=Last_errno: [^0]+
15+--source include/log_grep.inc
16+--let grep_pattern=Last_errno: 0
17+--source include/log_grep.inc
18+--let grep_pattern=Rows_sent: [^0]+
19+--source include/log_grep.inc
20+--let grep_pattern=Rows_sent: 0
21+--source include/log_grep.inc
22+--let grep_pattern=Rows_examined: [^0]+
23+--source include/log_grep.inc
24+--let grep_pattern=Rows_examined: 0
25+--source include/log_grep.inc
26+--let grep_pattern=Rows_affected: [^0]+
27+--source include/log_grep.inc
28+--let grep_pattern=Rows_affected: 0
29+--source include/log_grep.inc
30+--let grep_pattern=Rows_read: [^0]+
31+--source include/log_grep.inc
32+--let grep_pattern=Rows_read: 0
33+--source include/log_grep.inc
34+--let grep_pattern=Bytes_sent: [^0]+
35+--source include/log_grep.inc
36+--let grep_pattern=Bytes_sent: 0
37+--source include/log_grep.inc
38+--let grep_pattern=Tmp_tables: [^0]+
39+--source include/log_grep.inc
40+--let grep_pattern=Tmp_tables: 0
41+--source include/log_grep.inc
42+--let grep_pattern=Tmp_disk_tables: [^0]+
43+--source include/log_grep.inc
44+--let grep_pattern=Tmp_disk_tables: 0
45+--source include/log_grep.inc
46+--let grep_pattern=Tmp_table_sizes: [^0]+
47+--source include/log_grep.inc
48+--let grep_pattern=Tmp_table_sizes: 0
49+--source include/log_grep.inc
50+--let grep_pattern=# No InnoDB statistics available for this query
51+--source include/log_grep.inc
52+--let grep_pattern=# InnoDB_trx_id:
53+--source include/log_grep.inc
54+--echo ################################################################################
55
56=== added file 'Percona-Server/mysql-test/r/percona_bug830286.result'
57--- Percona-Server/mysql-test/r/percona_bug830286.result 1970-01-01 00:00:00 +0000
58+++ Percona-Server/mysql-test/r/percona_bug830286.result 2012-10-27 06:47:21 +0000
59@@ -0,0 +1,15 @@
60+SET @old_slow_query_log_file=@@global.slow_query_log_file;
61+SET GLOBAL slow_query_log=ON;
62+SET LOCAL long_query_time=0;
63+SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug830286_slow.log';;
64+CREATE TABLE t1(a INT);
65+INSERT INTO t1 VALUES (1), (2), (3), (4);
66+SELECT * FROM t1 LIMIT 1;
67+a
68+1
69+Rows_read: 0
70+Rows_read: 0
71+Rows_read: 0
72+Rows_read: 1
73+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
74+DROP TABLE t1;
75
76=== modified file 'Percona-Server/mysql-test/r/percona_processlist_row_stats.result'
77--- Percona-Server/mysql-test/r/percona_processlist_row_stats.result 2012-04-18 23:26:07 +0000
78+++ Percona-Server/mysql-test/r/percona_processlist_row_stats.result 2012-10-27 06:47:21 +0000
79@@ -14,9 +14,9 @@
80 SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
81 SHOW PROCESSLIST;
82 Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
83-### root ### test Query ### ### SHOW PROCESSLIST 0 0 2
84-### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0 1
85-### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5 6
86+### root ### test Query ### ### SHOW PROCESSLIST 0 0 0
87+### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0 0
88+### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5 5
89 SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
90 id info rows_sent rows_examined rows_read
91 ### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
92@@ -34,9 +34,9 @@
93 SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
94 SHOW PROCESSLIST;
95 Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
96-### root ### test Query ### ### SHOW PROCESSLIST 0 0 4
97-### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0 1
98-### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0 3
99+### root ### test Query ### ### SHOW PROCESSLIST 0 0 0
100+### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0 0
101+### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0 0
102 SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
103 id info rows_sent rows_examined rows_read
104 ### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
105@@ -58,9 +58,9 @@
106 SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
107 SHOW PROCESSLIST;
108 Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
109-### root ### test Query ### ### SHOW PROCESSLIST 0 0 4
110-### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6
111-### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6
112+### root ### test Query ### ### SHOW PROCESSLIST 0 0 0
113+### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5 5
114+### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5 5
115 SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
116 id info rows_sent rows_examined rows_read
117 ### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
118
119=== added file 'Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result'
120--- Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result 1970-01-01 00:00:00 +0000
121+++ Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result 2012-10-27 06:47:21 +0000
122@@ -0,0 +1,172 @@
123+DROP TABLE IF EXISTS t;
124+CREATE TABLE t(a INT) engine=InnoDB;
125+INSERT INTO t VALUES(0),(1),(2),(3),(4);
126+[log_start.inc] percona.slow_extended.error_on_quit
127+SET log_slow_verbosity=innodb;
128+SET long_query_time= 0;
129+CREATE TABLE t(a INT) engine=InnoDB;
130+# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
131+[log_stop.inc] percona.slow_extended.error_on_quit
132+################################################################################
133+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
134+[log_grep.inc] lines: 1
135+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
136+[log_grep.inc] lines: 0
137+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
138+[log_grep.inc] lines: 0
139+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
140+[log_grep.inc] lines: 1
141+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
142+[log_grep.inc] lines: 1
143+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
144+[log_grep.inc] lines: 2
145+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
146+[log_grep.inc] lines: 0
147+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
148+[log_grep.inc] lines: 3
149+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
150+[log_grep.inc] lines: 0
151+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
152+[log_grep.inc] lines: 3
153+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
154+[log_grep.inc] lines: 0
155+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
156+[log_grep.inc] lines: 3
157+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
158+[log_grep.inc] lines: 0
159+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
160+[log_grep.inc] lines: 3
161+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
162+[log_grep.inc] lines: 2
163+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
164+[log_grep.inc] lines: 1
165+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
166+[log_grep.inc] lines: 0
167+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
168+[log_grep.inc] lines: 3
169+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
170+[log_grep.inc] lines: 0
171+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
172+[log_grep.inc] lines: 3
173+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
174+[log_grep.inc] lines: 0
175+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
176+[log_grep.inc] lines: 3
177+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
178+[log_grep.inc] lines: 2
179+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
180+[log_grep.inc] lines: 1
181+################################################################################
182+[log_start.inc] percona.slow_extended.error_on_quit
183+SET log_slow_verbosity=innodb;
184+SET long_query_time= 0;
185+INSERT INTO t SELECT * FROM t ORDER BY RAND();
186+# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
187+[log_stop.inc] percona.slow_extended.error_on_quit
188+################################################################################
189+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
190+[log_grep.inc] lines: 0
191+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
192+[log_grep.inc] lines: 1
193+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
194+[log_grep.inc] lines: 1
195+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
196+[log_grep.inc] lines: 1
197+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
198+[log_grep.inc] lines: 0
199+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
200+[log_grep.inc] lines: 3
201+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
202+[log_grep.inc] lines: 0
203+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
204+[log_grep.inc] lines: 3
205+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
206+[log_grep.inc] lines: 1
207+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
208+[log_grep.inc] lines: 2
209+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
210+[log_grep.inc] lines: 2
211+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
212+[log_grep.inc] lines: 1
213+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
214+[log_grep.inc] lines: 1
215+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
216+[log_grep.inc] lines: 2
217+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
218+[log_grep.inc] lines: 2
219+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
220+[log_grep.inc] lines: 1
221+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
222+[log_grep.inc] lines: 1
223+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
224+[log_grep.inc] lines: 2
225+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
226+[log_grep.inc] lines: 0
227+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
228+[log_grep.inc] lines: 3
229+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
230+[log_grep.inc] lines: 1
231+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
232+[log_grep.inc] lines: 2
233+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
234+[log_grep.inc] lines: 2
235+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
236+[log_grep.inc] lines: 1
237+################################################################################
238+[log_start.inc] percona.slow_extended.error_on_quit
239+SET log_slow_verbosity=innodb;
240+SET long_query_time= 0;
241+SELECT * FROM t;
242+# Disconnecting (passing to Slow Query Log "# administrative command: Quit")
243+[log_stop.inc] percona.slow_extended.error_on_quit
244+################################################################################
245+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: CREATE
246+[log_grep.inc] lines: 0
247+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: INSERT
248+[log_grep.inc] lines: 0
249+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: SELECT
250+[log_grep.inc] lines: 1
251+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Quit
252+[log_grep.inc] lines: 1
253+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: [^0]+
254+[log_grep.inc] lines: 0
255+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 0
256+[log_grep.inc] lines: 3
257+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: [^0]+
258+[log_grep.inc] lines: 1
259+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_sent: 0
260+[log_grep.inc] lines: 2
261+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: [^0]+
262+[log_grep.inc] lines: 1
263+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_examined: 0
264+[log_grep.inc] lines: 2
265+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: [^0]+
266+[log_grep.inc] lines: 0
267+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
268+[log_grep.inc] lines: 3
269+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
270+[log_grep.inc] lines: 1
271+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
272+[log_grep.inc] lines: 2
273+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
274+[log_grep.inc] lines: 2
275+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
276+[log_grep.inc] lines: 1
277+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: [^0]+
278+[log_grep.inc] lines: 0
279+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_tables: 0
280+[log_grep.inc] lines: 3
281+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: [^0]+
282+[log_grep.inc] lines: 0
283+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_disk_tables: 0
284+[log_grep.inc] lines: 3
285+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: [^0]+
286+[log_grep.inc] lines: 0
287+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Tmp_table_sizes: 0
288+[log_grep.inc] lines: 3
289+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # No InnoDB statistics available for this query
290+[log_grep.inc] lines: 2
291+[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: # InnoDB_trx_id:
292+[log_grep.inc] lines: 1
293+################################################################################
294+DROP TABLE t;
295
296=== added file 'Percona-Server/mysql-test/t/percona_bug830286.test'
297--- Percona-Server/mysql-test/t/percona_bug830286.test 1970-01-01 00:00:00 +0000
298+++ Percona-Server/mysql-test/t/percona_bug830286.test 2012-10-27 06:47:21 +0000
299@@ -0,0 +1,58 @@
300+#########################################################################
301+# LP bug #830286: rows_read is overflowed when changing db
302+#########################################################################
303+
304+#
305+# This test suffers from server
306+# Bug#38124 "general_log_file" variable silently unset when using expression
307+# In short:
308+# SET GLOBAL general_log_file = @<whatever>
309+# SET GLOBAL slow_query_log = @<whatever>
310+# cause that the value of these server system variables is set to default
311+# instead of the assigned values. There comes no error message or warning.
312+# If this bug is fixed please
313+# 1. try this test with "let $fixed_bug38124 = 0;"
314+# 2. remove all workarounds if 1. was successful.
315+let $fixed_bug38124 = 0;
316+
317+SET @old_slow_query_log_file=@@global.slow_query_log_file;
318+SET GLOBAL slow_query_log=ON;
319+SET LOCAL long_query_time=0;
320+
321+let slogfile=$MYSQLTEST_VARDIR/percona_bug830286_slow.log;
322+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
323+--eval SET GLOBAL slow_query_log_file='$slogfile';
324+
325+--disable_ps_protocol
326+CREATE TABLE t1(a INT);
327+INSERT INTO t1 VALUES (1), (2), (3), (4);
328+SELECT * FROM t1 LIMIT 1;
329+--enable_ps_protocol
330+
331+perl;
332+ $slogfile= $ENV{'slogfile'};
333+
334+ open(FILE, "$slogfile") or
335+ die("Unable to read slow query log file $slogfile: $!\n");
336+ while(<FILE>) {
337+ next if (!/^# Query_time:/);
338+ s/.*(Rows_read: [0-9]+)/$1/g;
339+ print;
340+ }
341+
342+ close(FILE);
343+ open(FILE, '>', "$slogfile");
344+ close(FILE);
345+EOF
346+
347+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
348+
349+DROP TABLE t1;
350+
351+if(!$fixed_bug38124)
352+{
353+ --disable_query_log
354+ let $my_var = `SELECT @old_slow_query_log_file`;
355+ eval SET @@global.slow_query_log_file = '$my_var';
356+ --enable_query_log
357+}
358
359=== added file 'Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test'
360--- Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test 1970-01-01 00:00:00 +0000
361+++ Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test 2012-10-27 06:47:21 +0000
362@@ -0,0 +1,87 @@
363+################################################################################
364+# Current test check following attributes: #
365+# 1) "Last_errno" #
366+# 2) "Rows_{sent,examined|affected|read} #
367+# 3) Bytes_sent #
368+# 4) Tmp_{tables|dist_tables|table_size} #
369+# 5) InnoDB statistic counters #
370+# in Slow Query Log #
371+# for administrative command "Quit" #
372+# #
373+# See Launchpad Bug #716210 #
374+################################################################################
375+
376+--source include/have_innodb.inc
377+
378+################################################################################
379+--let log_file=percona.slow_extended.error_on_quit
380+--let wait_condition=SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
381+################################################################################
382+
383+--disable_warnings
384+DROP TABLE IF EXISTS t;
385+--enable_warnings
386+CREATE TABLE t(a INT) engine=InnoDB;
387+INSERT INTO t VALUES(0),(1),(2),(3),(4);
388+
389+################################################################################
390+--source include/log_start.inc
391+
392+--connect(additional,localhost,root,,)
393+--connection additional
394+
395+ SET log_slow_verbosity=innodb;
396+ SET long_query_time= 0;
397+
398+--disable_result_log
399+--error ER_TABLE_EXISTS_ERROR
400+ CREATE TABLE t(a INT) engine=InnoDB;
401+--enable_result_log
402+
403+--connection default
404+--echo # Disconnecting (passing to Slow Query Log "# administrative command: Quit")
405+--disconnect additional
406+--source include/wait_condition.inc
407+--source include/log_stop.inc
408+--source include/percona_slow_extended_error_on_quit.inc
409+################################################################################
410+--source include/log_start.inc
411+
412+--connect(additional,localhost,root,,)
413+--connection additional
414+
415+ SET log_slow_verbosity=innodb;
416+ SET long_query_time= 0;
417+
418+--disable_result_log
419+ INSERT INTO t SELECT * FROM t ORDER BY RAND();
420+--enable_result_log
421+
422+--connection default
423+--echo # Disconnecting (passing to Slow Query Log "# administrative command: Quit")
424+--disconnect additional
425+--source include/wait_condition.inc
426+--source include/log_stop.inc
427+--source include/percona_slow_extended_error_on_quit.inc
428+################################################################################
429+--source include/log_start.inc
430+
431+--connect(additional,localhost,root,,)
432+--connection additional
433+
434+ SET log_slow_verbosity=innodb;
435+ SET long_query_time= 0;
436+
437+--disable_result_log
438+ SELECT * FROM t;
439+--enable_result_log
440+
441+--connection default
442+--echo # Disconnecting (passing to Slow Query Log "# administrative command: Quit")
443+--disconnect additional
444+--source include/wait_condition.inc
445+--source include/log_stop.inc
446+--source include/percona_slow_extended_error_on_quit.inc
447+################################################################################
448+
449+DROP TABLE t;
450
451=== modified file 'Percona-Server/sql/log.cc'
452--- Percona-Server/sql/log.cc 2012-10-17 03:47:45 +0000
453+++ Percona-Server/sql/log.cc 2012-10-27 06:47:21 +0000
454@@ -2757,7 +2757,7 @@
455 (ulong) thd->sent_row_count,
456 (ulong) thd->examined_row_count,
457 ((long) thd->get_row_count_func() > 0 ) ? (ulong) thd->get_row_count_func() : 0,
458- (ulong) thd->sent_row_count,
459+ (ulong) thd->examined_row_count,
460 (ulong) (thd->status_var.bytes_sent - thd->bytes_sent_old),
461 (ulong) thd->tmp_tables_used,
462 (ulong) thd->tmp_tables_disk_used,
463
464=== modified file 'Percona-Server/sql/sql_show.cc'
465--- Percona-Server/sql/sql_show.cc 2012-09-17 13:08:32 +0000
466+++ Percona-Server/sql/sql_show.cc 2012-10-27 06:47:21 +0000
467@@ -1907,7 +1907,7 @@
468 }
469 thd_info->rows_sent= tmp->sent_row_count;
470 thd_info->rows_examined= tmp->examined_row_count;
471- thd_info->rows_read= tmp->warning_info->current_row_for_warning();
472+ thd_info->rows_read= tmp->examined_row_count;
473 mysql_mutex_unlock(&tmp->LOCK_thd_data);
474 thd_info->start_time= tmp->start_time;
475 thread_infos.append(thd_info);

Subscribers

People subscribed via source and target branches