Merge branch '10.8' into 10.9mariadb-10.9.1

1 files changed, 38 insertions, 68 deletions

diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
index 54ec5edd0c4..69fc5c8cf4f 100644
--- a/mysql-test/main/opt_trace.result
+++ b/mysql-test/main/opt_trace.result
@@ -145,8 +145,7 @@ select * from v1	{
                   }
                 },
                 "rows_for_plan": 1,
-                "cost_for_plan": 2.404394531,
-                "estimated_join_cardinality": 1
+                "cost_for_plan": 2.404394531
               }
             ]
           },
@@ -296,8 +295,7 @@ select * from (select * from t1 where t1.a=1)q	{
                   }
                 },
                 "rows_for_plan": 1,
-                "cost_for_plan": 2.404394531,
-                "estimated_join_cardinality": 1
+                "cost_for_plan": 2.404394531
               }
             ]
           },
@@ -454,8 +452,7 @@ select * from v2	{
                       },
                       "rows_for_plan": 1,
                       "cost_for_plan": 2.404394531,
-                      "cost_for_sorting": 1,
-                      "estimated_join_cardinality": 1
+                      "cost_for_sorting": 1
                     }
                   ]
                 },
@@ -525,8 +522,7 @@ select * from v2	{
                   }
                 },
                 "rows_for_plan": 2,
-                "cost_for_plan": 2.4,
-                "estimated_join_cardinality": 2
+                "cost_for_plan": 2.4
               }
             ]
           },
@@ -662,8 +658,7 @@ explain select * from v2	{
                   }
                 },
                 "rows_for_plan": 10,
-                "cost_for_plan": 4.021972656,
-                "estimated_join_cardinality": 10
+                "cost_for_plan": 4.021972656
               }
             ]
           },
@@ -780,8 +775,7 @@ explain select * from v1	{
                       },
                       "rows_for_plan": 10,
                       "cost_for_plan": 4.021972656,
-                      "cost_for_sorting": 10,
-                      "estimated_join_cardinality": 10
+                      "cost_for_sorting": 10
                     }
                   ]
                 },
@@ -845,8 +839,7 @@ explain select * from v1	{
                   }
                 },
                 "rows_for_plan": 10,
-                "cost_for_plan": 12,
-                "estimated_join_cardinality": 10
+                "cost_for_plan": 12
               }
             ]
           },
@@ -1049,7 +1042,7 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b	{
                     },
                     "rows_for_plan": 100,
                     "cost_for_plan": 242.3759623,
-                    "estimated_join_cardinality": 100
+                    "pruned_by_hanging_leaf": true
                   }
                 ]
               },
@@ -1280,8 +1273,7 @@ EXPLAIN SELECT DISTINCT a FROM t1	{
                   }
                 },
                 "rows_for_plan": 5,
-                "cost_for_plan": 7.25,
-                "estimated_join_cardinality": 5
+                "cost_for_plan": 7.25
               }
             ]
           },
@@ -1472,8 +1464,7 @@ EXPLAIN SELECT MIN(d) FROM t1 where b=2 and c=3  group by a	{
                 },
                 "rows_for_plan": 8,
                 "cost_for_plan": 3.8,
-                "cost_for_sorting": 8,
-                "estimated_join_cardinality": 8
+                "cost_for_sorting": 8
               }
             ]
           },
@@ -1671,8 +1662,7 @@ EXPLAIN SELECT id,MIN(a),MAX(a) FROM t1 WHERE a>=20010104e0 GROUP BY id	{
                 },
                 "rows_for_plan": 9,
                 "cost_for_plan": 4.15,
-                "cost_for_sorting": 9,
-                "estimated_join_cardinality": 9
+                "cost_for_sorting": 9
               }
             ]
           },
@@ -1859,8 +1849,7 @@ EXPLAIN SELECT * FROM t1 WHERE a = 20010104e0 GROUP BY id	{
                 },
                 "rows_for_plan": 9,
                 "cost_for_plan": 4.15,
-                "cost_for_sorting": 9,
-                "estimated_join_cardinality": 9
+                "cost_for_sorting": 9
               }
             ]
           },
