bk commit into 5.0 tree (gkodinov:1.2130) BUG#14654

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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.2130 06/06/07 14:08:02 gkodinov@stripped +3 -0
  Bug#14654 : Cannot select from the same table twice within a UNION statement
    
    Made the parser to support parenthesis around UNION branches.
    This is done by amending the rules of the parser so it generates the correct
    structure.
    Currently it supports arbitrary subquery/join/parenthesis operations in the 
    EXISTS clause. 
    In the IN/scalar subquery case it will allow adding nested parenthesis only 
    if there is an UNION clause after the parenthesis. Otherwise it will just  
    treat the multiple nested parenthesis as a scalar expression.

  sql/sql_yacc.yy
    1.470 06/06/07 14:07:56 gkodinov@stripped +60 -70
    shuffle around the rules for the parenthesis in subselect

  mysql-test/t/subselect2.test
    1.7 06/06/07 14:07:56 gkodinov@stripped +18 -0
    Test suite for the bug

  mysql-test/r/subselect2.result
    1.13 06/06/07 14:07:56 gkodinov@stripped +13 -0
    Test suite for the bug

# 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:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/5.0/B14654

--- 1.469/sql/sql_yacc.yy	2006-05-14 23:51:02 +03:00
+++ 1.470/sql/sql_yacc.yy	2006-06-07 14:07:56 +03:00
@@ -707,7 +707,7 @@
         delete_option opt_temporary all_or_any opt_distinct
         opt_ignore_leaves fulltext_options spatial_type union_option
         start_transaction_opts opt_chain opt_release
-        union_opt select_derived_init option_type2
+        union_opt select_derived_init option_type2 scalar_comp_subselect_union
 
 %type <ulong_num>
 	ulong_num raid_types merge_insert_types
@@ -725,8 +725,7 @@
 	predicate bit_expr bit_term bit_factor value_expr term factor
 	table_wild simple_expr udf_expr
 	expr_or_default set_expr_or_default interval_expr
-	param_marker singlerow_subselect singlerow_subselect_init
-	exists_subselect exists_subselect_init geometry_function
+	param_marker geometry_function
 	signed_literal now_or_signed_literal opt_escape
 	sp_opt_default
 	simple_ident_nospvar simple_ident_q
@@ -791,8 +790,8 @@
 
 %type <variable> internal_variable_name
 
-%type <select_lex> in_subselect in_subselect_init
-	get_select_lex
+%type <select_lex> subselect subselect_init
+	get_select_lex scalar_comp_subselect
 
 %type <boolfunc2creator> comp_op
 
@@ -3870,12 +3869,14 @@
 	      yyerror(ER(ER_SYNTAX_ERROR));
 	      YYABORT;
 	    }
-	  if (sel->linkage == UNION_TYPE &&
-	      !sel->master_unit()->first_select()->braces)
-	  {
-	    yyerror(ER(ER_SYNTAX_ERROR));
-	    YYABORT;
-	  }
+            if (sel->linkage == UNION_TYPE &&
+                !sel->master_unit()->first_select()->braces &&
+                sel->master_unit()->first_select()->linkage ==
+                UNION_TYPE)
+            {
+              yyerror(ER(ER_SYNTAX_ERROR));
+              YYABORT;
+            }
             /* select in braces, can't contain global parameters */
 	    if (sel->master_unit()->fake_select_lex)
               sel->master_unit()->global_parameters=
@@ -4122,37 +4123,37 @@
 	| bool_pri EQUAL_SYM predicate	{ $$= new Item_func_equal($1,$3); }
 	| bool_pri comp_op predicate %prec EQ
 	  { $$= (*$2)(0)->create($1,$3); }
-	| bool_pri comp_op all_or_any in_subselect %prec EQ
-	  { $$= all_any_subquery_creator($1, $2, $3, $4); }
+	| bool_pri comp_op all_or_any '(' subselect ')' %prec EQ
+	  { $$= all_any_subquery_creator($1, $2, $3, $5); }
 	| predicate ;
 
 predicate:
-	 bit_expr IN_SYM '(' expr_list ')'
+        bit_expr IN_SYM '(' scalar_comp_subselect ')'
+	  { $$= new Item_in_subselect($1, $4); }
+	| bit_expr not IN_SYM '(' scalar_comp_subselect ')'
+          { $$= negate_expression(YYTHD, new Item_in_subselect($1, $5)); }
+        | bit_expr IN_SYM '(' expr ')'
+          {
+              $$= new Item_func_eq($1, $4);
+          }
+	| bit_expr IN_SYM '(' expr ',' expr_list ')'
 	  { 
-            if ($4->elements == 1)
-              $$= new Item_func_eq($1, $4->head());
-            else
-            {
-              $4->push_front($1);
-              $$= new Item_func_in(*$4);
-            }
+              $6->push_front($4);
+              $6->push_front($1);
+              $$= new Item_func_in(*$6);
           }
