summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-10-19 19:25:48 +1100
committerDaniel Black <daniel@mariadb.org>2022-10-19 20:05:59 +1100
commit3a62ff7e8980239a39e85393c6a797bb7acf97ed (patch)
treebc1a1e65367b5d6e81a4d5e02eb4887b231100a2 /mysql-test/suite/encryption
parentcee7175b79a22c29a82ef328aba208f90afcea86 (diff)
downloadmariadb-git-3a62ff7e8980239a39e85393c6a797bb7acf97ed.tar.gz
Revert "MDEV-25343 add read secret size in file key plugin"
This reverts commit cee7175b79a22c29a82ef328aba208f90afcea86.
Diffstat (limited to 'mysql-test/suite/encryption')
-rw-r--r--mysql-test/suite/encryption/r/filekeys_secret_too_long.result10
-rw-r--r--mysql-test/suite/encryption/t/filekeys-data-too-long.key4
-rw-r--r--mysql-test/suite/encryption/t/filekeys_secret_too_long.opt3
-rw-r--r--mysql-test/suite/encryption/t/filekeys_secret_too_long.test4
4 files changed, 0 insertions, 21 deletions
diff --git a/mysql-test/suite/encryption/r/filekeys_secret_too_long.result b/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
deleted file mode 100644
index 32e18513454..00000000000
--- a/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
+++ /dev/null
@@ -1,10 +0,0 @@
-call mtr.add_suppression("the secret file has incorrect length");
-call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
-call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND 1 /the secret file has incorrect length/ in mysqld.1.err
-create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
-ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
-select plugin_status from information_schema.plugins
-where plugin_name = 'file_key_management';
-plugin_status
-# Test checks if opening an too large secret does not crash the server.
diff --git a/mysql-test/suite/encryption/t/filekeys-data-too-long.key b/mysql-test/suite/encryption/t/filekeys-data-too-long.key
deleted file mode 100644
index ba1624fb324..00000000000
--- a/mysql-test/suite/encryption/t/filekeys-data-too-long.key
+++ /dev/null
@@ -1,4 +0,0 @@
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt b/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
deleted file mode 100644
index c3f95019f2a..00000000000
--- a/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
+++ /dev/null
@@ -1,3 +0,0 @@
---loose-file-key-management-filekey=FILE:$MTR_SUITE_DIR/t/filekeys-data-too-long.key
---loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc
-
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.test b/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
deleted file mode 100644
index b675f892895..00000000000
--- a/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
+++ /dev/null
@@ -1,4 +0,0 @@
-let SEARCH_PATTERN=the secret file has incorrect length;
-source filekeys_badtest.inc;
-
---echo # Test checks if opening an too large secret does not crash the server.