diff options
author | unknown <gluh@mysql.com> | 2005-09-12 20:49:48 +0500 |
---|---|---|
committer | unknown <gluh@mysql.com> | 2005-09-12 20:49:48 +0500 |
commit | 17233698fcf91f482419ece675f2d747fae9f501 (patch) | |
tree | dcd41fb19e884d78d0343f201864d83f6499d1a2 /mysql-test | |
parent | 49e734e67ce56b15f474e134ce085a8a42363ce7 (diff) | |
parent | 3ad213baca1fcdecd36b6a292d987cfe54f1e5e9 (diff) | |
download | mariadb-git-17233698fcf91f482419ece675f2d747fae9f501.tar.gz |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/innodb.result | 11 | ||||
-rw-r--r-- | mysql-test/t/innodb.test | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 858daacffe9..f47c78c9768 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1674,3 +1674,14 @@ select * from t1; a 42 drop table t1; +create table t1 (a int not null, b int not null, c blob not null, d int not null, e int, primary key (a,b,c(255),d)) engine=innodb; +insert into t1 values (2,2,"b",2,2),(1,1,"a",1,1),(3,3,"ab",3,3); +select * from t1 order by a,b,c,d; +a b c d e +1 1 a 1 1 +2 2 b 2 2 +3 3 ab 3 3 +explain select * from t1 order by a,b,c,d; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using filesort +drop table t1; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 33432209e65..a14370c6543 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1220,4 +1220,14 @@ insert into t1 values (42); select * from t1; drop table t1; +# +# Bug #13025 Server crash during filesort +# + +create table t1 (a int not null, b int not null, c blob not null, d int not null, e int, primary key (a,b,c(255),d)) engine=innodb; +insert into t1 values (2,2,"b",2,2),(1,1,"a",1,1),(3,3,"ab",3,3); +select * from t1 order by a,b,c,d; +explain select * from t1 order by a,b,c,d; +drop table t1; + # End of 4.1 tests |