diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 16:58:58 +0200 |
commit | a8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch) | |
tree | f619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /mysql-test/std_data | |
parent | 04efe13501246e490932d4be7bca90e207e0b5e2 (diff) | |
parent | 1dc2f35598193fc52b79061c286b61f01c617374 (diff) | |
download | mariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/mysql80/ibdata1_16384 | bin | 0 -> 16384 bytes |
-rw-r--r-- | mysql-test/std_data/mysql80/ibdata1_32768 | bin | 0 -> 32768 bytes |
-rw-r--r-- | mysql-test/std_data/mysql80/ibdata1_4096 | bin | 0 -> 4096 bytes |
-rw-r--r-- | mysql-test/std_data/mysql80/ibdata1_65536 | bin | 0 -> 65536 bytes |
-rw-r--r-- | mysql-test/std_data/mysql80/ibdata1_8192 | bin | 0 -> 8192 bytes |
-rw-r--r-- | mysql-test/std_data/mysql80/t1.ibd | bin | 0 -> 16384 bytes |
-rw-r--r-- | mysql-test/std_data/vcol_autoinc.MYI | bin | 1024 -> 1024 bytes |
-rw-r--r-- | mysql-test/std_data/vcol_autoinc.frm | bin | 951 -> 8587 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/mysql80/ibdata1_16384 b/mysql-test/std_data/mysql80/ibdata1_16384 Binary files differnew file mode 100644 index 00000000000..7eeea4fdaf1 --- /dev/null +++ b/mysql-test/std_data/mysql80/ibdata1_16384 diff --git a/mysql-test/std_data/mysql80/ibdata1_32768 b/mysql-test/std_data/mysql80/ibdata1_32768 Binary files differnew file mode 100644 index 00000000000..ebcaef08d39 --- /dev/null +++ b/mysql-test/std_data/mysql80/ibdata1_32768 diff --git a/mysql-test/std_data/mysql80/ibdata1_4096 b/mysql-test/std_data/mysql80/ibdata1_4096 Binary files differnew file mode 100644 index 00000000000..67834106f48 --- /dev/null +++ b/mysql-test/std_data/mysql80/ibdata1_4096 diff --git a/mysql-test/std_data/mysql80/ibdata1_65536 b/mysql-test/std_data/mysql80/ibdata1_65536 Binary files differnew file mode 100644 index 00000000000..3d3d3043b4c --- /dev/null +++ b/mysql-test/std_data/mysql80/ibdata1_65536 diff --git a/mysql-test/std_data/mysql80/ibdata1_8192 b/mysql-test/std_data/mysql80/ibdata1_8192 Binary files differnew file mode 100644 index 00000000000..5082eff5ee2 --- /dev/null +++ b/mysql-test/std_data/mysql80/ibdata1_8192 diff --git a/mysql-test/std_data/mysql80/t1.ibd b/mysql-test/std_data/mysql80/t1.ibd Binary files differnew file mode 100644 index 00000000000..5cfd9b54496 --- /dev/null +++ b/mysql-test/std_data/mysql80/t1.ibd diff --git a/mysql-test/std_data/vcol_autoinc.MYI b/mysql-test/std_data/vcol_autoinc.MYI Binary files differindex ddb3f2e0748..9b174844f9f 100644 --- a/mysql-test/std_data/vcol_autoinc.MYI +++ b/mysql-test/std_data/vcol_autoinc.MYI diff --git a/mysql-test/std_data/vcol_autoinc.frm b/mysql-test/std_data/vcol_autoinc.frm Binary files differindex bff7983735c..ee43f878856 100644 --- a/mysql-test/std_data/vcol_autoinc.frm +++ b/mysql-test/std_data/vcol_autoinc.frm |