summaryrefslogtreecommitdiff
path: root/mysql-test/suite/archive/archive.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 16:18:33 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 16:18:33 +0200
commit02c712aa546df8d6e9c285e6adc95309925673e3 (patch)
tree8d6654dac2666dcd738db1f10dbd919610087795 /mysql-test/suite/archive/archive.result
parentf6168bb67bb5cab0584809c876c674a92051b5d1 (diff)
downloadmariadb-git-02c712aa546df8d6e9c285e6adc95309925673e3.tar.gz
* frm extra2 segment.
* persistent table versions in the extra2 * ha_archive::frm_compare using TABLE_SHARE::tabledef_version * distinguish between "important" and "optional" extra2 frm values * write engine-defined attributes (aka "table options") to extra2, not to extra, but still read from the old location, if they're found there.
Diffstat (limited to 'mysql-test/suite/archive/archive.result')
-rw-r--r--mysql-test/suite/archive/archive.result9
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result
index 287c2991c1d..a170cdfbd8c 100644
--- a/mysql-test/suite/archive/archive.result
+++ b/mysql-test/suite/archive/archive.result
@@ -12701,12 +12701,12 @@ CREATE TABLE t1(a INT, b BLOB) ENGINE=archive;
SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
DATA_LENGTH AVG_ROW_LENGTH
-535 15
+550 15
INSERT INTO t1 VALUES(1, 'sampleblob1'),(2, 'sampleblob2');
SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
DATA_LENGTH AVG_ROW_LENGTH
-569 284
+584 292
DROP TABLE t1;
SET @save_join_buffer_size= @@join_buffer_size;
SET @@join_buffer_size= 8192;
@@ -12818,10 +12818,11 @@ select * from t1;
a b
flush tables;
select * from t1;
-a b
-1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+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;
insert t1 values (1),(2),(3);