bk commit into 5.2 tree (sergefp:1.2540)

From: Sergey Petrunia <sergefp(at)mysql.com>
Date: Sat Jun 30 2007 - 12:45:43 EDT

Below is the list of changes that have just been committed into a local 5.2 repository of psergey. When psergey 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.2540, 2007-06-30 20:45:36+04:00, sergefp@mysql.com +1 -0   Merge WL#2980 & WL#1110, Step 3

  sql/sql_select.cc@1.545, 2007-06-30 20:45:30+04:00, sergefp@mysql.com +6 -5     Merge WL#2980 & WL#1110, Step 3

# 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: sergefp
# Host: pylon.mylan
# Root: /home/psergey/mysql-5.2-merge-12

• 1.544/sql/sql_select.cc 2007-06-30 20:45:42 +04:00 +++ 1.545/sql/sql_select.cc 2007-06-30 20:45:42 +04:00 @@ -623,15 +623,18 @@ !in_subs->is_correlated); // 5 }
  • if ((res= subselect->select_transformer(this)) != + Item_subselect::trans_res trans_res; + if ((trans_res= subselect->select_transformer(this)) != Item_subselect::RES_OK) { select_lex->fix_prepare_information(thd, &conds, &having);
  • DBUG_RETURN((res == Item_subselect::RES_ERROR)); + DBUG_RETURN((trans_res == Item_subselect::RES_ERROR)); } + } + } + } //psergey-merge: todo: VV #if 0
  • Item_subselect::trans_res trans_res;

       /*
         For IN predicates, if Item_in_subselect::use_hash_sj == TRUE,
@@ -644,8 +647,6 @@
 	DBUG_RETURN((trans_res == Item_subselect::RES_ERROR));
       }
 #endif      

- }
- }  

   select_lex->fix_prepare_information(thd, &conds, &having);  

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Sat Jun 30 12:45:38 2007