Merge 11.1 into 11.2

2025-08-08 11:22:35 +03:00 · 2023-07-26 15:49:24 +03:00
parent 742f960eeb c6ac1e39b6
commit e81fa34502
212 changed files with 4735 additions and 2471 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
            }