Merge 10.7 into 10.8

mysql-test/include/rowid_filter_debug_kill.inc

@@ -1,17 +1,14 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/have_sequence.inc
 --source include/count_sessions.inc
 
 --echo #
 --echo # MDEV-22761 KILL QUERY during rowid_filter, crashes
 --echo #
 
-create table t0(a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-
-# 100 rows 
 create table t2(a int);
-insert into t2 select A.a + B.a* 10 from t0 A, t0 B;
+insert into t2 select * from seq_0_to_99;
 
 # 10K rows 
 CREATE TABLE t3 (
@@ -26,11 +23,10 @@ where table_schema=database() and table_name='t3';
 
 insert into t3
 select
-  A.a,
-  B.a,
+  A.seq,
+  B.seq,
   'filler-data-filler-data'
-from
-  t2 A, t2 B;
+from seq_0_to_99 A, seq_0_to_99 B;
 
 analyze table t2,t3;
 
@@ -48,7 +44,6 @@ where
   t3.key1=t2.a and t3.key2 in (2,3);
 
 connect (con1, localhost, root,,);
-connection con1;
 set debug_sync='now WAIT_FOR at_rowid_filter_check';
 evalp kill query $target_id;
 set debug_sync='now SIGNAL go';
@@ -60,6 +55,5 @@ disconnect con1;
 reap;
 set debug_sync='RESET';
 
-drop table t0,t2,t3;
+drop table t2,t3;
 --source include/wait_until_count_sessions.inc
-