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
=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch 2011-08-09 13:35:34 +0000
+++ patches/slow_extended.patch 2011-09-12 15:55:58 +0000
@@ -730,7 +730,7 @@
730 break;730 break;
731--- a/sql/set_var.cc731--- a/sql/set_var.cc
732+++ b/sql/set_var.cc732+++ b/sql/set_var.cc
733@@ -162,6 +162,74 @@733@@ -162,6 +162,76 @@
734 734
735 static sys_var_chain vars = { NULL, NULL };735 static sys_var_chain vars = { NULL, NULL };
736 736
@@ -794,6 +794,8 @@
794+ sys_var_thd_msl_flag_correct_none::set_default(thd,type);794+ sys_var_thd_msl_flag_correct_none::set_default(thd,type);
795+ sync();795+ sync();
796+ }796+ }
797+ virtual bool check_default(enum_var_type type)
798+ { return sys_var::check_default(type) && type == OPT_SESSION; }
797+private:799+private:
798+ void sync()800+ void sync()
799+ {801+ {
@@ -2575,3 +2577,11 @@
2575 /* Intvar event post-header */2577 /* Intvar event post-header */
2576 2578
2577 /* Intvar event data */2579 /* Intvar event data */
2580--- /dev/null
2581+++ b/mysql-test/r/percona_log_slow_global_control_default.result
2582@@ -0,0 +1 @@
2583+SET GLOBAL use_global_log_slow_control=default;
2584--- /dev/null
2585+++ b/mysql-test/t/percona_log_slow_global_control_default.test
2586@@ -0,0 +1 @@
2587+SET GLOBAL use_global_log_slow_control=default;

Subscribers

People subscribed via source and target branches