diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 14:25:42 +0300 |
| commit | aeccbbd926e759a5c3b9818d9948a35918404478 (patch) | |
| tree | e3ee68a92d2c77f986979e1638169280ede35a96 /mysql-test/std_data | |
| parent | 75f7c5681c2592b50c26feff2371bd7ee973e535 (diff) | |
| parent | 4b4c2b8cc0da949895292121ed5ef3e0c2dbaae1 (diff) | |
| download | mariadb-git-aeccbbd926e759a5c3b9818d9948a35918404478.tar.gz | |
Merge 10.5 into 10.6
To prevent ASAN heap-use-after-poison in the MDEV-16549 part of
./mtr --repeat=6 main.derived
the initialization of Name_resolution_context was cleaned up.
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAD | bin | 0 -> 8192 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAI | bin | 0 -> 8192 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.frm | bin | 0 -> 923 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_innodb.frm (renamed from mysql-test/std_data/mdev-28727-pet4.frm) | bin | 934 -> 934 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYD | 0 | ||||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYI | bin | 0 -> 1024 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.frm | bin | 0 -> 925 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAD b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAD Binary files differnew file mode 100644 index 00000000000..3dcc005ec0d --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAD diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAI b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAI Binary files differnew file mode 100644 index 00000000000..d11da43bf2b --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAI diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.frm b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.frm Binary files differnew file mode 100644 index 00000000000..81d7672c405 --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.frm diff --git a/mysql-test/std_data/mdev-28727-pet4.frm b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_innodb.frm Binary files differindex 3ff86d1dca1..3ff86d1dca1 100644 --- a/mysql-test/std_data/mdev-28727-pet4.frm +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_innodb.frm diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYD b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYD new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYD diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYI b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYI Binary files differnew file mode 100644 index 00000000000..d36f27ac0cf --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYI diff --git a/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.frm b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.frm Binary files differnew file mode 100644 index 00000000000..afffafabbb1 --- /dev/null +++ b/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.frm |