Merge 10.4 into 10.5

1 files changed, 0 insertions, 21 deletions

diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index ac9b0de690a..73df539d965 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -489,27 +489,6 @@ create or replace table t1 (f int) with system versioning partition by hash(f);
 insert delayed into t1 values (1);
 
 --echo #
---echo # MDEV-17613 MIN/MAX Optimization (Select tables optimized away) does not work
---echo #
---disable_query_log
-set @saved_storage_engine= @@default_storage_engine;
-if ($MTR_COMBINATION_HEAP)
-{
-  # This case does not work with HEAP
-  set default_storage_engine= myisam;
-}
---enable_query_log
-create or replace table t1 (pk int primary key) with system versioning
-partition by system_time (
-  partition p1 history,
-  partition pn current);
-insert into t1 values (1), (2);
-explain select max(pk) from t1;
---disable_query_log
-set default_storage_engine= @saved_storage_engine;
---enable_query_log
-
---echo #
 --echo # MDEV-20068 History partition rotation is not done under LOCK TABLES
 --echo #
 create or replace table t1 (x int) with system versioning partition by system_time limit 1