Merge lp:~laurynas-biveinis/percona-server/bug1419230-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis on 2015-02-10
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-10
Approved revision: 723
Merged at revision: 732
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1419230-5.5
Merge into: lp:percona-server/5.5
Diff against target: 61 lines (+7/-7)
3 files modified
mysql-test/r/percona_log_slow_sp_statements.result (+3/-3)
mysql-test/t/percona_log_slow_sp_statements.test (+3/-3)
sql/log.cc (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1419230-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2015-02-10
Review via email: mp+249171@code.launchpad.net

Description of the change

Fix bug 1419230 (The stored procedure key uses spaces instead of
underscores in the extended slow query log).

The stored procedure identifier is logged with a "# Stored procedure:
" key, where as the rest of information use underscores, i.e. "#
QC_Hit: ". Fixed trivially, adjusted the testcase.

http://jenkins.percona.com/job/percona-server-5.5-param/1087/#showFailuresLink

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/r/percona_log_slow_sp_statements.result'
2--- mysql-test/r/percona_log_slow_sp_statements.result 2014-12-01 21:13:37 +0000
3+++ mysql-test/r/percona_log_slow_sp_statements.result 2015-02-10 11:22:10 +0000
4@@ -32,9 +32,9 @@
5 [log_grep.inc] lines: 2
6 [log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_
7 [log_grep.inc] lines: 0
8-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_outer
9+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_outer
10 [log_grep.inc] lines: 2
11-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_inner
12+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_inner
13 [log_grep.inc] lines: 2
14 SET GLOBAL log_slow_sp_statements=OFF;
15 [log_start.inc] percona.slow_extended.sp2
16@@ -55,7 +55,7 @@
17 [log_grep.inc] lines: 0
18 [log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_
19 [log_grep.inc] lines: 2
20-[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored routine: test.test_
21+[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored_routine: test.test_
22 [log_grep.inc] lines: 0
23 DROP PROCEDURE test_outer;
24 DROP PROCEDURE test_inner;
25
26=== modified file 'mysql-test/t/percona_log_slow_sp_statements.test'
27--- mysql-test/t/percona_log_slow_sp_statements.test 2014-12-01 21:13:37 +0000
28+++ mysql-test/t/percona_log_slow_sp_statements.test 2015-02-10 11:22:10 +0000
29@@ -39,9 +39,9 @@
30 --source include/log_grep.inc
31 --let grep_pattern=CALL test_
32 --source include/log_grep.inc
33---let grep_pattern=# Stored routine: test.test_outer
34+--let grep_pattern=# Stored_routine: test.test_outer
35 --source include/log_grep.inc
36---let grep_pattern=# Stored routine: test.test_inner
37+--let grep_pattern=# Stored_routine: test.test_inner
38 --source include/log_grep.inc
39
40 SET GLOBAL log_slow_sp_statements=OFF;
41@@ -56,7 +56,7 @@
42 --source include/log_grep.inc
43 --let grep_pattern=CALL test_
44 --source include/log_grep.inc
45---let grep_pattern=# Stored routine: test.test_
46+--let grep_pattern=# Stored_routine: test.test_
47 --source include/log_grep.inc
48
49 DROP PROCEDURE test_outer;
50
51=== modified file 'sql/log.cc'
52--- sql/log.cc 2014-12-02 12:54:54 +0000
53+++ sql/log.cc 2015-02-10 11:22:10 +0000
54@@ -2833,7 +2833,7 @@
55 if (opt_log_slow_sp_statements &&
56 thd->spcont &&
57 my_b_printf(&log_file,
58- "# Stored routine: %s\n",
59+ "# Stored_routine: %s\n",
60 thd->spcont->sp->m_qname.str) == (uint) -1)
61 tmp_errno= errno;
62

Subscribers

People subscribed via source and target branches