Bug#21021670 - MISLEADING WARNING WHEN PER-QUERY STATEMENT TIME IS EXCEEDED

Issue here is, error reported on exceeding statement time contains
session variable "max_statement_time" in it. This error message
is misleading when max_statement_time is *not* set and timeout
value is set at statement level.

The timeout value can be set either at session level using
max_statement_time variable or at statement level. If execution
of statement takes more than timeout value then following
error is reported,

  "Query execution was interrupted, max_statement_time
  exceeded".

When session variable max_statement_time is not set and timeout
value is set at statement level then error message with
max_statement_time in it on timeout is misleading.

Fix:
Modified error message so that max_statement_time is not used
in it. Now on error following error message is reported,

"Query execution was interrupted, maximum statement execution time
exceeded"

Author: phulakun

mysql-test/r/max_statement_time.result

@@ -92,12 +92,12 @@ INSERT INTO t1 SELECT * FROM t1;
 INSERT INTO t1 SELECT * FROM t1;
 SET @@SESSION.max_statement_time= 2;
 SELECT *, SLEEP(0.5) from t1;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 LOCK TABLE t1 WRITE;
 SELECT * FROM t1;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 SELECT MAX_STATEMENT_TIME=1 * FROM t1;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 UNLOCK TABLES;
 CREATE TABLE t2 SELECT * FROM t1;
 ALTER TABLE t2 ADD c VARCHAR(200) default 'new_col';
@@ -117,9 +117,9 @@ PREPARE stmt1 FROM "SELECT *, SLEEP(0.5) FROM t1 WHERE b= 'new_string'";
 PREPARE stmt2 FROM "SELECT MAX_STATEMENT_TIME=2 *, SLEEP(0.5) FROM t1 WHERE b= 'new_string'";
 PREPARE stmt3 FROM "SELECT MAX_STATEMENT_TIME=3600000 count(*) FROM t1";
 EXECUTE stmt1;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 EXECUTE stmt2;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 EXECUTE stmt3;
 count(*)
 4096
@@ -148,7 +148,7 @@ END|
 INSERT INTO t2 VALUES (1, 'string1', 'string2');
 SET @@SESSION.max_statement_time= 2;
 SELECT f1();
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 SELECT MAX_STATEMENT_TIME=60000 f2();
 f2()
 1

mysql-test/r/opt_hint_timeout.result

@@ -15,7 +15,7 @@ INSERT INTO t1 SELECT * FROM t1;
 INSERT INTO t1 SELECT * FROM t1;
 INSERT INTO t1 SELECT * FROM t1;
 SELECT /*+ MAX_EXECUTION_TIME(1) */ * FROM t1 a, t1 b;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 EXPLAIN SELECT /*+ MAX_EXECUTION_TIME(10) MAX_EXECUTION_TIME(100) */ * FROM t1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2048	100.00	NULL
@@ -37,13 +37,13 @@ SELECT /*+ MAX_EXECUTION_TIME(4294967296) */ 1 FROM t1;
 Warnings:
 Warning	1064	Unsupported MAX_EXECUTION_TIME near ') */ 1 FROM t1' at line 1
 SELECT /*+ MAX_EXECUTION_TIME(1) */ *, SLEEP(1000) FROM t1;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 SELECT  /*+ MAX_EXECUTION_TIME(1) */ *, SLEEP(1000) FROM t1 UNION SELECT 1, 2, 3;
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 (SELECT /*+ MAX_EXECUTION_TIME(1) */ *, SLEEP(1000) FROM t1) UNION (SELECT 1, 2, 3);
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 ((SELECT  /*+ MAX_EXECUTION_TIME(1) */ *, SLEEP(1000) FROM t1));
-ERROR HY000: Query execution was interrupted, max_statement_time exceeded
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
 
 # only SELECT statements supports the MAX_EXECUTION_TIME hint (warning):
 

sql/share/errmsg-utf8.txt

@@ -7143,7 +7143,7 @@ ER_WARN_ONLY_MASTER_LOG_FILE_NO_POS
   eng "CHANGE MASTER TO with a MASTER_LOG_FILE clause but no MASTER_LOG_POS clause may not be safe. The old position value may not be valid for the new binary log file."
 
 ER_QUERY_TIMEOUT 
-  eng "Query execution was interrupted, max_statement_time exceeded"
+  eng "Query execution was interrupted, maximum statement execution time exceeded"
 
 ER_NON_RO_SELECT_DISABLE_TIMER
   eng "Select is not a read only statement, disabling timer"