database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.3 into 10.4, except for MDEV-20265

Browse Source 
The MDEV-20265 commit e746f451d5
introduces DBUG_ASSERT(right_op == r_tbl) in
st_select_lex::add_cross_joined_table(), and that assertion would
fail in several tests that exercise joins. That commit was skipped
in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
This commit is contained in:
Marko Mäkelä
2019-08-23 08:06:17 +03:00
parent 235cf969d2 b96e4424fb
commit efb8485d85
66 changed files with 689 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/suite/versioning/t/partition.test
View File

@@ -488,27 +488,6 @@ create or replace table t1 (f int) with system versioning partition by hash(f);
--error 0,ER_DELAYED_NOT_SUPPORTED
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 #