MDEV-35195 Assertion `tab->join->order' fails upon vector search with DISTINCT #2

MDEV-35337 Server crash or assertion failure in join_read_first upon using vector distance in group by

allow Item_func_distance to be not only in tab->join->order,
but alternatively in tab->join->group_list

Author: vuvova

mysql-test/main/vector2.result

@@ -270,3 +270,22 @@ f
 4
 5
 drop table t1, t2;
+#
+# MDEV-35195 Assertion `tab->join->order' fails upon vector search with DISTINCT #2
+#
+create table t (v vector(1) not null, vector(v));
+insert into t values (0x00000000),(0x00000040);
+select distinct vec_distance_euclidean(v,0x00000000) d from t order by d limit 1;
+d
+0
+drop table t;
+#
+# MDEV-35337 Server crash or assertion failure in join_read_first upon using vector distance in group by
+#
+create table t (a int, v vector(1) not null, primary key (a), vector(v));
+insert into t values (1,vec_fromtext('[-1]')),(2,vec_fromtext('[1]')),(3,vec_fromtext('[2]'));
+select vec_distance_euclidean(v,vec_fromtext('[0]')) d, count(*) from t group by d order by d limit 2;
+d	count(*)
+1	2
+2	1
+drop table t;

mysql-test/main/vector2.test

@@ -207,3 +207,19 @@ insert into t2 select seq from seq_1_to_1000;
 set join_cache_level= 0;
 select t2.f from t1 left join t2 on (t1.pk=t2.f) order by vec_distance_euclidean(t1.a,0x00000040) limit 5;
 drop table t1, t2;
+
+--echo #
+--echo # MDEV-35195 Assertion `tab->join->order' fails upon vector search with DISTINCT #2
+--echo #
+create table t (v vector(1) not null, vector(v));
+insert into t values (0x00000000),(0x00000040);
+select distinct vec_distance_euclidean(v,0x00000000) d from t order by d limit 1;
+drop table t;
+
+--echo #
+--echo # MDEV-35337 Server crash or assertion failure in join_read_first upon using vector distance in group by
+--echo #
+create table t (a int, v vector(1) not null, primary key (a), vector(v));
+insert into t values (1,vec_fromtext('[-1]')),(2,vec_fromtext('[1]')),(3,vec_fromtext('[2]'));
+select vec_distance_euclidean(v,vec_fromtext('[0]')) d, count(*) from t group by d order by d limit 2;
+drop table t;

sql/sql_select.cc

@@ -25145,13 +25145,14 @@ join_read_first(JOIN_TAB *tab)
   tab->read_record.table=table;
   if (tab->index >= table->s->keys)
   {
+    ORDER *order= tab->join->order ? tab->join->order : tab->join->group_list;
     DBUG_ASSERT(tab->index < table->s->total_keys);
     DBUG_ASSERT(tab->index == table->s->keys);
     DBUG_ASSERT(tab->sorted);
-    DBUG_ASSERT(tab->join->order);
-    DBUG_ASSERT(tab->join->order->next == NULL);
+    DBUG_ASSERT(order);
+    DBUG_ASSERT(order->next == NULL);
     tab->read_record.read_record_func= join_hlindex_read_next;
-    error= tab->table->hlindex_read_first(tab->index, *tab->join->order->item,
+    error= tab->table->hlindex_read_first(tab->index, *order->item,
                                           tab->join->select_limit);
   }
   else