diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
| commit | 4081b7b27a40df6244e0525885cf70e48b7b35bc (patch) | |
| tree | e9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/std_data | |
| parent | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff) | |
| parent | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff) | |
| download | mariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYD | bin | 0 -> 60 bytes |
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYI | bin | 0 -> 1024 bytes |
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.frm | bin | 0 -> 483 bytes |
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYD | bin | 0 -> 60 bytes |
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYI | bin | 0 -> 2048 bytes |
| -rw-r--r-- | mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.frm | bin | 0 -> 972 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYD b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYD Binary files differnew file mode 100644 index 00000000000..3b511e3b8fa --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYD diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYI b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYI Binary files differnew file mode 100644 index 00000000000..b039d02f2e0 --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.MYI diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.frm b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.frm Binary files differnew file mode 100644 index 00000000000..85f142070e9 --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_stored.frm diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYD b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYD Binary files differnew file mode 100644 index 00000000000..e770e42b6bf --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYD diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYI b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYI Binary files differnew file mode 100644 index 00000000000..aff7d10ce18 --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.MYI diff --git a/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.frm b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.frm Binary files differnew file mode 100644 index 00000000000..d7258bc4af3 --- /dev/null +++ b/mysql-test/std_data/vcol_upgrade/maria100226_char_to_vchar_virtual.frm |