bk commit into 5.0 tree (timour:1.2025)

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2025 05/10/25 09:01:47 timour@stripped +3 -0
  Merge mysql.com:/home/timka/mysql/src/5.0-virgin
  into  mysql.com:/home/timka/mysql/src/5.0-bug-13832

  sql/sql_yacc.yy
    1.438 05/10/25 09:01:42 timour@stripped +0 -0
    Auto merged

  mysql-test/t/select.test
    1.88 05/10/25 09:01:42 timour@stripped +0 -0
    Auto merged

  mysql-test/r/select.result
    1.107 05/10/25 09:01:42 timour@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-bug-13832/RESYNC

--- 1.437/sql/sql_yacc.yy	2005-10-24 23:53:56 +03:00
+++ 1.438/sql/sql_yacc.yy	2005-10-25 09:01:42 +03:00
@@ -660,7 +660,7 @@
 %token  YEAR_SYM
 %token  ZEROFILL
 
-%left   JOIN_SYM
+%left   JOIN_SYM INNER_SYM STRAIGHT_JOIN CROSS LEFT RIGHT
 /* A dummy token to force the priority of table_ref production in a join. */
 %left   TABLE_REF_PRIORITY
 %left   SET_VAR
@@ -5227,14 +5227,22 @@
           }
         ;
 
+/*
+  Notice that JOIN is a left-associative operation, and it must be parsed
+  as such, that is, the parser must process first the left join operand
+  then the right one. Such order of processing ensures that the parser
+  produces correct join trees which is essential for semantic analysis
+  and subsequent optimization phases.
+*/
 join_table:
+/* INNER JOIN variants */
         /*
-          Evaluate production 'table_ref' before 'normal_join' so that
-          [INNER | CROSS] JOIN is properly nested as other left-associative
-          joins.
+          Use %prec to evaluate production 'table_ref' before 'normal_join'
+          so that [INNER | CROSS] JOIN is properly nested as other
+          left-associative joins.
         */
         table_ref %prec TABLE_REF_PRIORITY normal_join table_ref
-        { YYERROR_UNLESS($1 && ($$=$3)); }
+          { YYERROR_UNLESS($1 && ($$=$3)); }
 	| table_ref STRAIGHT_JOIN table_factor
 	  { YYERROR_UNLESS($1 && ($$=$3)); $3->straight=1; }
 	| table_ref normal_join table_ref
@@ -5276,6 +5284,13 @@
 	  }
 	  '(' using_list ')'
           { add_join_natural($1,$3,$7); $$=$3; }
+	| table_ref NATURAL JOIN_SYM table_factor
+	  {
+            YYERROR_UNLESS($1 && ($$=$4));
+            add_join_natural($1,$4,NULL);
+          }
+
+/* LEFT JOIN variants */
 	| table_ref LEFT opt_outer JOIN_SYM table_ref
           ON
           {
@@ -5307,6 +5322,8 @@
 	    $6->outer_join|=JOIN_TYPE_LEFT;
 	    $$=$6;
 	  }
+
+/* RIGHT JOIN variants */
 	| table_ref RIGHT opt_outer JOIN_SYM table_ref
           ON
           {
@@ -5344,10 +5361,7 @@
 	    LEX *lex= Lex;
             if (!($$= lex->current_select->convert_right_join()))
               YYABORT;
-	  }
-	| table_ref NATURAL JOIN_SYM table_factor
-	  { YYERROR_UNLESS($1 && ($$=$4)); add_join_natural($1,$4,NULL); };
-
+	  };
 
 normal_join:
 	JOIN_SYM		{}

--- 1.106/mysql-test/r/select.result	2005-10-21 04:01:30 +03:00
+++ 1.107/mysql-test/r/select.result	2005-10-25 09:01:42 +03:00
@@ -3181,3 +3181,15 @@
 count(*)
 6
 drop table t1,t2,t3;
+create table t1 (a int);
+create table t2 (b int);
+create table t3 (c int);
+select * from t1 join t2 join t3 on (t1.a=t3.c);
+a	b	c
+select * from t1 join t2 left join t3 on (t1.a=t3.c);
+a	b	c
+select * from t1 join t2 right join t3 on (t1.a=t3.c);
+a	b	c
+select * from t1 join t2 straight_join t3 on (t1.a=t3.c);
+a	b	c
+drop table t1, t2 ,t3;

--- 1.87/mysql-test/t/select.test	2005-10-21 04:01:30 +03:00
+++ 1.88/mysql-test/t/select.test	2005-10-25 09:01:42 +03:00
@@ -2688,3 +2688,17 @@
 from t1 inner join (t2 right join t3 on t2.id = t3.b_id) on t1.id = t3.a_id;
 
 drop table t1,t2,t3;
+
+#
+# Bug #13832 Incorrect parse order of join productions due to unspecified
+# operator priorities results in incorrect join tree.
+#
+
+create table t1 (a int);
+create table t2 (b int);
+create table t3 (c int);
+select * from t1 join t2 join t3 on (t1.a=t3.c);
+select * from t1 join t2 left join t3 on (t1.a=t3.c);
+select * from t1 join t2 right join t3 on (t1.a=t3.c);
+select * from t1 join t2 straight_join t3 on (t1.a=t3.c);
+drop table t1, t2 ,t3;