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-04-08 10:11:36 +03:00
parent 76db096ae6 0ba845a8c7
commit 1900c2ede5
50 changed files with 1264 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/encryption/r/aria_tiny.result
View File

@@ -2,4 +2,12 @@ set global aria_encrypt_tables = 1;
create table t1 (i int, key(i)) engine=aria;
insert into t1 values (1);
drop table t1;
create table t1 (a int primary key, b int, c int, key(b),key(c)) engine=aria;
alter table t1 disable keys;
insert into t1 select seq,seq,seq from seq_1_to_100;
alter table t1 enable keys;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
set global aria_encrypt_tables = 0;

26
mysql-test/suite/encryption/t/aria_tiny.test
View File

@@ -1,12 +1,30 @@
--source include/have_file_key_management_plugin.inc
--source include/have_sequence.inc
#
# MDEV-8022 Assertion `rc == 0' failed in ma_encrypt on dropping an encrypted Aria table
#
--source include/have_file_key_management_plugin.inc
set global aria_encrypt_tables = 1;
create table t1 (i int, key(i)) engine=aria;
insert into t1 values (1);
drop table t1;
set global aria_encrypt_tables = 0;
#
# MDEV-17913 Encrypted transactional Aria tables remain corrupt after crash
# recovery, automatic repair does not work
#
# We are using a simplifed version of the test here. This works thanks to
# the extended check table code that also checks if LSN's are reasonable.
#
create table t1 (a int primary key, b int, c int, key(b),key(c)) engine=aria;
alter table t1 disable keys;
insert into t1 select seq,seq,seq from seq_1_to_100;
alter table t1 enable keys;
check table t1;
drop table t1;
#
# Cleanup
#
set global aria_encrypt_tables = 0;