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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-07 15:00:27 +03:00
parent a04202673f 35977e81f9
commit 916b237b3f
110 changed files with 1776 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/suite/versioning/t/delete_history.test
View File

@@ -169,4 +169,26 @@ insert into t1 values (1);
select * from t1;
drop table t1;
--echo #
--echo # MDEV-25468 DELETE HISTORY may delete current data on system-versioned table
--echo #
create or replace table t1 (x int) with system versioning;
insert into t1 values (1);
delete history from t1 before system_time '2039-01-01 23:00';
select * from t1;
explain extended delete history from t1 before system_time '2039-01-01 23:00';
create or replace procedure p() delete history from t1 before system_time '2039-01-01 23:00';
call p;
select * from t1;
call p;
select * from t1;
drop procedure p;
prepare stmt from "delete history from t1 before system_time '2039-01-01 23:00'";
execute stmt;
select * from t1;
execute stmt;
select * from t1;
drop prepare stmt;
drop table t1;
--source suite/versioning/common_finish.inc

1
mysql-test/suite/versioning/t/trx_id.opt
View File

@@ -1 +0,0 @@
--plugin-load-add=$TEST_VERSIONING_SO

13
mysql-test/suite/versioning/t/trx_id.test
View File

@@ -5,6 +5,10 @@ if (!$TEST_VERSIONING_SO)
--source include/have_innodb.inc
--source include/default_charset.inc
--disable_query_log
--eval install plugin test_versioning soname '$TEST_VERSIONING_SO'
--enable_query_log
set default_storage_engine= innodb;
create or replace table t1 (
@@ -499,6 +503,11 @@ alter table t add `row_start` bigint unsigned as row start,
add period for system_time(`row_start`,`row_end`),
modify x int after row_start,
with system versioning;
drop table t;
create or replace database test;
--echo #
--echo # MDEV-20842 Crash using versioning plugin functions after plugin was removed from server
--echo #
uninstall plugin test_versioning;
--error ER_SP_DOES_NOT_EXIST
select trt_begin_ts(0);