MDEV-37035 Improve opt_hint_timeout.test to avoid sporadic failures caused by timing

Some queries of the test case used to execute too fast, which caused
`opt_hint_timeout` test failures. This commit replaces those queries
with more complex ones to make sure they cannot be executed in
a couple of milliseconds.

Author: Olernov

mysql-test/main/opt_hint_timeout.result

@@ -1,42 +1,33 @@
 #
 # MAX_EXECUTION_TIME hint testing
 #
-CREATE TABLE t1 (a INT, b VARCHAR(300));
-INSERT INTO t1 VALUES (1, 'string');
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 SELECT seq FROM seq_1_to_5000;
 # Correct hint usage
 SELECT /*+ MAX_EXECUTION_TIME(10) */* FROM t1 a, t1 b;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
-EXPLAIN EXTENDED SELECT /*+ MAX_EXECUTION_TIME(000149) */* FROM t1;
+EXPLAIN EXTENDED SELECT /*+ MAX_EXECUTION_TIME(0001490) */* FROM t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	512	100.00	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5000	100.00	
 Warnings:
-Note	1003	select /*+ MAX_EXECUTION_TIME(000149) */ `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1`
-SELECT  /*+ MAX_EXECUTION_TIME(20) */ *, SLEEP(1) FROM t1 UNION SELECT 1, 2, 3;
+Note	1003	select /*+ MAX_EXECUTION_TIME(0001490) */ `test`.`t1`.`a` AS `a` from `test`.`t1`
+SELECT  /*+ MAX_EXECUTION_TIME(20) */ *, SLEEP(1) FROM t1 UNION SELECT 1, 2;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
-(SELECT /*+ MAX_EXECUTION_TIME(30) */ *, SLEEP(1) FROM t1) UNION (SELECT 1, 2, 3);
+(SELECT /*+ MAX_EXECUTION_TIME(300) */ *, SLEEP(1) FROM t1) UNION (SELECT 1, 2);
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
-((SELECT  /*+ MAX_EXECUTION_TIME(50) */ *, SLEEP(1) FROM t1));
+((SELECT  /*+ MAX_EXECUTION_TIME(500) */ *, SLEEP(1) FROM t1));
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 # Make sure the hint overrides global/session/statement settings.
 # Global setting 30 seconds, won't be exceeded for sure
 SET @@max_statement_time = 30;
-SELECT /*+ MAX_EXECUTION_TIME(10) */* FROM t1 a, t1 b;
+SELECT /*+ MAX_EXECUTION_TIME(10)*/ count(*) FROM t1 a natural join t1 b natural join t1 c;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
-# Session setting 10 seconds, too long to be exceeded
-SET SESSION max_statement_time = 10;
-SELECT /*+ MAX_EXECUTION_TIME(15) */* FROM t1 a, t1 b;
+# Session setting 30 seconds, too long to be exceeded
+SET SESSION max_statement_time = 30;
+SELECT /*+ MAX_EXECUTION_TIME(15) */ count(*) FROM t1 a natural join t1 b natural join t1 c;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 SET STATEMENT max_statement_time = 20 FOR
-SELECT /*+ MAX_EXECUTION_TIME(5) */* FROM t1 a, t1 b;
+SELECT /*+ MAX_EXECUTION_TIME(5)*/ count(*) FROM t1 a natural join t1 b natural join t1 c;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 # Check that prepared statements process the hint correctly
 PREPARE s FROM 'SELECT  /*+ MAX_EXECUTION_TIME(20) */ seq, SLEEP(1) FROM seq_1_to_10';
@@ -45,29 +36,29 @@ ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 EXECUTE s;
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 # Hint duplication
-SELECT /*+ MAX_EXECUTION_TIME(10) MAX_EXECUTION_TIME(100) */ count(*) FROM t1;
+SELECT /*+ MAX_EXECUTION_TIME(50000) MAX_EXECUTION_TIME(100) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
 Warning	4219	Hint MAX_EXECUTION_TIME(100) is ignored as conflicting/duplicated
 # Wrong values
 SELECT /*+ MAX_EXECUTION_TIME(0) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
 Warning	1912	Incorrect value '0' for option 'MAX_EXECUTION_TIME'
 SELECT /*+ MAX_EXECUTION_TIME(-1) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
 Warning	1064	Optimizer hint syntax error near '-1) */ count(*) FROM t1' at line 1
 SELECT /*+ MAX_EXECUTION_TIME(4294967296) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
 Warning	1912	Incorrect value '4294967296' for option 'MAX_EXECUTION_TIME'
 
-# only SELECT statements supports the MAX_EXECUTION_TIME hint (warning):
+# only SELECT statements support the MAX_EXECUTION_TIME hint (warning):
 
 CREATE TABLE t2 (i INT);
 INSERT /*+ MAX_EXECUTION_TIME(10) */ INTO t2 SELECT 1;
@@ -102,18 +93,18 @@ SELECT 1 FROM (SELECT /*+ MAX_EXECUTION_TIME(10) */ 1) a;
 Warnings:
 Warning	4172	'MAX_EXECUTION_TIME(10)' is not allowed in this context
 # Hint is allowed only for the first select of UNION (warning):
-SELECT /*+ MAX_EXECUTION_TIME(20) */ count(*) FROM t1
+SELECT /*+ MAX_EXECUTION_TIME(50000) */ count(*) FROM t1
 UNION
-SELECT /*+ MAX_EXECUTION_TIME(30) */ count(*) FROM t1;
+SELECT /*+ MAX_EXECUTION_TIME(3) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
-Warning	4219	Hint MAX_EXECUTION_TIME(30) is ignored as conflicting/duplicated
+Warning	4219	Hint MAX_EXECUTION_TIME(3) is ignored as conflicting/duplicated
 SELECT count(*) FROM t1
 UNION
 SELECT /*+ MAX_EXECUTION_TIME(30) */ count(*) FROM t1;
 count(*)