@@ -2145,8 +2134,7 @@ explain  select * from t1 where a=1 and b=2 order by c limit 1	{
                   }
                 },
                 "rows_for_plan": 21,
-                "cost_for_plan": 25.34242739,
-                "estimated_join_cardinality": 21
+                "cost_for_plan": 25.34242739
               }
             ]
           },
@@ -2400,8 +2388,7 @@ select t1.a from t1 left join t2 on t1.a=t2.a	{
                   }
                 },
                 "rows_for_plan": 4,
-                "cost_for_plan": 2.806835937,
-                "estimated_join_cardinality": 4
+                "cost_for_plan": 2.806835937
               }
             ]
           },
@@ -2570,7 +2557,7 @@ explain select * from t1 left join t2 on t2.a=t1.a	{
                     },
                     "rows_for_plan": 4,
                     "cost_for_plan": 7.606835937,
-                    "estimated_join_cardinality": 4
+                    "pruned_by_hanging_leaf": true
                   }
                 ]
               }
@@ -2753,8 +2740,7 @@ explain select t1.a from t1 left join (t2 join t3 on t2.b=t3.b) on t2.a=t1.a and
                   }
                 },
                 "rows_for_plan": 4,
-                "cost_for_plan": 2.806835937,
-                "estimated_join_cardinality": 4
+                "cost_for_plan": 2.806835937
               }
             ]
           },
@@ -2961,8 +2947,7 @@ explain extended select * from t1 where a in (select pk from t10)	{
                         }
                       },
                       "rows_for_plan": 10,
-                      "cost_for_plan": 4.021972656,
-                      "estimated_join_cardinality": 10
+                      "cost_for_plan": 4.021972656
                     }
                   ]
                 }
@@ -3034,8 +3019,7 @@ explain extended select * from t1 where a in (select pk from t10)	{
                       {
                         "chosen_strategy": "SJ-Materialization"
                       }
-                    ],
-                    "estimated_join_cardinality": 3
+                    ]
                   }
                 ]
               },
@@ -3446,7 +3430,7 @@ explain select * from t1 where pk = 2 and a=5 and b=1	{
                 },
                 "rows_for_plan": 1,
                 "cost_for_plan": 0.326073957,
-                "estimated_join_cardinality": 1
+                "pruned_by_hanging_leaf": true
               }
             ]
           },
@@ -3574,8 +3558,7 @@ select f1(a) from t1	{
                   }
                 },
                 "rows_for_plan": 4,
-                "cost_for_plan": 2.806835937,
-                "estimated_join_cardinality": 4
+                "cost_for_plan": 2.806835937
               }
             ]
           },
@@ -3671,8 +3654,7 @@ select f2(a) from t1	{
                   }
                 },
                 "rows_for_plan": 4,
-                "cost_for_plan": 2.806835937,
-                "estimated_join_cardinality": 4
+                "cost_for_plan": 2.806835937
               }
             ]
           },
@@ -3718,7 +3700,7 @@ a
 2
 select length(trace) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 length(trace)
-2141
+2092
 set optimizer_trace_max_mem_size=100;
 select * from t1;
 a
@@ -3732,7 +3714,7 @@ select * from t1	{
       "join_preparation": {
         "select_id": 1,
         "steps": [
-        	2041	0
+        	1992	0
 set optimizer_trace_max_mem_size=0;
 select * from t1;
 a
@@ -3740,7 +3722,7 @@ a
 2
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 QUERY	TRACE	MISSING_BYTES_BEYOND_MAX_MEM_SIZE	INSUFFICIENT_PRIVILEGES
-select * from t1		2141	0
+select * from t1		2092	0
 drop table t1;
 set optimizer_trace='enabled=off';
 set @@optimizer_trace_max_mem_size= @save_optimizer_trace_max_mem_size;
@@ -4085,7 +4067,7 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3	{
                     },
                     "rows_for_plan": 3,
                     "cost_for_plan": 4.948514767,
-                    "estimated_join_cardinality": 3
+                    "pruned_by_hanging_leaf": true
                   }
                 ]
               },
