Merge branch 'github/10.2' into 10.3

2 files changed, 0 insertions, 70 deletions

diff --git a/mysql-test/t/alter_table_errors.test b/mysql-test/t/alter_table_errors.test
deleted file mode 100644
index d9982ac26f4..00000000000
--- a/mysql-test/t/alter_table_errors.test
+++ /dev/null
@@ -1,10 +0,0 @@
---source include/have_innodb.inc
-
-#
-# MDEV-16110 ALTER with ALGORITHM=INPLACE breaks temporary table with virtual columns
-#
-create table t (a int, v int as (a)) engine=innodb;
---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-alter table t change column a b tinyint, algorithm=inplace;
-show create table t;
-drop table t;
diff --git a/mysql-test/t/subselect-crash_15755.test b/mysql-test/t/subselect-crash_15755.test
deleted file mode 100644
index 79e259d6337..00000000000
--- a/mysql-test/t/subselect-crash_15755.test
+++ /dev/null
@@ -1,60 +0,0 @@
---source include/have_innodb.inc
-set global innodb_stats_persistent= 1;
-drop table if exists t1;
-create table t1 (
-  f1 bigint(20) default 0,
-  f2 varchar(50) default '',
-  f3 int(10) default 0,
-  f4 bigint(20) default 0,
-  f5 bigint(20) default 0,
-  f6 varchar(50) default '',
-  f7 varchar(64) default '',
-  f8 varchar(30) default '',
-  f9 varchar(30) default '',
-  f10 bigint(20) default 0,
-  f11 bigint(20) default 0,
-  f12 bigint(20) default 0,
-  f13 bigint(20) default 0,
-  f14 varchar(50) default '',
-  f15 varchar(100) default '',
-  f16 varchar(30) default '',
-  f17 varchar(40) default '',
-  f18 varchar(30) default '',
-  f19 varchar(10) default '',
-  f20 varchar(30) default '',
-  f21 int(10) default 0,
-  f22 int(10) default 0,
-  f23 int(10) default 0,
-  f24 int(10) default 0,
-  f25 varchar(20) default '',
-  f26 varchar(20) default '',
-  f27 varchar(100) default '',
-  f28 varchar(55) default '',
-  f29 varchar(20) default '',
-  f30 varchar(100) default '',
-  f31 varchar(30) default '',
-  f32 varchar(20) default '',
-  f33 int(10) default 0,
-  f34 int(10) default 0,
-  f35 varchar(30) default '',
-  f36 varchar(30) default '',
-  f37 varchar(30) default '',
-  f38 varchar(20) default '',
-  f39 tinyint(4) default 0,
-  f40 tinyint(4) default 0,
-  f41 bigint(20) default 0,
-  f42 varchar(50) default '',
-  f43 varchar(50) default '',
-  f44 varchar(50) default '',
-  f45 int(10) default 0,
-  f46 tinyint(1) default 0
-) engine=innodb row_format=dynamic;
- 
-insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
-insert into t1 select * from t1;
-insert into t1 select * from t1;
-insert into t1 select * from t1;
-insert into t1 select * from t1;
-select * from t1 where f2 in (select f2 from t1 group by f2 having count(distinct f3) = 1);
-drop table t1;
-set global innodb_stats_persistent= 0;