1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2021-05-04 07:37:38 +03:00
27 changed files with 345 additions and 203 deletions

View File

@ -1,10 +1,12 @@
--source include/have_file_key_management_plugin.inc
--source include/have_sequence.inc
SET @aria_encrypt= @@aria_encrypt_tables;
SET global aria_encrypt_tables=1;
#
# MDEV-8022 Assertion `rc == 0' failed in ma_encrypt on dropping an encrypted Aria table
#
set global aria_encrypt_tables = 1;
create table t1 (i int, key(i)) engine=aria;
insert into t1 values (1);
drop table t1;
@ -24,7 +26,18 @@ alter table t1 enable keys;
check table t1;
drop table t1;
--echo #
--echo # MDEV CHECK on encrypted Aria table complains about "Wrong LSN"
--echo #
CREATE TABLE t1 (f DATE PRIMARY KEY) ENGINE=Aria;
INSERT INTO t1 (f) VALUES ('1995-01-01'),('2000-01-01');
DELETE FROM t1 WHERE f = '2000-01-01';
OPTIMIZE TABLE t1;
CHECK TABLE t1 EXTENDED;
DROP TABLE t1;
#
# Cleanup
#
set global aria_encrypt_tables = 0;
set global aria_encrypt_tables=@aria_encrypt;