database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

5.5.33a merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-09-20 11:29:01 +02:00
parent 4232874772 28ec372744
commit 2fe0836eed
13 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/bad_frm_crash_5029.result
View File

@ -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;

0
mysql-test/std_data/mdev5029.frm → mysql-test/std_data/mdev5029_1.frm
View File

BIN
mysql-test/std_data/mdev5029_2.MAD Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/mdev5029_2.MAI Normal file
View File

Binary file not shown.

BIN
mysql-test/std_data/mdev5029_2.frm Normal file
View File

Binary file not shown.

11
mysql-test/t/bad_frm_crash_5029.test
View File

@ -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;