Merge 10.6 into 10.9

2026-01-06 05:22:24 +03:00 · 2023-07-26 13:42:23 +03:00
parent b9c7da4c91 b102872ad5
commit 864bbd4d09
53 changed files with 767 additions and 193 deletions
--- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result
+++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
@@ -3857,6 +3857,7 @@ ANALYZE
              "r_rows": 3,
              "r_table_time_ms": "REPLACED",
              "r_other_time_ms": "REPLACED",
+              "r_engine_stats": REPLACED,
              "filtered": 100,
              "r_filtered": 100
            }