Merge 10.4 into 10.5

2026-05-15 19:37:16 +02:00 · 2022-12-13 14:39:18 +02:00 · 2022-12-13 14:39:18 +02:00 · 1dc2f35598
commit 1dc2f35598
parent da5d349935 fdf43b5c78
179 changed files with 1889 additions and 475 deletions
--- a/mysql-test/std_data/mysql80/ibdata1_16384
+++ b/mysql-test/std_data/mysql80/ibdata1_16384
--- a/mysql-test/std_data/mysql80/ibdata1_32768
+++ b/mysql-test/std_data/mysql80/ibdata1_32768
--- a/mysql-test/std_data/mysql80/ibdata1_4096
+++ b/mysql-test/std_data/mysql80/ibdata1_4096
--- a/mysql-test/std_data/mysql80/ibdata1_65536
+++ b/mysql-test/std_data/mysql80/ibdata1_65536
--- a/mysql-test/std_data/mysql80/ibdata1_8192
+++ b/mysql-test/std_data/mysql80/ibdata1_8192
--- a/mysql-test/std_data/mysql80/t1.ibd
+++ b/mysql-test/std_data/mysql80/t1.ibd
--- a/mysql-test/std_data/vcol_autoinc.MYI
+++ b/mysql-test/std_data/vcol_autoinc.MYI
--- a/mysql-test/std_data/vcol_autoinc.frm
+++ b/mysql-test/std_data/vcol_autoinc.frm