Merge branch '10.3' into 10.4

1 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/main/group_by.test b/mysql-test/main/group_by.test
index 6686166e00e..f9242b5b4ff 100644
--- a/mysql-test/main/group_by.test
+++ b/mysql-test/main/group_by.test
@@ -400,15 +400,20 @@ set big_tables=0;
 # Test of GROUP BY ... ORDER BY NULL optimization
 #
 
+SET @save_optimizer_use_condition_selectivity=@@optimizer_use_condition_selectivity,@save_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch='outer_join_with_cache=off',@@optimizer_use_condition_selectivity=4;
 create table t1 (a int not null, b int not null);
 insert into t1 values (1,1),(1,2),(3,1),(3,2),(2,2),(2,1);
 create table t2 (a int not null, b int not null, key(a));
 insert into t2 values (1,3),(3,1),(2,2),(1,1);
 select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b;
+--sorted_result
 select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b ORDER BY NULL;
 explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b;
 explain select t1.a,t2.b from t1,t2 where t1.a=t2.a group by t1.a,t2.b ORDER BY NULL;
 drop table t1,t2;
+SET @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity,@@optimizer_switch=@save_optimizer_switch;
+
 
 #
 # group function arguments in some functions