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
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff 2011-08-13 01:47:38 +0000
+++ patches/mysql-test.diff 2011-09-06 07:19:50 +0000
@@ -3989,4 +3989,3 @@
3989 3989
3990 connection slave;3990 connection slave;
3991 drop table first_db.t1;3991 drop table first_db.t1;
3992
39933992
=== modified file 'patches/query_cache_enhance.patch'
--- patches/query_cache_enhance.patch 2011-07-30 22:04:31 +0000
+++ patches/query_cache_enhance.patch 2011-09-06 07:19:50 +0000
@@ -156,7 +156,7 @@
156 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);156 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
157 157
158 static uchar *slave_get_report_port(THD *thd)158 static uchar *slave_get_report_port(THD *thd)
159@@ -1255,10 +1262,9 @@159@@ -1257,10 +1264,9 @@
160 {}160 {}
161 #endif /* HAVE_REPLICATION */161 #endif /* HAVE_REPLICATION */
162 162
@@ -168,7 +168,7 @@
168 ulong new_cache_size= query_cache.resize(query_cache_size);168 ulong new_cache_size= query_cache.resize(query_cache_size);
169 169
170 /*170 /*
171@@ -1272,11 +1278,35 @@171@@ -1274,11 +1280,35 @@
172 query_cache_size, new_cache_size);172 query_cache_size, new_cache_size);
173 173
174 query_cache_size= new_cache_size;174 query_cache_size= new_cache_size;
@@ -206,7 +206,7 @@
206 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)206 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
207 {207 {
208 query_cache_min_res_unit= 208 query_cache_min_res_unit=
209@@ -3634,6 +3664,16 @@209@@ -3636,6 +3666,16 @@
210 Functions to handle SET mysql_internal_variable=const_expr210 Functions to handle SET mysql_internal_variable=const_expr
211 *****************************************************************************/211 *****************************************************************************/
212 212
213213
=== modified file 'patches/response_time_distribution.patch'
--- patches/response_time_distribution.patch 2011-07-30 23:07:03 +0000
+++ patches/response_time_distribution.patch 2011-09-06 07:19:50 +0000
@@ -3090,7 +3090,7 @@
3090+#endif // QUERY_RESPONSE_TIME_H3090+#endif // QUERY_RESPONSE_TIME_H
3091--- a/sql/set_var.cc3091--- a/sql/set_var.cc
3092+++ b/sql/set_var.cc3092+++ b/sql/set_var.cc
3093@@ -1022,6 +1022,18 @@3093@@ -1024,6 +1024,18 @@
3094 &SV::query_exec_time,3094 &SV::query_exec_time,
3095 sys_var::SESSION_VARIABLE_IN_BINLOG);3095 sys_var::SESSION_VARIABLE_IN_BINLOG);
3096 #endif3096 #endif
30973097
=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch 2011-08-09 13:35:34 +0000
+++ patches/slow_extended.patch 2011-09-06 07:19:50 +0000
@@ -621,6 +621,15 @@
621 OPT_IGNORE_BUILTIN_INNODB,621 OPT_IGNORE_BUILTIN_INNODB,
622 OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,622 OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
623 OPT_DEFAULT_CHARACTER_SET_OLD,623 OPT_DEFAULT_CHARACTER_SET_OLD,
624@@ -6135,7 +6149,7 @@
625 {"log-slow-admin-statements", OPT_LOG_SLOW_ADMIN_STATEMENTS,
626 "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements "
627 "to the slow log if it is open.", &opt_log_slow_admin_statements,
628- &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
629+ &opt_log_slow_admin_statements, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
630 {"log-slow-slave-statements", OPT_LOG_SLOW_SLAVE_STATEMENTS,
631 "Log slow statements executed by slave thread to the slow log if it is open.",
632 &opt_log_slow_slave_statements,
624@@ -6836,6 +6850,36 @@633@@ -6836,6 +6850,36 @@
625 "microsecond precision.",634 "microsecond precision.",
626 &long_query_time, &long_query_time, 0, GET_DOUBLE,635 &long_query_time, &long_query_time, 0, GET_DOUBLE,
@@ -805,7 +814,7 @@
805 static sys_var_thd_ulong814 static sys_var_thd_ulong
806 sys_auto_increment_increment(&vars, "auto_increment_increment",815 sys_auto_increment_increment(&vars, "auto_increment_increment",
807 &SV::auto_increment_increment, NULL, NULL,816 &SV::auto_increment_increment, NULL, NULL,
808@@ -901,6 +969,35 @@817@@ -901,6 +969,37 @@
809 QUERY_LOG_GENERAL);818 QUERY_LOG_GENERAL);
810 static sys_var_log_state sys_var_slow_query_log(&vars, "slow_query_log", &opt_slow_log,819 static sys_var_log_state sys_var_slow_query_log(&vars, "slow_query_log", &opt_slow_log,
811 QUERY_LOG_SLOW);820 QUERY_LOG_SLOW);
@@ -824,6 +833,8 @@
824+ SLOG_V_INVALID,833+ SLOG_V_INVALID,
825+ slog_verb);834+ slog_verb);
826+static sys_var_use_global_log_slow_control sys_use_global_log_slow_control;835+static sys_var_use_global_log_slow_control sys_use_global_log_slow_control;
836+static sys_var_bool_ptr sys_log_slow_admin_statements(&vars, "log_slow_admin_statements",
837+ &opt_log_slow_admin_statements);
827+static sys_var_bool_ptr sys_log_slow_slave_statements(&vars, "log_slow_slave_statements",838+static sys_var_bool_ptr sys_log_slow_slave_statements(&vars, "log_slow_slave_statements",
828+ &opt_log_slow_slave_statements);839+ &opt_log_slow_slave_statements);
829+static sys_var_bool_ptr sys_log_slow_sp_statements(&vars, "log_slow_sp_statements",840+static sys_var_bool_ptr sys_log_slow_sp_statements(&vars, "log_slow_sp_statements",
@@ -841,7 +852,7 @@
841 /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */852 /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
842 static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",853 static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
843 &opt_slow_log, QUERY_LOG_SLOW);854 &opt_slow_log, QUERY_LOG_SLOW);
844@@ -3711,6 +3808,203 @@855@@ -3711,6 +3810,203 @@
845 #endif856 #endif
846 }857 }
847 858
@@ -2575,3 +2586,17 @@
2575 /* Intvar event post-header */2586 /* Intvar event post-header */
2576 2587
2577 /* Intvar event data */2588 /* Intvar event data */
2589--- /dev/null
2590+++ b/mysql-test/r/percona_log_slow_admin_statements.result
2591@@ -0,0 +1,6 @@
2592+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2593+Variable_name Value
2594+log_slow_admin_statements OFF
2595+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
2596+VARIABLE_NAME VARIABLE_VALUE
2597+LOG_SLOW_ADMIN_STATEMENTS OFF
2598--- /dev/null
2599+++ b/mysql-test/t/percona_log_slow_admin_statements.test
2600@@ -0,0 +1,2 @@
2601+SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
2602+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';

Subscribers

People subscribed via source and target branches