Merge lp:~tsarev/percona-server/bug831517 into lp:percona-server/5.1

Proposed by Oleg Tsarev
Status: Work in progress
Proposed branch: lp:~tsarev/percona-server/bug831517
Merge into: lp:percona-server/5.1
Diff against target: 33 lines (+11/-1)
1 file modified
patches/slow_extended.patch (+11/-1)
To merge this branch: bzr merge lp:~tsarev/percona-server/bug831517
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+75027@code.launchpad.net

This proposal supersedes a proposal from 2011-09-12.

Description of the change

Fix bug #831517: use_global_log_slow_control doesn't have default value

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal
Revision history for this message
Oleg Tsarev (tsarev) wrote :

Unmerged revisions

282. By Oleg Tsarev

Fix bug #831517: use_global_log_slow_control doesn't have default value

281. By Oleg Tsarev

1) move tests from mysql-test/ to patches
2) remove install_tests script and call of script from Makefile

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/slow_extended.patch'
2--- patches/slow_extended.patch 2011-08-09 13:35:34 +0000
3+++ patches/slow_extended.patch 2011-09-12 15:55:58 +0000
4@@ -730,7 +730,7 @@
5 break;
6 --- a/sql/set_var.cc
7 +++ b/sql/set_var.cc
8-@@ -162,6 +162,74 @@
9+@@ -162,6 +162,76 @@
10
11 static sys_var_chain vars = { NULL, NULL };
12
13@@ -794,6 +794,8 @@
14 + sys_var_thd_msl_flag_correct_none::set_default(thd,type);
15 + sync();
16 + }
17++ virtual bool check_default(enum_var_type type)
18++ { return sys_var::check_default(type) && type == OPT_SESSION; }
19 +private:
20 + void sync()
21 + {
22@@ -2575,3 +2577,11 @@
23 /* Intvar event post-header */
24
25 /* Intvar event data */
26+--- /dev/null
27++++ b/mysql-test/r/percona_log_slow_global_control_default.result
28+@@ -0,0 +1 @@
29++SET GLOBAL use_global_log_slow_control=default;
30+--- /dev/null
31++++ b/mysql-test/t/percona_log_slow_global_control_default.test
32+@@ -0,0 +1 @@
33++SET GLOBAL use_global_log_slow_control=default;

Subscribers

People subscribed via source and target branches