-	| bit_expr not IN_SYM '(' expr_list ')'
+        | bit_expr not IN_SYM '(' expr ')'
           {
-            if ($5->elements == 1)
-              $$= new Item_func_ne($1, $5->head());
-            else
-            {
-              $5->push_front($1);
-              Item_func_in *item = new Item_func_in(*$5);
+              $$= new Item_func_ne($1, $5);
+          }
+	| bit_expr not IN_SYM '(' expr ',' expr_list ')'
+          {
+              $7->push_front($5);
+              $7->push_front($1);
+              Item_func_in *item = new Item_func_in(*$7);
               item->negate();
               $$= item;
-            }            
           }
-        | bit_expr IN_SYM in_subselect
-	  { $$= new Item_in_subselect($1, $3); }
-	| bit_expr not IN_SYM in_subselect
-          { $$= negate_expression(YYTHD, new Item_in_subselect($1, $4)); }
 	| bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
 	  { $$= new Item_func_between($1,$3,$5); }
 	| bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate
@@ -4285,8 +4286,14 @@
 	    $5->push_front($3);
 	    $$= new Item_row(*$5);
 	  }
-	| EXISTS exists_subselect { $$= $2; }
-	| singlerow_subselect   { $$= $1; }
+	| EXISTS '(' subselect ')' 
+          {
+            $$= new Item_exists_subselect($3); 
+          }
+	| '(' scalar_comp_subselect ')'   
+          { 
+            $$= new Item_singlerow_subselect($2); 
+          }
 	| '{' ident expr '}'	{ $$= $3; }
         | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
           { $2->push_front($5);
@@ -8811,49 +8818,33 @@
 	| ALL       { $$=0; }
         ;
 
-singlerow_subselect:
-	subselect_start singlerow_subselect_init
-	subselect_end
-	{
-	  $$= $2;
-	};
-
-singlerow_subselect_init:
-	select_init2
-	{
-	  $$= new Item_singlerow_subselect(Lex->current_select->
-					   master_unit()->first_select());
-	};
-
-exists_subselect:
-	subselect_start exists_subselect_init
-	subselect_end
-	{
-	  $$= $2;
-	};
+subselect:
+        subselect_start subselect_init subselect_end
+        {
+          $$= $2;
+        } 
+        | '(' subselect ')' union_opt { $$= $2; };
 
-exists_subselect_init:
-	select_init2
-	{
-	  $$= new Item_exists_subselect(Lex->current_select->master_unit()->
-					first_select());
-	};
+scalar_comp_subselect_union:
+	union_list { $$= 1; }
+	| union_order_or_limit { $$= 1; }
+	;
 
-in_subselect:
-  subselect_start in_subselect_init
-  subselect_end
-  {
-    $$= $2;
-  };
+scalar_comp_subselect:
+        subselect_start subselect_init subselect_end
+        {
+          $$= $2;
+        } 
+        | '(' scalar_comp_subselect ')' scalar_comp_subselect_union { $$= $2; };
 
-in_subselect_init:
+subselect_init:
   select_init2
   {
     $$= Lex->current_select->master_unit()->first_select();
   };
 
 subselect_start:
-	'(' SELECT_SYM
+	SELECT_SYM
 	{
 	  LEX *lex=Lex;
           if (lex->sql_command == (int)SQLCOM_HA_READ ||
@@ -8867,7 +8858,6 @@
 	};
 
 subselect_end:
-	')'
 	{
 	  LEX *lex=Lex;
           lex->pop_context();

--- 1.12/mysql-test/r/subselect2.result	2005-10-10 20:38:26 +03:00
+++ 1.13/mysql-test/r/subselect2.result	2006-06-07 14:07:56 +03:00
@@ -132,3 +132,16 @@
 5	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	34	func	1	Using
index; Using where
 6	DEPENDENT
SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX	PRIMARY	34	func	1	Using
index; Using where
 drop table t1, t2, t3, t4;
+CREATE TABLE t1 (i INT);
+(SELECT i FROM t1) UNION (SELECT i FROM t1);
+i
+SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS 
+(
+(SELECT i FROM t1) UNION 
+(SELECT i FROM t1)
+);
+i
+SELECT * FROM t1 
+WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1)));
+i
+DROP TABLE t1;

--- 1.6/mysql-test/t/subselect2.test	2006-05-12 19:26:48 +03:00
+++ 1.7/mysql-test/t/subselect2.test	2006-06-07 14:07:56 +03:00
@@ -150,3 +150,21 @@
 
 drop table t1, t2, t3, t4;
 # End of 4.1 tests
+
+#
+# Bug#14654 : Cannot select from the same table twice within a UNION
+# statement 
+#
+CREATE TABLE t1 (i INT);
+
+(SELECT i FROM t1) UNION (SELECT i FROM t1);
+SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS 
+  (
+   (SELECT i FROM t1) UNION 
+   (SELECT i FROM t1)
+  );
+
+SELECT * FROM t1 
+WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1)));
+
+DROP TABLE t1;