Update test results

mysql-test/main/derived_cond_pushdown.result

@@ -18387,7 +18387,7 @@ explain extended select t2.a,t2.b,t2.c,t.c as t_c,t.max,t.min
 from t2, t3, (select c, max(b) max, min(b) min from t4 group by c) t
 where t2.b < 40 and t2.a=t3.a and t3.c=t.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	90	53.33	Using where
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	90	60.00	Using where
 1	PRIMARY	t3	ref	idx_a	idx_a	5	test.t2.a	1	100.00	Using where
 1	PRIMARY	<derived2>	ref	key0	key0	128	test.t3.c	10	100.00	
 2	DERIVED	t4	ALL	idx_c	NULL	NULL	NULL	160	100.00	Using temporary; Using filesort
@@ -18406,7 +18406,7 @@ EXPLAIN
           "table_name": "t2",
           "access_type": "ALL",
           "rows": 90,
-          "filtered": 53.33333206,
+          "filtered": 60,
           "attached_condition": "t2.b < 40 and t2.a is not null"
         }
       },
@@ -18910,7 +18910,7 @@ explain extended select *
 from t2, t3, (select c, b, sum(b) over (partition by c) from t4 ) t
 where t2.b < 40 and t2.a=t3.a and t3.c=t.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	90	53.33	Using where
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	90	60.00	Using where
 1	PRIMARY	t3	ref	idx_a	idx_a	5	test.t2.a	1	100.00	Using where
 1	PRIMARY	<derived2>	ref	key0	key0	128	test.t3.c	10	100.00	
 2	DERIVED	t4	ALL	idx_c	NULL	NULL	NULL	160	100.00	Using temporary
@@ -18929,7 +18929,7 @@ EXPLAIN
           "table_name": "t2",
           "access_type": "ALL",
           "rows": 90,
-          "filtered": 53.33333206,
+          "filtered": 60,
           "attached_condition": "t2.b < 40 and t2.a is not null"
         }
       },

mysql-test/main/opt_trace.result

@@ -8083,20 +8083,20 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans'))
                     
                     {
                         "access_type": "scan",
-                        "resulting_rows": 4,
-                        "cost": 3.217089844,
+                        "resulting_rows": 5,
+                        "cost": 3.017089844,
                         "chosen": true
                     }
                 ],
                 "chosen_access_method": 
                 {
                     "type": "scan",
-                    "records": 4,
-                    "cost": 3.217089844,
+                    "records": 5,
+                    "cost": 3.017089844,
                     "uses_join_buffering": false
                 }
             },
-            "rows_for_plan": 4,
+            "rows_for_plan": 5,
             "cost_for_plan": 4.017089844,
             "rest_of_plan": 
             [
@@ -8115,7 +8115,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans'))
                             {
                                 "access_type": "scan",
                                 "resulting_rows": 800,
-                                "cost": 176.7890625,
+                                "cost": 220.9863281,
                                 "chosen": true
                             }
                         ],
@@ -8123,13 +8123,13 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans'))
                         {
                             "type": "scan",
                             "records": 800,
-                            "cost": 176.7890625,
+                            "cost": 220.9863281,
                             "uses_join_buffering": false
                         }
                     },
-                    "rows_for_plan": 3200,
-                    "cost_for_plan": 820.8061523,
-                    "estimated_join_cardinality": 3200
+                    "rows_for_plan": 4000,
+                    "cost_for_plan": 1025.003418,
+                    "estimated_join_cardinality": 4000
                 }
             ]
         },
@@ -8594,7 +8594,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns'))
 ]
 EXPLAIN EXTENDED SELECT * from t1 WHERE a != 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	100	98.00	Using where
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	100	99.00	Using where
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` <> 5
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
@@ -8610,13 +8610,13 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns'))
                 "NULL < a < 5",
                 "5 < a"
             ],
-            "selectivity_from_histogram": 0.98
+            "selectivity_from_histogram": 0.99
         }
     ]
 ]
 EXPLAIN EXTENDED SELECT * from t1 WHERE b >= 10 and b < 25;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	100	14.00	Using where
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	100	15.00	Using where
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`b` >= 10 and `test`.`t1`.`b` < 25
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
@@ -8631,7 +8631,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns'))
             [
                 "10 <= b < 25"
             ],
-            "selectivity_from_histogram": 0.14
+            "selectivity_from_histogram": 0.15
         }
     ]
 ]