summaryrefslogtreecommitdiff
path: root/mysql-test/suite/plugins
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 12:22:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 12:22:30 +0200
commitbb3a63903e5192d39d93259ce2bb7635fcfca7a0 (patch)
tree87b168ee8c77bd35a33390f16f1f324f796d6bc2 /mysql-test/suite/plugins
parentf879ee9ca0d87d3574cb80f2259168cb7d01cbaa (diff)
parent6ffe9ad0d4244a86476fab1485145c0c91871579 (diff)
downloadmariadb-git-bb3a63903e5192d39d93259ce2bb7635fcfca7a0.tar.gz
Merge 10.10 into 10.11
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 a3a9d238a00..e506e3f80c1 100644
--- a/mysql-test/suite/plugins/r/multiauth.result
+++ b/mysql-test/suite/plugins/r/multiauth.result
@@ -122,16 +122,13 @@ json_detailed(priv)
"authentication_string": "*7D8C3DF236D9163B6C274A9D47704BC496988460",
"auth_or":
[
-
{
"plugin": "ed25519",
"authentication_string": "F4aF8bw7130VaRbdLCl4f/P/wkjDmgJXwWvpJ5gmsZc"
},
-
{
"plugin": "unix_socket"
},
-
{
}
],