diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-09-04 09:55:59 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-09-04 10:19:58 +0400 |
commit | 7e08ac0b41b50195aa79f6ac185bc69a91a960ca (patch) | |
tree | 3a399827dc8e6bd89bbb6d142f21eda8bd659119 /mysql-test/std_data | |
parent | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (diff) | |
parent | ef00ac4c86daf3294c46a45358da636763fb0049 (diff) | |
download | mariadb-git-7e08ac0b41b50195aa79f6ac185bc69a91a960ca.tar.gz |
Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3
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 |