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

Merge lp:~tsarev/percona-server/test55_691404 into lp:percona-server/5.5

  1. test55_691404
  2. Merge into 5.5
Proposed by Oleg Tsarev
Status: Superseded
Proposed branch: lp:~tsarev/percona-server/test55_691404
Merge into: lp:percona-server/5.5
Diff against target: 121 lines (+35/-8)
2 files modified
patches/mysql-test.diff (+7/-4)
patches/slow_extended.patch (+28/-4)
To merge this branch: bzr merge lp:~tsarev/percona-server/test55_691404
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+74165@code.launchpad.net

This proposal has been superseded by a proposal from 2011-09-12.

Description of the change

Fix bug #691404 - add log-slow-admin-statements to GLOBAL_VARIABLES
(dev-info: remove command-line option from sql/mysqld.cc, add sys_var_... to sql/sys_vars.cc (affects to CLI too))

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

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/106/

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-09-07 14:00:24 +0000
3+++ patches/mysql-test.diff 2011-09-12 13:22:08 +0000
4@@ -1258,7 +1258,7 @@
5 drop table t2;
6 --- a/mysql-test/suite/sys_vars/r/all_vars.result
7 +++ b/mysql-test/suite/sys_vars/r/all_vars.result
8-@@ -1,23 +1,23 @@
9+@@ -1,23 +1,25 @@
10 create table t1 (test_name text);
11 create table t2 (variable_name text);
12 load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
13@@ -1283,10 +1283,12 @@
14 INNODB_LARGE_PREFIX
15 INNODB_ROLLBACK_SEGMENTS
16 +INNODB_ROLLBACK_SEGMENTS
17-+INNODB_STATS_METHOD
18 INNODB_STATS_METHOD
19 -INNODB_FILE_FORMAT_MAX
20 -INNODB_LARGE_PREFIX
21++INNODB_STATS_METHOD
22++LOG_SLOW_ADMIN_STATEMENTS
23++LOG_SLOW_ADMIN_STATEMENTS
24 drop table t1;
25 drop table t2;
26 --- /dev/null
27@@ -1488,6 +1490,7 @@
28 +LOG_OUTPUT
29 +LOG_QUERIES_NOT_USING_INDEXES
30 +LOG_SLAVE_UPDATES
31++LOG_SLOW_ADMIN_STATEMENTS
32 +LOG_SLOW_FILTER
33 +LOG_SLOW_QUERIES
34 +LOG_SLOW_RATE_LIMIT
35@@ -1670,10 +1673,9 @@
36 +VERSION_COMPILE_MACHINE
37 +VERSION_COMPILE_OS
38 +WAIT_TIMEOUT
39-+WARNING_COUNT
40 --- /dev/null
41 +++ b/mysql-test/r/percona_server_variables_release.result
42-@@ -0,0 +1,369 @@
43+@@ -0,0 +1,370 @@
44 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
45 +Variable_name
46 +AUTOCOMMIT
47@@ -1861,6 +1863,7 @@
48 +LOG_OUTPUT
49 +LOG_QUERIES_NOT_USING_INDEXES
50 +LOG_SLAVE_UPDATES
51++LOG_SLOW_ADMIN_STATEMENTS
52 +LOG_SLOW_FILTER
53 +LOG_SLOW_QUERIES
54 +LOG_SLOW_RATE_LIMIT
55
56=== modified file 'patches/slow_extended.patch'
57--- patches/slow_extended.patch 2011-09-07 14:00:24 +0000
58+++ patches/slow_extended.patch 2011-09-12 13:22:08 +0000
59@@ -424,12 +424,16 @@
60 my_bool lower_case_file_system= 0;
61 my_bool opt_large_pages= 0;
62 my_bool opt_super_large_pages= 0;
63-@@ -5896,10 +5900,10 @@
64+@@ -5892,14 +5896,14 @@
65+ "Don't log extra information to update and slow-query logs.",
66+ &opt_short_log_format, &opt_short_log_format,
67+ 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
68+- {"log-slow-admin-statements", 0,
69++ /*{"log-slow-admin-statements", 0,
70 "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to "
71 "the slow log if it is open.", &opt_log_slow_admin_statements,
72 &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
73-- {"log-slow-slave-statements", 0,
74-+ /*{"log-slow-slave-statements", 0,
75+ {"log-slow-slave-statements", 0,
76 "Log slow statements executed by slave thread to the slow log if it is open.",
77 &opt_log_slow_slave_statements, &opt_log_slow_slave_statements,
78 - 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
79@@ -978,7 +982,7 @@
80 static bool fix_low_prio_updates(sys_var *self, THD *thd, enum_var_type type)
81 {
82 if (type == OPT_SESSION)
83-@@ -2898,6 +2921,117 @@
84+@@ -2898,6 +2921,123 @@
85 DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
86 ON_UPDATE(fix_log_state));
87
88@@ -1053,6 +1057,12 @@
89 + "Log queries replayed be the slave SQL thread",
90 + GLOBAL_VAR(opt_log_slow_slave_statements), CMD_LINE(OPT_ARG),
91 + DEFAULT(FALSE));
92++static Sys_var_mybool Sys_log_slow_admin_statements(
93++ "log_slow_admin_statements",
94++ "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements"
95++ " to the slow log if it is open.",
96++ GLOBAL_VAR(opt_log_slow_admin_statements), CMD_LINE(OPT_ARG),
97++ DEFAULT(FALSE));
98 +static Sys_var_mybool Sys_log_slow_sp_statements(
99 + "log_slow_sp_statements",
100 + "Log slow statements executed by stored procedure to the slow log if it is open.",
101@@ -2365,6 +2375,20 @@
102
103 /* Intvar event data */
104 --- /dev/null
105++++ b/mysql-test/r/percona_log_slow_admin_statements.result
106+@@ -0,0 +1,6 @@
107++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
108++Variable_name Value
109++log_slow_admin_statements OFF
110++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
111++VARIABLE_NAME VARIABLE_VALUE
112++LOG_SLOW_ADMIN_STATEMENTS OFF
113+--- /dev/null
114++++ b/mysql-test/t/percona_log_slow_admin_statements.test
115+@@ -0,0 +1,2 @@
116++SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
117++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
118+--- /dev/null
119 +++ b/mysql-test/suite/sys_vars/r/query_exec_time_basic.result
120 @@ -0,0 +1,2 @@
121 +SET GLOBAL query_exec_time=default;

Subscribers

People subscribed via source and target branches