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

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

  1. test51_691404
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Superseded
Proposed branch: lp:~tsarev/percona-server/test51_691404
Merge into: lp:percona-server/5.1
Diff against target: 117 lines (+31/-7)
4 files modified
patches/mysql-test.diff (+0/-1)
patches/query_cache_enhance.patch (+3/-3)
patches/response_time_distribution.patch (+1/-1)
patches/slow_extended.patch (+27/-2)
To merge this branch: bzr merge lp:~tsarev/percona-server/test51_691404
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+74167@code.launchpad.net

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

Description of the change

Fixed bug #691404 - add log_slow_admin_statements to GLOBAL_VARIABLES
(dev-info: add sys_var... to sql/set_var.cc)

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.1/job/percona-server-5.1-param/131/

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-08-13 01:47:38 +0000
3+++ patches/mysql-test.diff 2011-09-06 07:19:50 +0000
4@@ -3989,4 +3989,3 @@
5
6 connection slave;
7 drop table first_db.t1;
8-
9
10=== modified file 'patches/query_cache_enhance.patch'
11--- patches/query_cache_enhance.patch 2011-07-30 22:04:31 +0000
12+++ patches/query_cache_enhance.patch 2011-09-06 07:19:50 +0000
13@@ -156,7 +156,7 @@
14 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
15
16 static uchar *slave_get_report_port(THD *thd)
17-@@ -1255,10 +1262,9 @@
18+@@ -1257,10 +1264,9 @@
19 {}
20 #endif /* HAVE_REPLICATION */
21
22@@ -168,7 +168,7 @@
23 ulong new_cache_size= query_cache.resize(query_cache_size);
24
25 /*
26-@@ -1272,11 +1278,35 @@
27+@@ -1274,11 +1280,35 @@
28 query_cache_size, new_cache_size);
29
30 query_cache_size= new_cache_size;
31@@ -206,7 +206,7 @@
32 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
33 {
34 query_cache_min_res_unit=
35-@@ -3634,6 +3664,16 @@
36+@@ -3636,6 +3666,16 @@
37 Functions to handle SET mysql_internal_variable=const_expr
38 *****************************************************************************/
39
40
41=== modified file 'patches/response_time_distribution.patch'
42--- patches/response_time_distribution.patch 2011-07-30 23:07:03 +0000
43+++ patches/response_time_distribution.patch 2011-09-06 07:19:50 +0000
44@@ -3090,7 +3090,7 @@
45 +#endif // QUERY_RESPONSE_TIME_H
46 --- a/sql/set_var.cc
47 +++ b/sql/set_var.cc
48-@@ -1022,6 +1022,18 @@
49+@@ -1024,6 +1024,18 @@
50 &SV::query_exec_time,
51 sys_var::SESSION_VARIABLE_IN_BINLOG);
52 #endif
53
54=== modified file 'patches/slow_extended.patch'
55--- patches/slow_extended.patch 2011-08-09 13:35:34 +0000
56+++ patches/slow_extended.patch 2011-09-06 07:19:50 +0000
57@@ -621,6 +621,15 @@
58 OPT_IGNORE_BUILTIN_INNODB,
59 OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
60 OPT_DEFAULT_CHARACTER_SET_OLD,
61+@@ -6135,7 +6149,7 @@
62+ {"log-slow-admin-statements", OPT_LOG_SLOW_ADMIN_STATEMENTS,
63+ "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements "
64+ "to the slow log if it is open.", &opt_log_slow_admin_statements,
65+- &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
66++ &opt_log_slow_admin_statements, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
67+ {"log-slow-slave-statements", OPT_LOG_SLOW_SLAVE_STATEMENTS,
68+ "Log slow statements executed by slave thread to the slow log if it is open.",
69+ &opt_log_slow_slave_statements,
70 @@ -6836,6 +6850,36 @@
71 "microsecond precision.",
72 &long_query_time, &long_query_time, 0, GET_DOUBLE,
73@@ -805,7 +814,7 @@
74 static sys_var_thd_ulong
75 sys_auto_increment_increment(&vars, "auto_increment_increment",
76 &SV::auto_increment_increment, NULL, NULL,
77-@@ -901,6 +969,35 @@
78+@@ -901,6 +969,37 @@
79 QUERY_LOG_GENERAL);
80 static sys_var_log_state sys_var_slow_query_log(&vars, "slow_query_log", &opt_slow_log,
81 QUERY_LOG_SLOW);
82@@ -824,6 +833,8 @@
83 + SLOG_V_INVALID,
84 + slog_verb);
85 +static sys_var_use_global_log_slow_control sys_use_global_log_slow_control;
86++static sys_var_bool_ptr sys_log_slow_admin_statements(&vars, "log_slow_admin_statements",
87++ &opt_log_slow_admin_statements);
88 +static sys_var_bool_ptr sys_log_slow_slave_statements(&vars, "log_slow_slave_statements",
89 + &opt_log_slow_slave_statements);
90 +static sys_var_bool_ptr sys_log_slow_sp_statements(&vars, "log_slow_sp_statements",
91@@ -841,7 +852,7 @@
92 /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
93 static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
94 &opt_slow_log, QUERY_LOG_SLOW);
95-@@ -3711,6 +3808,203 @@
96+@@ -3711,6 +3810,203 @@
97 #endif
98 }
99
100@@ -2575,3 +2586,17 @@
101 /* Intvar event post-header */
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';

Subscribers

People subscribed via source and target branches