bk commit into 6.0 tree (sergefp:1.2638)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
6.0 repository of sergefp.  When sergefp 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@stripped, 2008-05-08 00:55:44+04:00, sergefp@stripped +1 -0
  Fix pushbuild failure for 64-bit platforms:
  - when calling subq_predicate->select_transformer(), thd->lex->current_select
  must point to the subquery's select_lex (and not to its parent).
  (the problem affected 64-bit platforms only because for 32-bit the parser 
  doesn't allow building 64-level deep nesting subquery hierarchy and we 
  never executed the problematic code)

  sql/sql_select.cc@stripped, 2008-05-08 00:55:34+04:00, sergefp@stripped +7 -0
    Fix pushbuild failure for 64-bit platforms:
    - when calling subq_predicate->select_transformer(), thd->lex->current_select
    must point to the subquery's select_lex (and not to its parent).

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2008-05-03 06:16:34 +04:00
+++ b/sql/sql_select.cc	2008-05-08 00:55:34 +04:00
@@ -3423,7 +3423,14 @@ bool JOIN::flatten_subqueries()
     Item_subselect::trans_res res;
     (*in_subq)->changed= 0;
     (*in_subq)->fixed= 0;
+
+    SELECT_LEX *save_select_lex= thd->lex->current_select;
+    thd->lex->current_select= (*in_subq)->unit->first_select();
+
     res= (*in_subq)->select_transformer(child_join);
+
+    thd->lex->current_select= save_select_lex;
+
     if (res == Item_subselect::RES_ERROR)
       DBUG_RETURN(TRUE);