diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
| commit | 142a162c665704ce5b4d5b671d05a068661c088a (patch) | |
| tree | def1ebab09889a8f09a9fcd074c8a672689376af /mysql-test/r/archive.result | |
| parent | cbf4019a1b3ec82bdcd9a65db114908a920fb01c (diff) | |
| parent | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (diff) | |
| download | mariadb-git-142a162c665704ce5b4d5b671d05a068661c088a.tar.gz | |
manual merge from mysql-trunk-bugfixing
Conflicts:
Text conflict in mysql-test/r/archive.result
Contents conflict in mysql-test/r/innodb_bug38231.result
Text conflict in mysql-test/r/mdl_sync.result
Text conflict in mysql-test/suite/binlog/t/disabled.def
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
Text conflict in mysql-test/t/archive.test
Contents conflict in mysql-test/t/innodb_bug38231.test
Text conflict in mysql-test/t/mdl_sync.test
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_show.cc
Text conflict in sql/table.cc
Text conflict in sql/table.h
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index ea6311a721b..685e1e5ba4b 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -12756,3 +12756,22 @@ INSERT INTO t1 VALUES (1); TRUNCATE TABLE t1; ERROR HY000: Table storage engine for 't1' doesn't have this option DROP TABLE t1; +# +# BUG#46565 - repair of partition fail for archive engine +# +# Installing corrupted table files for t1. +SELECT * FROM t1; +ERROR HY000: Table 't1' is marked as crashed and should be repaired +REPAIR TABLE t1; +Table Op Msg_type Msg_text +test.t1 repair error Corrupt +SELECT * FROM t1; +ERROR HY000: Table 't1' is marked as crashed and should be repaired +REPAIR TABLE t1 EXTENDED; +Table Op Msg_type Msg_text +test.t1 repair status OK +SELECT * FROM t1; +a +1 +2 +DROP TABLE t1; |