-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
43 changed files
with
427 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# Copyright (C) 2012 Monty Program Ab, 2021 Brad Smith | ||
# | ||
# This program is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; version 2 of the License. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA | ||
|
||
# This file includes OpenBSD specific options and quirks, related to system checks | ||
|
||
# Find libexecinfo (library that contains backtrace_symbols etc) | ||
FIND_LIBRARY(EXECINFO NAMES execinfo) | ||
IF(EXECINFO) | ||
SET(LIBEXECINFO ${EXECINFO}) | ||
ENDIF() |
Submodule libmariadb
updated
from 180c54 to 802ce5
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
mysql-test/suite/encryption/r/innodb-key-rotation-disable.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
create table t1(f1 int not null)engine=innodb; | ||
create table t2(f1 int not null)engine=innodb; | ||
insert into t1 select * from seq_1_to_100; | ||
insert into t2 select * from seq_1_to_100; | ||
# Enable encryption | ||
set global innodb_encrypt_tables=ON; | ||
# Create a new table and it is added to rotation list | ||
create table t3(f1 int not null)engine=innodb; | ||
insert into t3 select * from seq_1_to_100; | ||
# Increase the version and it should set rotation | ||
# variable for the encryption plugin | ||
set global debug_key_management_version=10; | ||
select @@debug_key_management_version; | ||
@@debug_key_management_version | ||
10 | ||
# Decrease the key version and Disable the encryption | ||
set global debug_key_management_version=1; | ||
set global innodb_encrypt_tables=off; | ||
DROP TABLE t1, t2, t3; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--innodb-tablespaces-encryption | ||
--plugin-load-add=$DEBUG_KEY_MANAGEMENT_SO |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
--source include/have_innodb.inc | ||
--source include/have_debug.inc | ||
--source include/have_sequence.inc | ||
|
||
create table t1(f1 int not null)engine=innodb; | ||
create table t2(f1 int not null)engine=innodb; | ||
insert into t1 select * from seq_1_to_100; | ||
insert into t2 select * from seq_1_to_100; | ||
|
||
let $restart_parameters=--innodb_encrypt_tables=0 --innodb_encryption_threads=1 --innodb_encryption_rotate_key_age=9; | ||
--source include/restart_mysqld.inc | ||
|
||
--echo # Enable encryption | ||
|
||
set global innodb_encrypt_tables=ON; | ||
--let $tables_count= `select count(*) from information_schema.tables where engine = 'InnoDB'` | ||
--let $wait_timeout= 600 | ||
--let $wait_condition=SELECT COUNT(*) >= $tables_count FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; | ||
--source include/wait_condition.inc | ||
--echo # Create a new table and it is added to rotation list | ||
create table t3(f1 int not null)engine=innodb; | ||
insert into t3 select * from seq_1_to_100; | ||
|
||
--echo # Increase the version and it should set rotation | ||
--echo # variable for the encryption plugin | ||
|
||
set global debug_key_management_version=10; | ||
select @@debug_key_management_version; | ||
--let $tables_count= `select count(*) from information_schema.tables where engine = 'InnoDB'` | ||
--let $wait_timeout= 600 | ||
--let $wait_condition=SELECT COUNT(*) >= $tables_count FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; | ||
--source include/wait_condition.inc | ||
|
||
--echo # Decrease the key version and Disable the encryption | ||
set global debug_key_management_version=1; | ||
set global innodb_encrypt_tables=off; | ||
|
||
--let $wait_timeout= 600 | ||
--let $wait_condition=SELECT COUNT(*) >= $tables_count FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; | ||
--source include/wait_condition.inc | ||
DROP TABLE t1, t2, t3; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
--innodb_sort_buffer_size=64k |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.