Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.1_fix_bug_860416
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 322
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_860416
Merge into: lp:percona-server/5.1
Prerequisite: lp:~tsarev/percona-server/5.1_fix_bug_838725_base
Diff against target: 139 lines (+82/-11)
2 files modified
patches/mysql-test.diff (+4/-2)
patches/slow_extended.patch (+78/-9)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_860416
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+78692@code.launchpad.net

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

Description of the change

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

PREREQUISITE BRANCH: https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_838725_base/+merge/78683

FAILED TESTS:
1. main.endspace main.index_merge_innodb main.rowid_order_innodb main.type_bit_innodb
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_832528/+merge/78687

2. main.percona_innodb_kill_idle_trx main.percona_innodb_kill_idle_trx_locks
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691

3. main.percona_server_variables_debug main.percona_server_variables_release
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691

FAILED TESTCASES (JUST DEBUG):
1. rpl.rpl_binlog_errors
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_794790/+merge/78694

DESCRIPTION:
Fix bug #860416.
Replaced OPT_ARG for log-slow-admin-statements by NO_ARG
Fix percona_server_variables_{debug|release} tests (related to bug #838725 this tests didn't run on tests)

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/mysql-test.diff'
2--- patches/mysql-test.diff 2011-10-05 00:02:14 +0000
3+++ patches/mysql-test.diff 2011-10-08 02:00:29 +0000
4@@ -4009,7 +4009,7 @@
5 +0
6 --- /dev/null
7 +++ b/mysql-test/r/percona_server_variables_debug.result
8-@@ -0,0 +1,347 @@
9+@@ -0,0 +1,349 @@
10 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
11 +Variable_name
12 +AUTOCOMMIT
13@@ -4194,6 +4194,7 @@
14 +LOG_OUTPUT
15 +LOG_QUERIES_NOT_USING_INDEXES
16 +LOG_SLAVE_UPDATES
17++LOG_SLOW_ADMIN_STATEMENTS
18 +LOG_SLOW_FILTER
19 +LOG_SLOW_QUERIES
20 +LOG_SLOW_RATE_LIMIT
21@@ -4360,7 +4361,7 @@
22 +WARNING_COUNT
23 --- /dev/null
24 +++ b/mysql-test/r/percona_server_variables_release.result
25-@@ -0,0 +1,344 @@
26+@@ -0,0 +1,346 @@
27 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
28 +Variable_name
29 +AUTOCOMMIT
30@@ -4543,6 +4544,7 @@
31 +LOG_OUTPUT
32 +LOG_QUERIES_NOT_USING_INDEXES
33 +LOG_SLAVE_UPDATES
34++LOG_SLOW_ADMIN_STATEMENTS
35 +LOG_SLOW_FILTER
36 +LOG_SLOW_QUERIES
37 +LOG_SLOW_RATE_LIMIT
38
39=== modified file 'patches/slow_extended.patch'
40--- patches/slow_extended.patch 2011-10-05 00:03:13 +0000
41+++ patches/slow_extended.patch 2011-10-08 02:00:29 +0000
42@@ -621,15 +621,6 @@
43 OPT_IGNORE_BUILTIN_INNODB,
44 OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
45 OPT_DEFAULT_CHARACTER_SET_OLD,
46-@@ -6135,7 +6149,7 @@
47- {"log-slow-admin-statements", OPT_LOG_SLOW_ADMIN_STATEMENTS,
48- "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements "
49- "to the slow log if it is open.", &opt_log_slow_admin_statements,
50-- &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
51-+ &opt_log_slow_admin_statements, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
52- {"log-slow-slave-statements", OPT_LOG_SLOW_SLAVE_STATEMENTS,
53- "Log slow statements executed by slave thread to the slow log if it is open.",
54- &opt_log_slow_slave_statements,
55 @@ -6836,6 +6850,36 @@
56 "microsecond precision.",
57 &long_query_time, &long_query_time, 0, GET_DOUBLE,
58@@ -2600,3 +2591,81 @@
59 @@ -0,0 +1,2 @@
60 +SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
61 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
62+--- /dev/null
63++++ b/mysql-test/r/percona_log_slow_admin_statements-config_false.result
64+@@ -0,0 +1,6 @@
65++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
66++Variable_name Value
67++log_slow_admin_statements OFF
68++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
69++VARIABLE_NAME VARIABLE_VALUE
70++LOG_SLOW_ADMIN_STATEMENTS OFF
71+--- /dev/null
72++++ b/mysql-test/r/percona_log_slow_admin_statements-config_foo.result
73+@@ -0,0 +1,7 @@
74++call mtr.add_suppression("ignoring option '--log-slow-admin-statements' due to invalid value 'foo'");
75++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
76++Variable_name Value
77++log_slow_admin_statements OFF
78++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
79++VARIABLE_NAME VARIABLE_VALUE
80++LOG_SLOW_ADMIN_STATEMENTS OFF
81+--- /dev/null
82++++ b/mysql-test/r/percona_log_slow_admin_statements-config_true.result
83+@@ -0,0 +1,6 @@
84++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
85++Variable_name Value
86++log_slow_admin_statements ON
87++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
88++VARIABLE_NAME VARIABLE_VALUE
89++LOG_SLOW_ADMIN_STATEMENTS ON
90+--- /dev/null
91++++ b/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf
92+@@ -0,0 +1,2 @@
93++[mysqld.1]
94++log-slow-admin-statements=false
95+--- /dev/null
96++++ b/mysql-test/t/percona_log_slow_admin_statements-config_false.test
97+@@ -0,0 +1,2 @@
98++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
99++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
100+--- /dev/null
101++++ b/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf
102+@@ -0,0 +1,2 @@
103++[mysqld.1]
104++log-slow-admin-statements=foo
105+--- /dev/null
106++++ b/mysql-test/t/percona_log_slow_admin_statements-config_foo.test
107+@@ -0,0 +1,3 @@
108++call mtr.add_suppression("ignoring option '--log-slow-admin-statements' due to invalid value 'foo'");
109++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
110++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
111+--- /dev/null
112++++ b/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf
113+@@ -0,0 +1,2 @@
114++[mysqld.1]
115++log-slow-admin-statements=true
116+--- /dev/null
117++++ b/mysql-test/t/percona_log_slow_admin_statements-config_true.test
118+@@ -0,0 +1,2 @@
119++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
120++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
121+--- /dev/null
122++++ b/mysql-test/r/percona_log_slow_admin_statements-config.result
123+@@ -0,0 +1,6 @@
124++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
125++Variable_name Value
126++log_slow_admin_statements ON
127++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
128++VARIABLE_NAME VARIABLE_VALUE
129++LOG_SLOW_ADMIN_STATEMENTS ON
130+--- /dev/null
131++++ b/mysql-test/t/percona_log_slow_admin_statements-config.cnf
132+@@ -0,0 +1,2 @@
133++[mysqld.1]
134++log-slow-admin-statements
135+--- /dev/null
136++++ b/mysql-test/t/percona_log_slow_admin_statements-config.test
137+@@ -0,0 +1,2 @@
138++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
139++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';

Subscribers

People subscribed via source and target branches