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
=== modified file 'mysql-test/r/percona_log_slow_sp_statements.result'
--- mysql-test/r/percona_log_slow_sp_statements.result 2014-12-01 21:13:37 +0000
+++ mysql-test/r/percona_log_slow_sp_statements.result 2015-02-10 11:22:10 +0000
@@ -32,9 +32,9 @@
32[log_grep.inc] lines: 232[log_grep.inc] lines: 2
33[log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_33[log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_
34[log_grep.inc] lines: 034[log_grep.inc] lines: 0
35[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_outer35[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_outer
36[log_grep.inc] lines: 236[log_grep.inc] lines: 2
37[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_inner37[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_inner
38[log_grep.inc] lines: 238[log_grep.inc] lines: 2
39SET GLOBAL log_slow_sp_statements=OFF;39SET GLOBAL log_slow_sp_statements=OFF;
40[log_start.inc] percona.slow_extended.sp240[log_start.inc] percona.slow_extended.sp2
@@ -55,7 +55,7 @@
55[log_grep.inc] lines: 055[log_grep.inc] lines: 0
56[log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_56[log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_
57[log_grep.inc] lines: 257[log_grep.inc] lines: 2
58[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored routine: test.test_58[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored_routine: test.test_
59[log_grep.inc] lines: 059[log_grep.inc] lines: 0
60DROP PROCEDURE test_outer;60DROP PROCEDURE test_outer;
61DROP PROCEDURE test_inner;61DROP PROCEDURE test_inner;
6262
=== modified file 'mysql-test/t/percona_log_slow_sp_statements.test'
--- mysql-test/t/percona_log_slow_sp_statements.test 2014-12-01 21:13:37 +0000
+++ mysql-test/t/percona_log_slow_sp_statements.test 2015-02-10 11:22:10 +0000
@@ -39,9 +39,9 @@
39--source include/log_grep.inc39--source include/log_grep.inc
40--let grep_pattern=CALL test_40--let grep_pattern=CALL test_
41--source include/log_grep.inc41--source include/log_grep.inc
42--let grep_pattern=# Stored routine: test.test_outer42--let grep_pattern=# Stored_routine: test.test_outer
43--source include/log_grep.inc43--source include/log_grep.inc
44--let grep_pattern=# Stored routine: test.test_inner44--let grep_pattern=# Stored_routine: test.test_inner
45--source include/log_grep.inc45--source include/log_grep.inc
4646
47SET GLOBAL log_slow_sp_statements=OFF;47SET GLOBAL log_slow_sp_statements=OFF;
@@ -56,7 +56,7 @@
56--source include/log_grep.inc56--source include/log_grep.inc
57--let grep_pattern=CALL test_57--let grep_pattern=CALL test_
58--source include/log_grep.inc58--source include/log_grep.inc
59--let grep_pattern=# Stored routine: test.test_59--let grep_pattern=# Stored_routine: test.test_
60--source include/log_grep.inc60--source include/log_grep.inc
6161
62DROP PROCEDURE test_outer;62DROP PROCEDURE test_outer;
6363
=== modified file 'sql/log.cc'
--- sql/log.cc 2014-12-02 12:54:54 +0000
+++ sql/log.cc 2015-02-10 11:22:10 +0000
@@ -2833,7 +2833,7 @@
2833 if (opt_log_slow_sp_statements &&2833 if (opt_log_slow_sp_statements &&
2834 thd->spcont &&2834 thd->spcont &&
2835 my_b_printf(&log_file,2835 my_b_printf(&log_file,
2836 "# Stored routine: %s\n",2836 "# Stored_routine: %s\n",
2837 thd->spcont->sp->m_qname.str) == (uint) -1)2837 thd->spcont->sp->m_qname.str) == (uint) -1)
2838 tmp_errno= errno;2838 tmp_errno= errno;
28392839

Subscribers

People subscribed via source and target branches