Merge 10.10 into 10.11

2025-08-08 11:22:35 +03:00 · 2023-07-26 14:44:43 +03:00
parent 23d1092f8e b1b47264d2
commit bce3ee704f
146 changed files with 4385 additions and 2140 deletions
--- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result
+++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
@@ -3860,6 +3860,7 @@ ANALYZE
              "r_rows": 3,
              "r_table_time_ms": "REPLACED",
              "r_other_time_ms": "REPLACED",
+              "r_engine_stats": REPLACED,
              "filtered": 100,
              "r_filtered": 100
            }