-512
+5000
 Warnings:
 Warning	4172	'MAX_EXECUTION_TIME(30)' is not allowed in this context
 # Check that hint actually works:

mysql-test/main/opt_hint_timeout.test

@@ -11,17 +11,9 @@
 --echo #
 --enable_prepare_warnings
 
-CREATE TABLE t1 (a INT, b VARCHAR(300));
-INSERT INTO t1 VALUES (1, 'string');
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
+CREATE TABLE t1 (a INT);
+
+INSERT INTO t1 SELECT seq FROM seq_1_to_5000;
 
 -- disable_query_log
 -- disable_result_log
@@ -33,29 +25,29 @@ analyze table t1;
 --error ER_STATEMENT_TIMEOUT
 SELECT /*+ MAX_EXECUTION_TIME(10) */* FROM t1 a, t1 b;
 
-EXPLAIN EXTENDED SELECT /*+ MAX_EXECUTION_TIME(000149) */* FROM t1;
+EXPLAIN EXTENDED SELECT /*+ MAX_EXECUTION_TIME(0001490) */* FROM t1;
 
 --error ER_STATEMENT_TIMEOUT
-SELECT  /*+ MAX_EXECUTION_TIME(20) */ *, SLEEP(1) FROM t1 UNION SELECT 1, 2, 3;
+SELECT  /*+ MAX_EXECUTION_TIME(20) */ *, SLEEP(1) FROM t1 UNION SELECT 1, 2;
 --error ER_STATEMENT_TIMEOUT
-(SELECT /*+ MAX_EXECUTION_TIME(30) */ *, SLEEP(1) FROM t1) UNION (SELECT 1, 2, 3);
+(SELECT /*+ MAX_EXECUTION_TIME(300) */ *, SLEEP(1) FROM t1) UNION (SELECT 1, 2);
 --error ER_STATEMENT_TIMEOUT
-((SELECT  /*+ MAX_EXECUTION_TIME(50) */ *, SLEEP(1) FROM t1));
+((SELECT  /*+ MAX_EXECUTION_TIME(500) */ *, SLEEP(1) FROM t1));
 
 --echo # Make sure the hint overrides global/session/statement settings.
 --echo # Global setting 30 seconds, won't be exceeded for sure
 SET @@max_statement_time = 30;
 --error ER_STATEMENT_TIMEOUT
-SELECT /*+ MAX_EXECUTION_TIME(10) */* FROM t1 a, t1 b;
+SELECT /*+ MAX_EXECUTION_TIME(10)*/ count(*) FROM t1 a natural join t1 b natural join t1 c;
 
---echo # Session setting 10 seconds, too long to be exceeded
-SET SESSION max_statement_time = 10;
+--echo # Session setting 30 seconds, too long to be exceeded
+SET SESSION max_statement_time = 30;
 --error ER_STATEMENT_TIMEOUT
-SELECT /*+ MAX_EXECUTION_TIME(15) */* FROM t1 a, t1 b;
+SELECT /*+ MAX_EXECUTION_TIME(15) */ count(*) FROM t1 a natural join t1 b natural join t1 c;
 
 --error ER_STATEMENT_TIMEOUT
 SET STATEMENT max_statement_time = 20 FOR
-  SELECT /*+ MAX_EXECUTION_TIME(5) */* FROM t1 a, t1 b;
+  SELECT /*+ MAX_EXECUTION_TIME(5)*/ count(*) FROM t1 a natural join t1 b natural join t1 c;
 
 --echo # Check that prepared statements process the hint correctly
 PREPARE s FROM 'SELECT  /*+ MAX_EXECUTION_TIME(20) */ seq, SLEEP(1) FROM seq_1_to_10';
@@ -65,16 +57,15 @@ EXECUTE s;
 EXECUTE s;
 
 --echo # Hint duplication
-
-SELECT /*+ MAX_EXECUTION_TIME(10) MAX_EXECUTION_TIME(100) */ count(*) FROM t1;
+SELECT /*+ MAX_EXECUTION_TIME(50000) MAX_EXECUTION_TIME(100) */ count(*) FROM t1;
 
 --echo # Wrong values
 SELECT /*+ MAX_EXECUTION_TIME(0) */ count(*) FROM t1;
 SELECT /*+ MAX_EXECUTION_TIME(-1) */ count(*) FROM t1;
 SELECT /*+ MAX_EXECUTION_TIME(4294967296) */ count(*) FROM t1;
 
 --echo
---echo # only SELECT statements supports the MAX_EXECUTION_TIME hint (warning):
+--echo # only SELECT statements support the MAX_EXECUTION_TIME hint (warning):
 --echo
 CREATE TABLE t2 (i INT);
 INSERT /*+ MAX_EXECUTION_TIME(10) */ INTO t2 SELECT 1;
@@ -97,9 +88,9 @@ DROP PROCEDURE p1;
 SELECT 1 FROM (SELECT /*+ MAX_EXECUTION_TIME(10) */ 1) a;
 
 --echo # Hint is allowed only for the first select of UNION (warning):
-SELECT /*+ MAX_EXECUTION_TIME(20) */ count(*) FROM t1
+SELECT /*+ MAX_EXECUTION_TIME(50000) */ count(*) FROM t1
 UNION
-SELECT /*+ MAX_EXECUTION_TIME(30) */ count(*) FROM t1;
+SELECT /*+ MAX_EXECUTION_TIME(3) */ count(*) FROM t1;
 
 SELECT count(*) FROM t1
 UNION