bk commit into 4.1 tree (1.1612)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1612 03/09/09 15:23:38 Sinisa@stripped +3 -0
  Fix for a bug #1226.
  
  Happens when braces are used on a single select, which leads
  to the uninitialized global parameters structure.

  sql/sql_yacc.yy
    1.263 03/09/09 15:23:33 Sinisa@stripped +3 -2
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

  mysql-test/t/subselect.test
    1.86 03/09/09 15:23:33 Sinisa@stripped +2 -0
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

  mysql-test/r/subselect.result
    1.95 03/09/09 15:23:32 Sinisa@stripped +6 -0
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.262/sql/sql_yacc.yy	Wed Sep  3 16:40:14 2003
+++ 1.263/sql/sql_yacc.yy	Tue Sep  9 15:23:33 2003
@@ -2012,8 +2012,9 @@
 	    YYABORT;
 	  }
             /* select in braces, can't contain global parameters */
-            sel->master_unit()->global_parameters=
-               sel->master_unit()->fake_select_lex;
+	    if (sel->master_unit()->fake_select_lex)
+              sel->master_unit()->global_parameters=
+                 sel->master_unit()->fake_select_lex;
           } union_opt;
 
 select_init2:

--- 1.94/mysql-test/r/subselect.result	Sun Sep  7 20:33:53 2003
+++ 1.95/mysql-test/r/subselect.result	Tue Sep  9 15:23:32 2003
@@ -1368,4 +1368,10 @@
 select * from t1 where ('a','b')=(select 'a','b' from t1 union select 'a','b' from t1);
 s1
 tttt
+explain (select * from t1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
+(select * from t1);
+s1
+tttt
 drop table t1;

--- 1.85/mysql-test/t/subselect.test	Sun Sep  7 20:33:53 2003
+++ 1.86/mysql-test/t/subselect.test	Tue Sep  9 15:23:33 2003
@@ -931,4 +931,6 @@
 select (select 'a','b' from t1 union select 'a','b' from t1) from t1;
 insert into t1 values ('tttt');
 select * from t1 where ('a','b')=(select 'a','b' from t1 union select 'a','b' from t1);
+explain (select * from t1);
+(select * from t1);
 drop table t1;