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.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-18 17:30:02 +03:00
parent f86d97c3fe faf6d0ef3f
commit 23047d3ed4
89 changed files with 1905 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/suite/encryption/r/tempfiles_encrypted.result Normal file
View File

@@ -0,0 +1,18 @@
#
# Tests when the temporary files are encrypted
#
select @@encrypt_tmp_files;
@@encrypt_tmp_files
1
#
# MDEV-22556: Incorrect result for window function when using encrypt-tmp-files=ON
#
set @save_sort_buffer_size=@@sort_buffer_size;
set sort_buffer_size= 2000;
create table t1( a DECIMAL(12,0) DEFAULT NULL, b VARCHAR(20) DEFAULT NULL, c DECIMAL(12,0) DEFAULT NULL)engine=INNODB;
insert into t1 select seq, seq, seq from seq_1_to_5000;
select count(*) from (select a, b, c, ROW_NUMBER() OVER (PARTITION BY a) FROM t1)q;
count(*)
5000
set @@sort_buffer_size=@save_sort_buffer_size;
drop table t1;

2
mysql-test/suite/encryption/t/innodb_encryption_tables.test
View File

@@ -1,6 +1,8 @@
-- source include/have_innodb.inc
-- source include/have_example_key_management_plugin.inc
-- source include/not_embedded.inc
# We can't run this test under valgrind as it 'takes forever'
-- source include/not_valgrind.inc
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact;

1
mysql-test/suite/encryption/t/tempfiles_encrypted.opt Normal file
View File

@@ -0,0 +1 @@
--encrypt-tmp_files=ON

23
mysql-test/suite/encryption/t/tempfiles_encrypted.test Normal file
View File

@@ -0,0 +1,23 @@
--echo #
--echo # Tests when the temporary files are encrypted
--echo #
source include/have_file_key_management_plugin.inc;
source include/have_sequence.inc;
source include/have_innodb.inc;
select @@encrypt_tmp_files;
--echo #
--echo # MDEV-22556: Incorrect result for window function when using encrypt-tmp-files=ON
--echo #
set @save_sort_buffer_size=@@sort_buffer_size;
set sort_buffer_size= 2000;
create table t1( a DECIMAL(12,0) DEFAULT NULL, b VARCHAR(20) DEFAULT NULL, c DECIMAL(12,0) DEFAULT NULL)engine=INNODB;
insert into t1 select seq, seq, seq from seq_1_to_5000;
select count(*) from (select a, b, c, ROW_NUMBER() OVER (PARTITION BY a) FROM t1)q;
set @@sort_buffer_size=@save_sort_buffer_size;
drop table t1;