diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 17:25:10 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 17:25:10 +0200 |
commit | f89e6c442cea2d6f220afe55284520ce26362729 (patch) | |
tree | 536457f5bb185eed23aaa113a6ba727c0fb369f7 /mysql-test/std_data | |
parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
download | mariadb-git-f89e6c442cea2d6f220afe55284520ce26362729.tar.gz |
MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB release
Don't fail when an frm is inconsistent (legacy DB_TYPE_xxx code doesn't match the
engine name), use the engine name, ignore the legacy code.
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/mdev5029_1.frm (renamed from mysql-test/std_data/mdev5029.frm) | bin | 8602 -> 8602 bytes |
-rw-r--r-- | mysql-test/std_data/mdev5029_2.MAD | bin | 0 -> 8192 bytes |
-rw-r--r-- | mysql-test/std_data/mdev5029_2.MAI | bin | 0 -> 8192 bytes |
-rw-r--r-- | mysql-test/std_data/mdev5029_2.frm | bin | 0 -> 8602 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/mdev5029.frm b/mysql-test/std_data/mdev5029_1.frm Binary files differindex de169a20953..de169a20953 100644 --- a/mysql-test/std_data/mdev5029.frm +++ b/mysql-test/std_data/mdev5029_1.frm diff --git a/mysql-test/std_data/mdev5029_2.MAD b/mysql-test/std_data/mdev5029_2.MAD Binary files differnew file mode 100644 index 00000000000..3dcc005ec0d --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.MAD diff --git a/mysql-test/std_data/mdev5029_2.MAI b/mysql-test/std_data/mdev5029_2.MAI Binary files differnew file mode 100644 index 00000000000..3533a1d705a --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.MAI diff --git a/mysql-test/std_data/mdev5029_2.frm b/mysql-test/std_data/mdev5029_2.frm Binary files differnew file mode 100644 index 00000000000..d7eb677fea7 --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.frm |