summaryrefslogtreecommitdiff
path: root/mysql-test/r/archive.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
committerSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
commit0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
treebdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/r/archive.result
parent37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
downloadmariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz
lots of post-merge changes
Diffstat (limited to 'mysql-test/r/archive.result')
-rw-r--r--mysql-test/r/archive.result12
1 files changed, 2 insertions, 10 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index 55776565f78..0983e9fa8cf 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -12736,7 +12736,8 @@ 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
+test.t1 repair Error Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it!
+test.t1 repair status Table is already up to date
DROP TABLE t1;
#
# BUG#48757 - missing .ARZ file causes server crash
@@ -12800,12 +12801,3 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
DROP TABLE t1;
-select * from t1;
-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
-select sum(length(a)),sum(b) from t1;
-sum(length(a)) sum(b)
-8670 187
-drop table t1;