MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexey Kopytov Date:February 25 2010 4:26pm
Subject:bzr commit into mysql-5.1-bugteam branch (Alexey.Kopytov:3356)
View as plain text  
#At file:///data/src/bzr/bugteam/mysql-5.1-bugteam/ based on revid:joro@stripped

 3356 Alexey Kopytov	2010-02-25 [merge]
      Automerge.

    modified:
      mysql-test/r/join.result
      mysql-test/t/join.test
      sql/sql_select.cc
=== modified file 'mysql-test/r/join.result'
--- a/mysql-test/r/join.result	2010-02-10 14:56:47 +0000
+++ b/mysql-test/r/join.result	2010-02-25 15:48:53 +0000
@@ -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

=== modified file 'mysql-test/t/join.test'
--- a/mysql-test/t/join.test	2010-02-10 14:56:47 +0000
+++ b/mysql-test/t/join.test	2010-02-25 15:48:53 +0000
@@ -816,3 +816,16 @@ CREATE TABLE mm1(a CHAR(9),b INT,KEY(b),
 ENGINE=MERGE  UNION=(t1,t2);
 SELECT t1.a FROM mm1,t1;
 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

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-02-16 09:13:49 +0000
+++ b/sql/sql_select.cc	2010-02-25 15:48:53 +0000
@@ -7028,9 +7028,11 @@ eq_ref_table(JOIN *join, ORDER *start_or
       }
       if (order)
       {
-	found++;
-	DBUG_ASSERT(!(order->used & map));
-	order->used|=map;
+        if (!(order->used & map))
+        {
+          found++;
+          order->used|= map;
+        }
 	continue;				// Used in ORDER BY
       }
       if (!only_eq_ref_tables(join,start_order, (*ref_item)->used_tables()))


Attachment: [text/bzr-bundle] bzr/alexey.kopytov@sun.com-20100225162630-c9av8dkhy9mausyw.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (Alexey.Kopytov:3356)Alexey Kopytov25 Feb