diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-09-22 11:36:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-09-22 11:36:18 +0400 |
| commit | 0703c9ec1e95c6bd5612cfcbe5ea48de3a40a500 (patch) | |
| tree | 4b4eee1f04f1d8ea78ba46db4961e9f75174fa2b /plugin | |
| parent | a8e45404765db6bc6c57dab3cc834e92a44d0110 (diff) | |
| download | mariadb-git-0703c9ec1e95c6bd5612cfcbe5ea48de3a40a500.tar.gz | |
A cleanup for MDEV-29446 Change SHOW CREATE TABLE to display default collation
Recording test results according to MDEV-29446 changes:
plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result b/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result index c14e7cb7877..04ac22b9626 100644 --- a/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result +++ b/plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result @@ -15,7 +15,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `b` char(200) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=1 insert t1 values (12345, repeat('1234567890', 20)); alter table t1 encryption_key_id=2; show create table t1; @@ -23,7 +23,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `b` char(200) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2 alter table t1 encryption_key_id=33; ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID' show create table t1; @@ -31,19 +31,19 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `b` char(200) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2 alter table t1 encryption_key_id=3; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `b` char(200) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=3 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=3 alter table t1 encryption_key_id=4; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, `b` char(200) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=4 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=4 drop table t1; |