Bug#21286261: QUERY DIGEST DOES NOT REFLECT NEW OPTIMIZER HINTS

After-push test update #2 to make it query cache-friendly.

Author: GlebShchepa

mysql-test/r/opt_hints_pfs.result

@@ -35,12 +35,12 @@ SELECT digest, digest_text FROM performance_schema.events_statements_history ORD
 digest	digest_text
 cb07f49f231ef2ad2b18aec377e40c15	SELECT /*+ BKA ( `t1`@`qb1` ) BNL ( @`qb1` `t1` ) DUPSWEEDOUT FIRSTMATCH INTOEXISTS LOOSESCAN MATERIALIZATION MRR ( `t1` ) NO_BKA ( `t2` ) NO_BNL ( `t2` ) NO_ICP ( `t2` ) NO_MRR ( `t2` ) NO_RANGE_OPTIMIZATION ( `t2` ) NO_SEMIJOIN ( `t2` ) QB_NAME ( `qb1` ) SEMIJOIN ( `t1` ) SUBQUERY ( `t1` ) */ * FROM `t1` , `t2` 
 0081bf57972dea13e634572c5016f44f	SELECT * FROM `t1` , `t2` 
-SELECT * FROM t1, t2;
-SELECT /*+ MAX_EXECUTION_TIME(10) */ * FROM t1, t2;
+SELECT * FROM t2, t1;
+SELECT /*+ MAX_EXECUTION_TIME(10) */ * FROM t2, t1;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;
 digest	digest_text
-e54831b2317e0df6a07b9c7afb3e2b05	SELECT /*+ MAX_EXECUTION_TIME (?) */ * FROM `t1` , `t2` 
-0081bf57972dea13e634572c5016f44f	SELECT * FROM `t1` , `t2` 
+33e01829d6589b50e76ce6367744eb2b	SELECT /*+ MAX_EXECUTION_TIME (?) */ * FROM `t2` , `t1` 
+d0955f01515d6970418b482c7f16c202	SELECT * FROM `t2` , `t1` 
 SELECT 1;
 SELECT /*+ bad_hint_also_goes_to_digest */ 1;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;

mysql-test/t/opt_hints_pfs.test

@@ -46,8 +46,8 @@ SELECT /*+
 eval $check;
 
 --disable_result_log
-SELECT * FROM t1, t2;
-SELECT /*+ MAX_EXECUTION_TIME(10) */ * FROM t1, t2;
+SELECT * FROM t2, t1;
+SELECT /*+ MAX_EXECUTION_TIME(10) */ * FROM t2, t1;
 --enable_result_log
 eval $check;