database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automerge.

Browse Source
This commit is contained in:
Alexey Kopytov
2010-02-25 19:26:30 +03:00
parent 6b6c2635d5 9201bff16b
commit 1935327e74
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/join.result
View File

@ -1145,3 +1145,14 @@ NULL
NULL NULL
1 1
DROP TABLE t1, t2, mm1; 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

13
mysql-test/t/join.test
View File

@ -816,3 +816,16 @@ CREATE TABLE mm1(a CHAR(9),b INT,KEY(b),KEY(a))
ENGINE=MERGE UNION=(t1,t2); ENGINE=MERGE UNION=(t1,t2);
SELECT t1.a FROM mm1,t1; SELECT t1.a FROM mm1,t1;
DROP TABLE t1, t2, mm1; DROP TABLE t1, t2, mm1;
--echo #
--echo # Bug #50335: Assertion `!(order->used & map)' in eq_ref_table
--echo #
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;
DROP TABLE t1;
--echo End of 5.1 tests

8
sql/sql_select.cc
View File

@ -7028,9 +7028,11 @@ eq_ref_table(JOIN *join, ORDER *start_order, JOIN_TAB *tab)
} }
if (order) if (order)
{ {
found++; if (!(order->used & map))
DBUG_ASSERT(!(order->used & map)); {
order->used|=map; found++;
order->used|= map;
}
continue; // Used in ORDER BY continue; // Used in ORDER BY
} }
if (!only_eq_ref_tables(join,start_order, (*ref_item)->used_tables())) if (!only_eq_ref_tables(join,start_order, (*ref_item)->used_tables()))