Merge 11.0 into 11.1

2025-08-07 00:04:31 +03:00 · 2023-07-26 15:13:43 +03:00
parent 26b96094ec f2b4972bd4
commit c6ac1e39b6
214 changed files with 5163 additions and 2783 deletions
--- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result
+++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
@@ -3899,6 +3899,7 @@ ANALYZE
              "cost": "REPLACED",
              "r_table_time_ms": "REPLACED",
              "r_other_time_ms": "REPLACED",
+              "r_engine_stats": REPLACED,
              "filtered": 100,
              "r_filtered": 100
            }