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

[Oleg Tsarev]

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))

[Oleg Tsarev (tsarev)]

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

[Oleg Tsarev (tsarev)]

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

[Laurynas Biveinis (laurynas-biveinis)]

Please move percona_log_slow_admin_statements.test to sys_vars suite with a name log_slow_admin_statements_basic.test. This way all_vars test will not consider this variable unhandled.

review: Needs Fixing

[Oleg Tsarev (tsarev)]

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

[Oleg Tsarev (tsarev)]

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

[Laurynas Biveinis (laurynas-biveinis)]

The test needs renaming as in my previous comment

review: Needs Fixing

[Alexey Kopytov (akopytov)]

1. What's the point to declare log-slow-admin-statements as OPT_ARG? What was wrong with NO_ARG?
2. What's the point in commenting out command line options in mysqld.cc instead of removing them? For this specific MP, it is sufficient to only remove log-slow-admin-statetements. There's no need to remove all of commented ones in this MP.

review: Needs Fixing

[Oleg Tsarev (tsarev)]

Similar to bug #712387
With NO_ARG syntax --variable_name=ON not work

=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-09-07 14:00:24 +0000
+++ patches/mysql-test.diff	2011-09-23 14:30:33 +0000
@@ -1297,7 +1297,7 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 --- /dev/null
 +++ b/mysql-test/r/percona_server_variables_debug.result
-@@ -0,0 +1,373 @@
+@@ -0,0 +1,374 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 +Variable_name
 +AUTOCOMMIT
@@ -1488,6 +1488,7 @@
 +LOG_OUTPUT
 +LOG_QUERIES_NOT_USING_INDEXES
 +LOG_SLAVE_UPDATES
++LOG_SLOW_ADMIN_STATEMENTS
 +LOG_SLOW_FILTER
 +LOG_SLOW_QUERIES
 +LOG_SLOW_RATE_LIMIT
@@ -1673,7 +1674,7 @@
 +WARNING_COUNT
 --- /dev/null
 +++ b/mysql-test/r/percona_server_variables_release.result
-@@ -0,0 +1,369 @@
+@@ -0,0 +1,370 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 +Variable_name
 +AUTOCOMMIT
@@ -1861,6 +1862,7 @@
 +LOG_OUTPUT
 +LOG_QUERIES_NOT_USING_INDEXES
 +LOG_SLAVE_UPDATES
++LOG_SLOW_ADMIN_STATEMENTS
 +LOG_SLOW_FILTER
 +LOG_SLOW_QUERIES
 +LOG_SLOW_RATE_LIMIT

=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch	2011-09-21 16:16:06 +0000
+++ patches/slow_extended.patch	2011-09-23 14:30:33 +0000
@@ -424,12 +424,16 @@
  my_bool lower_case_file_system= 0;
  my_bool opt_large_pages= 0;
  my_bool opt_super_large_pages= 0;
-@@ -5896,10 +5900,10 @@
+@@ -5892,14 +5896,14 @@
+    "Don't log extra information to update and slow-query logs.",
+    &opt_short_log_format, &opt_short_log_format,
+    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+-  {"log-slow-admin-statements", 0,
++ /*{"log-slow-admin-statements", 0,
     "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to "
     "the slow log if it is open.", &opt_log_slow_admin_statements,
     &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-- {"log-slow-slave-statements", 0,
-+ /*{"log-slow-slave-statements", 0,
+  {"log-slow-slave-statements", 0,
    "Log slow statements executed by slave thread to the slow log if it is open.",
    &opt_log_slow_slave_statements, &opt_log_slow_slave_statements,
 -  0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -979,7 +983,7 @@
  static bool fix_low_prio_updates(sys_var *self, THD *thd, enum_var_type type)
  {
    if (type == OPT_SESSION)
-@@ -2898,6 +2921,117 @@
+@@ -2898,6 +2921,123 @@
         DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_log_state));
  
@@ -1054,6 +1058,12 @@
 +       "Log queries replayed be the slave SQL thread",
 +       GLOBAL_VAR(opt_log_slow_slave_statements), CMD_LINE(OPT_ARG),
 +       DEFAULT(FALSE));
++static Sys_var_mybool Sys_log_slow_admin_statements(
++       "log_slow_admin_statements",
++       "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements"
++       " to the slow log if it is open.",
++       GLOBAL_VAR(opt_log_slow_admin_statements), CMD_LINE(OPT_ARG),
++       DEFAULT(FALSE));
 +static Sys_var_mybool Sys_log_slow_sp_statements(
 +       "log_slow_sp_statements",
 +       "Log slow statements executed by stored procedure to the slow log if it is open.",
@@ -2415,3 +2425,13 @@
 +--let grep_pattern = Last_errno: 1050
 +--source include/log_grep.inc
 +DROP TABLE t;
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/t/log_slow_admin_statements_basic.test
+@@ -0,0 +1 @@
++SELECT @@global.log_slow_admin_statements;
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_admin_statements_basic.result
+@@ -0,0 +1,3 @@
++SELECT @@global.log_slow_admin_statements;
++@@global.log_slow_admin_statements
++0