summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authoracurtis/antony@ltamd64.xiphis.org <>2006-12-26 12:33:21 -0800
committeracurtis/antony@ltamd64.xiphis.org <>2006-12-26 12:33:21 -0800
commit54133c7e38a14847b5d2efe2e553c9affe846cd5 (patch)
treec404e0b5b76f15a67987df869260f7a0aba1dcaf /mysql-test/include
parentbe15e3bc15921085ea558f8764ed1fad137ccaa1 (diff)
parent28d3ee656df4d97bee8b3cf1554bef3120cdc8a4 (diff)
downloadmariadb-git-54133c7e38a14847b5d2efe2e553c9affe846cd5.tar.gz
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/index_merge_ror.inc15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge_ror.inc b/mysql-test/include/index_merge_ror.inc
index b9f5c7b95da..2764cbea468 100644
--- a/mysql-test/include/index_merge_ror.inc
+++ b/mysql-test/include/index_merge_ror.inc
@@ -272,3 +272,18 @@ select count(a) from t2 ignore index(a,b) where a='AAAAAAAA' and b='AAAAAAAA';
insert into t2 values ('ab', 'ab', 'uh', 'oh');
explain select a from t2 where a='ab';
drop table t2;
+
+#
+# BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to
+# repair it
+#
+CREATE TABLE t1(c1 INT, c2 INT DEFAULT 0, c3 CHAR(255) DEFAULT '',
+KEY(c1), KEY(c2), KEY(c3));
+INSERT INTO t1(c1) VALUES(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0),(0);
+INSERT INTO t1 VALUES(0,0,0);
+CREATE TABLE t2(c1 int);
+INSERT INTO t2 VALUES(1);
+DELETE t1 FROM t1,t2 WHERE t1.c1=0 AND t1.c2=0;
+SELECT * FROM t1;
+DROP TABLE t1,t2;