diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /mysql-test/suite/archive/archive.result | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'mysql-test/suite/archive/archive.result')
| -rw-r--r-- | mysql-test/suite/archive/archive.result | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result index a491b5bb9ee..67bbd3eb5e6 100644 --- a/mysql-test/suite/archive/archive.result +++ b/mysql-test/suite/archive/archive.result @@ -12731,15 +12731,6 @@ id id name name DROP TABLE t1,t2; flush tables; SHOW CREATE TABLE t1; -ERROR HY000: Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it! -SELECT * FROM t1; -ERROR HY000: Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it! -INSERT INTO t1 (col1, col2) VALUES (1, "value"); -ERROR HY000: Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it! -REPAIR TABLE t1; -Table Op Msg_type Msg_text -test.t1 repair status OK -SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `col1` int(11) DEFAULT NULL, @@ -12747,6 +12738,10 @@ t1 CREATE TABLE `t1` ( ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 SELECT * FROM t1; col1 col2 +INSERT INTO t1 (col1, col2) VALUES (1, "value"); +REPAIR TABLE t1; +Table Op Msg_type Msg_text +test.t1 repair error Corrupt DROP TABLE t1; # # Ensure that TRUNCATE fails for non-empty archive tables. @@ -12811,6 +12806,14 @@ Table Op Msg_type Msg_text test.t1 optimize status OK DROP TABLE t1; # +# Bug#13907676: HA_ARCHIVE::INFO +# +CREATE TABLE t1 (a INT) ENGINE=ARCHIVE; +CREATE TABLE t2 SELECT * FROM t1; +SELECT * FROM t2; +a +DROP TABLE t1, t2; +# # BUG#917689 Using wrong archive table causes crash # create table t1 (a int, b char(50)) engine=archive; @@ -12821,7 +12824,6 @@ select * from t1; ERROR HY000: Table 't1' is marked as crashed and should be repaired show warnings; Level Code Message -Warning 127 Got error 127 when reading table `test`.`t1` Error 1194 Table 't1' is marked as crashed and should be repaired drop table t1; create temporary table t1 (a int) engine=archive; @@ -12835,7 +12837,7 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 +) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 alter table t1 add column b varchar(10); select * from t1; a b |