diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
commit | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (patch) | |
tree | d57dcac492c1a0c330c28bcf82a1d33db6111e5b /mysql-test/r/join.result | |
parent | a7dd42b57db41efc174b640f20bf9aff02f88415 (diff) | |
parent | 03561d35e30807e841c8544a6f5c07d708c6acbd (diff) | |
download | mariadb-git-84766b060a09ae3709fcd17cadc16c982c0d3a78.tar.gz |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
Diffstat (limited to 'mysql-test/r/join.result')
-rw-r--r-- | mysql-test/r/join.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 22218861ebc..d1234ecbd56 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -1145,3 +1145,14 @@ NULL NULL 1 DROP TABLE t1, t2, mm1; +# +# Bug #50335: Assertion `!(order->used & map)' in eq_ref_table +# +CREATE TABLE t1 (a INT NOT NULL, b INT NOT NULL, PRIMARY KEY (a,b)); +INSERT INTO t1 VALUES (0,0), (1,1); +SELECT * FROM t1 STRAIGHT_JOIN t1 t2 ON t1.a=t2.a AND t1.a=t2.b ORDER BY t2.a, t1.a; +a b a b +0 0 0 0 +1 1 1 1 +DROP TABLE t1; +End of 5.1 tests |