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

Merge lp:~laurynas-biveinis/percona-server/remove-rows-read into lp:percona-server/5.6

  1. remove-rows-read
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 363
Proposed branch: lp:~laurynas-biveinis/percona-server/remove-rows-read
Merge into: lp:percona-server/5.6
Diff against target: 91 lines (+9/-9)
4 files modified
Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc (+1/-1)
Percona-Server/mysql-test/r/percona_bug643149.result (+2/-2)
Percona-Server/mysql-test/r/percona_log_slow_verbosity.result (+4/-4)
Percona-Server/sql/log.cc (+2/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/remove-rows-read
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+166501@code.launchpad.net

Description of the change

Remove "Rows_read: X" from the extended slow query log, completing the implementation of https://blueprints.launchpad.net/percona-server/+spec/obsolete-rows-read-in-56 blueprint.

http://jenkins.percona.com/job/percona-server-5.6-param/124/

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc'
2--- Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc 2013-05-09 19:43:37 +0000
3+++ Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc 2013-05-30 12:55:33 +0000
4@@ -1,7 +1,7 @@
5 # Common extensions to the slow query log
6 --let grep_pattern = ^# Schema: .+ Last_errno: \d+ Killed: \d+\$
7 --source include/log_grep.inc
8---let grep_pattern = ^#.*Rows_affected: \d+ Rows_read: \d+\$
9+--let grep_pattern = ^#.*Rows_affected: \d+\$
10 --source include/log_grep.inc
11 --let grep_pattern = ^# Bytes_sent: \d+.*\$
12 --source include/log_grep.inc
13
14=== modified file 'Percona-Server/mysql-test/r/percona_bug643149.result'
15--- Percona-Server/mysql-test/r/percona_bug643149.result 2013-05-09 19:43:37 +0000
16+++ Percona-Server/mysql-test/r/percona_bug643149.result 2013-05-30 12:55:33 +0000
17@@ -8,13 +8,13 @@
18 1
19 # User@Host: root[root] @ localhost [] Id: X
20 # Schema: test Last_errno: X Killed: X
21-# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
22+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X
23 # Bytes_sent: X
24 # Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
25 # Profile_total: X.X Profile_total_cpu: X.X
26 # User@Host: root[root] @ localhost [] Id: X
27 # Schema: test Last_errno: X Killed: X
28-# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
29+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X
30 # Bytes_sent: X
31 # Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
32 # Profile_total: X.X Profile_total_cpu: X.X
33
34=== modified file 'Percona-Server/mysql-test/r/percona_log_slow_verbosity.result'
35--- Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 2013-05-09 19:43:37 +0000
36+++ Percona-Server/mysql-test/r/percona_log_slow_verbosity.result 2013-05-30 12:55:33 +0000
37@@ -9,7 +9,7 @@
38 log_slow_verbosity='microtime,innodb,query_plan':
39 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Schema: .+ Last_errno: \d+ Killed: \d+$
40 [log_grep.inc] lines: 2
41-[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
42+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^#.*Rows_affected: \d+$
43 [log_grep.inc] lines: 2
44 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_0 pattern: ^# Bytes_sent: \d+.*$
45 [log_grep.inc] lines: 2
46@@ -38,7 +38,7 @@
47 log_slow_verbosity='microtime,innodb,query_plan':
48 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Schema: .+ Last_errno: \d+ Killed: \d+$
49 [log_grep.inc] lines: 2
50-[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
51+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^#.*Rows_affected: \d+$
52 [log_grep.inc] lines: 2
53 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_1 pattern: ^# Bytes_sent: \d+.*$
54 [log_grep.inc] lines: 2
55@@ -65,7 +65,7 @@
56 log_slow_verbosity='microtime':
57 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Schema: .+ Last_errno: \d+ Killed: \d+$
58 [log_grep.inc] lines: 2
59-[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
60+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^#.*Rows_affected: \d+$
61 [log_grep.inc] lines: 2
62 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_2 pattern: ^# Bytes_sent: \d+.*$
63 [log_grep.inc] lines: 2
64@@ -92,7 +92,7 @@
65 log_slow_verbosity='query_plan':
66 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Schema: .+ Last_errno: \d+ Killed: \d+$
67 [log_grep.inc] lines: 2
68-[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^#.*Rows_affected: \d+ Rows_read: \d+$
69+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^#.*Rows_affected: \d+$
70 [log_grep.inc] lines: 2
71 [log_grep.inc] file: percona.slow_extended.log_slow_verbosity_3 pattern: ^# Bytes_sent: \d+.*$
72 [log_grep.inc] lines: 2
73
74=== modified file 'Percona-Server/sql/log.cc'
75--- Percona-Server/sql/log.cc 2013-05-26 10:55:00 +0000
76+++ Percona-Server/sql/log.cc 2013-05-30 12:55:33 +0000
77@@ -2000,12 +2000,12 @@
78 if (my_b_printf(&log_file,
79 "# Schema: %s Last_errno: %u Killed: %u\n"
80 "# Query_time: %s Lock_time: %s Rows_sent: %s "
81- "Rows_examined: %s Rows_affected: %s Rows_read: %s\n"
82+ "Rows_examined: %s Rows_affected: %s\n"
83 "# Bytes_sent: %lu",
84 (thd->db ? thd->db : ""),
85 thd->last_errno, (uint) thd->killed,
86 query_time_buff, lock_time_buff, sent_row_buff,
87- examined_row_buff, affected_row_buff, examined_row_buff,
88+ examined_row_buff, affected_row_buff,
89 (ulong) (thd->status_var.bytes_sent - thd->bytes_sent_old))
90 == (uint) -1)
91 tmp_errno= errno;

Subscribers

People subscribed via source and target branches