diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:42:22 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 11:55:28 +0100 |
| commit | 49a22c5897823c528d52886f6048d5b4c91e221f (patch) | |
| tree | 92eedca678276458a7c4e27f357acd12d4fdcbac /mysql-test/std_data | |
| parent | 8e6a64194b76a199b0bbf2edc9a4e9facda8da2c (diff) | |
| parent | ebf2121529fcf06971b4c0fc28f40654ef8dd99f (diff) | |
| download | mariadb-git-49a22c5897823c528d52886f6048d5b4c91e221f.tar.gz | |
Merge branch '10.9' into 10.10
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 |