summaryrefslogtreecommitdiff
path: root/mysql-test/suite/plugins
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:18:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:18:30 +0200
commit73ecab3d26c055928673a2629f4513aa7008dbf0 (patch)
treeb04760b3369cd1d8fc03c7dec204f5a371335b29 /mysql-test/suite/plugins
parent7d1df207c4ded0ac8aa61f0d35bcae7eda974c54 (diff)
parent71e8e4934db06c02db1b51716e9d4b3992505161 (diff)
downloadmariadb-git-73ecab3d26c055928673a2629f4513aa7008dbf0.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/plugins')
-rw-r--r--mysql-test/suite/plugins/r/multiauth.result3
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/plugins/r/multiauth.result b/mysql-test/suite/plugins/r/multiauth.result
index 73241619008..d1ecd600d84 100644
--- a/mysql-test/suite/plugins/r/multiauth.result
+++ b/mysql-test/suite/plugins/r/multiauth.result
@@ -111,16 +111,13 @@ json_detailed(priv)
"authentication_string": "*7D8C3DF236D9163B6C274A9D47704BC496988460",
"auth_or":
[
-
{
"plugin": "ed25519",
"authentication_string": "F4aF8bw7130VaRbdLCl4f/P/wkjDmgJXwWvpJ5gmsZc"
},
-
{
"plugin": "unix_socket"
},
-
{
}
],