Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1

sql/item.cc

@@ -822,8 +822,9 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
 {
   if (!ref)
   {
+    SELECT_LEX *sl=thd->lex.select->outer_select();
     if ((ref= find_item_in_list(this, thd->lex.select->item_list,
-				REPORT_EXCEPT_NOT_FOUND)) ==
+		(sl ? REPORT_EXCEPT_NOT_FOUND : REPORT_ALL_ERRORS))) ==
 	(Item **)not_found_item)
     {
       /*
@@ -836,9 +837,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
 	cause error ER_NON_UNIQ_ERROR in find_item_in_list.
       */
       SELECT_LEX *last=0;
-      for (SELECT_LEX *sl= thd->lex.select->outer_select();
-	   sl;
-	   sl= sl->outer_select())
+      for ( ; sl ; sl= sl->outer_select())
 	if((ref= find_item_in_list(this, (last= sl)->item_list,
 				   REPORT_EXCEPT_NOT_FOUND)) !=
 	   (Item **)not_found_item)
@@ -852,6 +851,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
       {
 	// Call to report error
 	find_item_in_list(this, thd->lex.select->item_list, REPORT_ALL_ERRORS);
+        ref=0;
 	return 1;
       }
       else