Merge 10.6 into 10.7

2025-08-07 00:04:31 +03:00 · 2023-01-13 10:47:56 +02:00
parent ab36eac584 3386b30975
commit 1e04cafcba
85 changed files with 1855 additions and 635 deletions
--- 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"
        },
-        
        {
        }
    ],