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

Proposed by Laurynas Biveinis on 2015-02-10
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-10
Approved revision: 738
Merged at revision: 740
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1419230-5.6
Merge into: lp:percona-server/5.6
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.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2015-02-10
Review via email: mp+249173@code.launchpad.net
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-02 12:55:40 +0000
+++ mysql-test/r/percona_log_slow_sp_statements.result 2015-02-10 11:24:02 +0000
@@ -31,9 +31,9 @@
31[log_grep.inc] lines: 231[log_grep.inc] lines: 2
32[log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_32[log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_
33[log_grep.inc] lines: 033[log_grep.inc] lines: 0
34[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_outer34[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_outer
35[log_grep.inc] lines: 235[log_grep.inc] lines: 2
36[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_inner36[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_inner
37[log_grep.inc] lines: 237[log_grep.inc] lines: 2
38SET GLOBAL log_slow_sp_statements=OFF;38SET GLOBAL log_slow_sp_statements=OFF;
39[log_start.inc] percona.slow_extended.sp239[log_start.inc] percona.slow_extended.sp2
@@ -54,7 +54,7 @@
54[log_grep.inc] lines: 054[log_grep.inc] lines: 0
55[log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_55[log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_
56[log_grep.inc] lines: 256[log_grep.inc] lines: 2
57[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored routine: test.test_57[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored_routine: test.test_
58[log_grep.inc] lines: 058[log_grep.inc] lines: 0
59DROP PROCEDURE test_outer;59DROP PROCEDURE test_outer;
60DROP PROCEDURE test_inner;60DROP PROCEDURE test_inner;
6161
=== modified file 'mysql-test/t/percona_log_slow_sp_statements.test'
--- mysql-test/t/percona_log_slow_sp_statements.test 2014-12-02 12:55:40 +0000
+++ mysql-test/t/percona_log_slow_sp_statements.test 2015-02-10 11:24:02 +0000
@@ -38,9 +38,9 @@
38--source include/log_grep.inc38--source include/log_grep.inc
39--let grep_pattern=CALL test_39--let grep_pattern=CALL test_
40--source include/log_grep.inc40--source include/log_grep.inc
41--let grep_pattern=# Stored routine: test.test_outer41--let grep_pattern=# Stored_routine: test.test_outer
42--source include/log_grep.inc42--source include/log_grep.inc
43--let grep_pattern=# Stored routine: test.test_inner43--let grep_pattern=# Stored_routine: test.test_inner
44--source include/log_grep.inc44--source include/log_grep.inc
4545
46SET GLOBAL log_slow_sp_statements=OFF;46SET GLOBAL log_slow_sp_statements=OFF;
@@ -55,7 +55,7 @@
55--source include/log_grep.inc55--source include/log_grep.inc
56--let grep_pattern=CALL test_56--let grep_pattern=CALL test_
57--source include/log_grep.inc57--source include/log_grep.inc
58--let grep_pattern=# Stored routine: test.test_58--let grep_pattern=# Stored_routine: test.test_
59--source include/log_grep.inc59--source include/log_grep.inc
6060
61DROP PROCEDURE test_outer;61DROP PROCEDURE test_outer;
6262
=== modified file 'sql/log.cc'
--- sql/log.cc 2014-12-16 07:47:59 +0000
+++ sql/log.cc 2015-02-10 11:24:02 +0000
@@ -2090,7 +2090,7 @@
2090 if (opt_log_slow_sp_statements &&2090 if (opt_log_slow_sp_statements &&
2091 thd->sp_runtime_ctx &&2091 thd->sp_runtime_ctx &&
2092 my_b_printf(&log_file,2092 my_b_printf(&log_file,
2093 "# Stored routine: %s\n",2093 "# Stored_routine: %s\n",
2094 thd->sp_runtime_ctx->sp->m_qname.str) == (uint) -1)2094 thd->sp_runtime_ctx->sp->m_qname.str) == (uint) -1)
2095 tmp_errno= errno;2095 tmp_errno= errno;
20962096

Subscribers

People subscribed via source and target branches