Bug #21306319: HARMONIZE MAX_EXECUTION_TIME HINT WITH MAX_STATEMENT_TIME

Bug #21306392: REMOVE OLD-STYLE MAX_STATEMENT_TIME HINT (REPLACE WITH MAX_EXECUTION_TIME)

After-push test update #2.

Author: GlebShchepa

mysql-test/r/max_statement_time.result

@@ -220,18 +220,11 @@ INSERT INTO t2 VALUES(@b);
 END|
 Warnings:
 Warning	3125	MAX_EXECUTION_TIME hint is supported by top-level standalone SELECT statements only
-DROP EVENT event1|
-TRUNCATE TABLE t2;
-CREATE EVENT event1 ON SCHEDULE AT CURRENT_TIMESTAMP
-DO BEGIN
-SELECT SLEEP(2) into @a;
-INSERT INTO t2 VALUES(@a);
-END
-|
 # Wait until at least one instance of event is executed.
 SELECT /*+ MAX_EXECUTION_TIME(3600000) */ * FROM t2;
 f1
 0
+0
 DELETE FROM t2;
 SET @@global.event_scheduler= @global_event_scheduler_status;
 SET @@global.max_execution_time= 0;

mysql-test/t/max_statement_time.test

@@ -250,15 +250,6 @@ DO BEGIN
   INSERT INTO t2 VALUES(@a);
   INSERT INTO t2 VALUES(@b);
 END|
-DROP EVENT event1|
-TRUNCATE TABLE t2;
-
-CREATE EVENT event1 ON SCHEDULE AT CURRENT_TIMESTAMP
-DO BEGIN
-  SELECT SLEEP(2) into @a;
-  INSERT INTO t2 VALUES(@a);
-END
-|
 
 delimiter ;|
 
@@ -267,7 +258,7 @@ let $wait_condition= SELECT /*+ MAX_EXECUTION_TIME(3600000) */ COUNT(*) FROM t2;
 --source include/wait_condition.inc
 
 #Since MAX_EXECUTION_TIME is not applicable for events & SELECTs of event,
-#selects of event1 are not interruped so table contains 0 value.
+#selects of event1 are not interruped so table contains two 0 values.
 SELECT /*+ MAX_EXECUTION_TIME(3600000) */ * FROM t2;
 
 DELETE FROM t2;