Merge branch '10.11' into 11.4

2025-08-08 11:22:35 +03:00 · 2025-06-17 09:50:22 +02:00
parent 9bf0492b7d 11d1ac7285
commit 89c7e2b9c7
196 changed files with 4543 additions and 1172 deletions
--- a/mysql-test/main/opt_trace_security.result
+++ b/mysql-test/main/opt_trace_security.result
@@ -148,12 +148,6 @@ select * from db1.t1	{
          }
        ]
      }
-    },
-    {
-      "join_execution": {
-        "select_id": 1,
-        "steps": []
-      }
    }
  ]
 }	0	0
@@ -290,12 +284,6 @@ select * from db1.v1	{
          }
        ]
      }
-    },
-    {
-      "join_execution": {
-        "select_id": 1,
-        "steps": []
-      }
    }
  ]
 }	0	0