Merge branch '10.9' into 10.10mariadb-10.10.2

1 files changed, 3 insertions, 6 deletions

diff --git a/mysql-test/include/rowid_filter_debug_kill.inc b/mysql-test/include/rowid_filter_debug_kill.inc
index 6a8c5d3f70d..c701d206297 100644
--- a/mysql-test/include/rowid_filter_debug_kill.inc
+++ b/mysql-test/include/rowid_filter_debug_kill.inc
@@ -9,9 +9,6 @@
 create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
-create table t1(a int);
-insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
-
 # 100 rows 
 create table t2(a int);
 insert into t2 select A.a + B.a* 10 from t0 A, t0 B;
@@ -30,10 +27,10 @@ where table_schema=database() and table_name='t3';
 insert into t3
 select
   A.a,
-  A.a,
+  B.a,
   'filler-data-filler-data'
 from
-  t0 A, t1 B;
+  t2 A, t2 B;
 
 analyze table t2,t3;
 
@@ -63,6 +60,6 @@ disconnect con1;
 reap;
 set debug_sync='RESET';
 
-drop table t0,t1,t2,t3;
+drop table t0,t2,t3;
 --source include/wait_until_count_sessions.inc