summaryrefslogtreecommitdiff
path: root/mysql-test/suite/plugins
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:47:56 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 10:47:56 +0200
commit1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c (patch)
tree6adddccee0d76b14e2821e6b4263a6dfcf6ccde6 /mysql-test/suite/plugins
parentab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff)
parent3386b309756adba6b9633ad18c4e0575c7304cfe (diff)
downloadmariadb-git-1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c.tar.gz
Merge 10.6 into 10.7
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"
},
-
{
}
],