Merge lp:~vlad-lesin/percona-server/5.6-bug-1376934 into lp:percona-server/5.6

[Vlad Lesin]

Per query variable setting for max_statement_time failed because statement timer was set before statement variable was set.

The current solution is in moving set_statement_timer() call to the place after the code which sets statement variables value.

[Vlad Lesin (vlad-lesin)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/795/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'mysql-test/r/set_statement_and_max_statement_time.result'
--- mysql-test/r/set_statement_and_max_statement_time.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/set_statement_and_max_statement_time.result	2015-01-13 10:04:23 +0000
@@ -0,0 +1,7 @@
+#
+# Test max statement time interruption.
+# Note that if SLEEP() is interrupted, it returns 1.
+#
+SET STATEMENT max_statement_time = 10 FOR SELECT SLEEP(1000);
+SLEEP(1000)
+1

=== added file 'mysql-test/t/set_statement_and_max_statement_time.test'
--- mysql-test/t/set_statement_and_max_statement_time.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/set_statement_and_max_statement_time.test	2015-01-13 10:04:23 +0000
@@ -0,0 +1,14 @@
+# The test for bug lp:1376934
+# Set max_statement_time for statement context
+# did not affect time limit for statement execution.
+
+--source include/have_statement_timeout.inc
+--source include/not_embedded.inc
+
+
+--echo #
+--echo # Test max statement time interruption.
+--echo # Note that if SLEEP() is interrupted, it returns 1.
+--echo #
+
+SET STATEMENT max_statement_time = 10 FOR SELECT SLEEP(1000);

=== modified file 'sql/sql_parse.cc'
--- sql/sql_parse.cc	2014-12-16 06:00:17 +0000
+++ sql/sql_parse.cc	2015-01-13 10:04:23 +0000
@@ -2607,6 +2607,7 @@
   bool have_table_map_for_update= FALSE;
 #endif
   struct system_variables *per_query_variables_backup;
+  bool reset_timer= false;
 
   DBUG_ENTER("mysql_execute_command");
   DBUG_ASSERT(!lex->describe || is_explainable_query(lex->sql_command));
@@ -2819,8 +2820,6 @@
   } /* endif unlikely slave */
 #endif
 
-  bool reset_timer= set_statement_timer(thd);
-
   status_var_increment(thd->status_var.com_stat[lex->sql_command]);
 
   Opt_trace_start ots(thd, all_tables, lex->sql_command, &lex->var_list,
@@ -2933,6 +2932,8 @@
     }
   }
 
+  reset_timer= set_statement_timer(thd);
+
   switch (lex->sql_command) {
 
   case SQLCOM_SHOW_STATUS: