diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
| commit | 2fe0836eed16ce5809c34064893681f12c77da9f (patch) | |
| tree | 441c1eb870dadd4659e6b63e9fd48aecbafbdb7f /mysql-test | |
| parent | 4232874772c7fb041247614790f1b22740ddfb7f (diff) | |
| parent | 28ec372744e6dbeab9ecae7a3a9a7ef23b0866d5 (diff) | |
| download | mariadb-git-2fe0836eed16ce5809c34064893681f12c77da9f.tar.gz | |
5.5.33a merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/bad_frm_crash_5029.result | 11 | ||||
| -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 | |||
| -rw-r--r-- | mysql-test/t/bad_frm_crash_5029.test | 11 |
6 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/r/bad_frm_crash_5029.result b/mysql-test/r/bad_frm_crash_5029.result index 7a829c8f6ba..8aa0065f5ee 100644 --- a/mysql-test/r/bad_frm_crash_5029.result +++ b/mysql-test/r/bad_frm_crash_5029.result @@ -1,2 +1,13 @@ show create table t1; ERROR 42000: Unknown storage engine 'InnoDB' +call mtr.add_suppression("t1.frm is inconsistent: engine typecode 43, engine name Aria"); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL, + `c` int(11) DEFAULT NULL, + KEY `a` (`a`), + KEY `b` (`b`) +) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +drop table t1; 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 diff --git a/mysql-test/t/bad_frm_crash_5029.test b/mysql-test/t/bad_frm_crash_5029.test index b15c37fbc6d..858922886ab 100644 --- a/mysql-test/t/bad_frm_crash_5029.test +++ b/mysql-test/t/bad_frm_crash_5029.test @@ -4,8 +4,17 @@ # a.k.a. fail to open an frm with indexes: let $datadir=`select @@datadir`; -copy_file std_data/mdev5029.frm $datadir/test/t1.frm; + +# normal innodb table (but innodb is disabled here) +copy_file std_data/mdev5029_1.frm $datadir/test/t1.frm; --error ER_UNKNOWN_STORAGE_ENGINE show create table t1; remove_file $datadir/test/t1.frm; +# Aria table, incorrect typecode +call mtr.add_suppression("t1.frm is inconsistent: engine typecode 43, engine name Aria"); +copy_file std_data/mdev5029_2.frm $datadir/test/t1.frm; +copy_file std_data/mdev5029_2.MAI $datadir/test/t1.MAI; +copy_file std_data/mdev5029_2.MAD $datadir/test/t1.MAD; +show create table t1; +drop table t1; |