summaryrefslogtreecommitdiff
path: root/mysql-test/suite/plugins
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
commit7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch)
tree652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/plugins
parentb73c70c265cab9bae2fd5c243b484172bec0a91d (diff)
parent789f55c947a8aa224e5b0a71d5c0bea375320091 (diff)
downloadmariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/plugins')
-rw-r--r--mysql-test/suite/plugins/r/password_reuse_check.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/plugins/r/password_reuse_check.result b/mysql-test/suite/plugins/r/password_reuse_check.result
index a1d68066e3c..72f3dd5364b 100644
--- a/mysql-test/suite/plugins/r/password_reuse_check.result
+++ b/mysql-test/suite/plugins/r/password_reuse_check.result
@@ -45,7 +45,7 @@ password_reuse_check_history CREATE TABLE `password_reuse_check_history` (
`time` timestamp NOT NULL DEFAULT current_timestamp(),
PRIMARY KEY (`hash`),
KEY `tm` (`time`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
select count(*) from mysql.password_reuse_check_history;
count(*)
1