@@ -4284,8 +4266,7 @@ explain select * from (select rand() from t1)q	{
                         }
                       },
                       "rows_for_plan": 3,
-                      "cost_for_plan": 2.605126953,
-                      "estimated_join_cardinality": 3
+                      "cost_for_plan": 2.605126953
                     }
                   ]
                 },
@@ -4349,8 +4330,7 @@ explain select * from (select rand() from t1)q	{
                   }
                 },
                 "rows_for_plan": 3,
-                "cost_for_plan": 3.6,
-                "estimated_join_cardinality": 3
+                "cost_for_plan": 3.6
               }
             ]
           },
@@ -4578,8 +4558,7 @@ explain select * from t1 where a in (select t_inner_1.a from t1 t_inner_1, t1 t_
                             }
                           },
                           "rows_for_plan": 9,
-                          "cost_for_plan": 6.410253906,
-                          "estimated_join_cardinality": 9
+                          "cost_for_plan": 6.410253906
                         }
                       ]
                     },
@@ -4699,8 +4678,7 @@ explain select * from t1 where a in (select t_inner_1.a from t1 t_inner_1, t1 t_
                           {
                             "chosen_strategy": "SJ-Materialization"
                           }
-                        ],
-                        "estimated_join_cardinality": 3
+                        ]
                       }
                     ]
                   },
@@ -5243,8 +5221,7 @@ t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4)	{
                                       {
                                         "chosen_strategy": "DuplicateWeedout"
                                       }
-                                    ],
-                                    "estimated_join_cardinality": 27
+                                    ]
                                   }
                                 ]
                               },
@@ -5366,8 +5343,7 @@ t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4)	{
                                       {
                                         "chosen_strategy": "DuplicateWeedout"
                                       }
-                                    ],
-                                    "estimated_join_cardinality": 27
+                                    ]
                                   }
                                 ]
                               },
@@ -6688,8 +6664,7 @@ t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4)	{
                             }
                           },
                           "rows_for_plan": 27,
-                          "cost_for_plan": 10.02050781,
-                          "estimated_join_cardinality": 27
+                          "cost_for_plan": 10.02050781
                         }
                       ]
                     },
@@ -6762,8 +6737,7 @@ t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4)	{
                             }
                           },
                           "rows_for_plan": 27,
-                          "cost_for_plan": 10.02050781,
-                          "estimated_join_cardinality": 27
+                          "cost_for_plan": 10.02050781
                         }
                       ]
                     },
@@ -6982,8 +6956,7 @@ t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4)	{
                                       {
                                         "chosen_strategy": "SJ-Materialization"
                                       }
-                                    ],
-                                    "estimated_join_cardinality": 27
+                                    ]
                                   }
                                 ]
                               },
@@ -8149,8 +8122,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans'))
                         }
                     },
                     "rows_for_plan": 4000,
-                    "cost_for_plan": 1025.003418,
-                    "estimated_join_cardinality": 4000
+                    "cost_for_plan": 1025.003418
                 }
             ]
         },
@@ -8491,7 +8463,7 @@ JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans'))
                     "rows_for_plan": 10,
                     "cost_for_plan": 26.0278306,
                     "cost_for_sorting": 10,
-                    "estimated_join_cardinality": 10
+                    "pruned_by_hanging_leaf": true
                 }
             ]
         },
@@ -8811,8 +8783,7 @@ select count(*) from seq_1_to_10000000	{
                   }
                 },
                 "rows_for_plan": 10000000,
-                "cost_for_plan": 12000000,
-                "estimated_join_cardinality": 10000000
+                "cost_for_plan": 12000000
               }
             ]
           },
@@ -9216,8 +9187,7 @@ json_detailed(json_extract(trace, '$**.choose_best_splitting'))
                     },
                     "rows_for_plan": 1.8367,
                     "cost_for_plan": 2.367925794,
-                    "cost_for_sorting": 1.8367,
-                    "estimated_join_cardinality": 1.8367
+                    "cost_for_sorting": 1.8367
                 }
             ]
         },