From: Tor Didriksen
Date: January 21 2011 12:51pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3328)
List-Archive: http://lists.mysql.com/commits/129329
Message-Id: <20110121125149.4F9BD372E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8648519574287342251=="

--===============8648519574287342251==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/next-mr-opt-backporting-bug57623/ based on revid:tor.didriksen@stripped

 3328 Tor Didriksen	2011-01-21
      review comments

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-21 12:50:36 +0000
+++ b/sql/sql_select.cc	2011-01-21 12:51:45 +0000
@@ -4139,9 +4139,12 @@ skip_conversion:
      
     if (!thd->stmt_arena->is_conventional())
     {
-      tree= ((*subq)->embedding_join_nest == (TABLE_LIST*)1)?
-                     &select_lex->prep_where :
-                     &((*subq)->embedding_join_nest->prep_on_expr);
+      const bool have_join_nest=
+        (*subq)->embedding_join_nest != (TABLE_LIST*) 1;
+
+      tree= have_join_nest ? 
+        &((*subq)->embedding_join_nest->prep_on_expr) :
+        &select_lex->prep_where;
 
       /*
         Some precaution is needed when dealing with PS/SP:
@@ -4150,9 +4153,17 @@ skip_conversion:
         simplify_joins(), which is called after this function. Hence, we need
         to check that *tree is non-NULL before calling replace_subcondition.
       */
+      /*
+       I don't understand what you are trying to say here.
+       Could you re-write to something like
+       if (have_join_nest)
+         DEBUG_ASSERT(something);
+       else
+         DEBUG_ASSERT(something else);
+      */
       DBUG_ASSERT(((*subq)->embedding_join_nest == (TABLE_LIST*)1 ||
                    (*subq)->embedding_join_nest->nested_join == NULL) ==
-                  (*tree != 0));
+                  (*tree != NULL));
       if (*tree && replace_subcondition(this, tree, *subq, substitute, FALSE))
         DBUG_RETURN(TRUE);
     }


--===============8648519574287342251==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   274dwv6sfz7h0a7p
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-bug57623/
# testament_sha1: c0da68a1376f098969cfc00595ff05a3fd93d249
# timestamp: 2011-01-21 13:51:49 +0100
# base_revision_id: tor.didriksen@stripped\
#   y0hpjkjdtj047j4w
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTJsi78AAd9fgB4RcfP///6l
HgC////wUAQunh1HuBwb3bcCUSEwmCZI9DIBpMppp6eoJp6T9U2k9JtR7VBKRRtMmSeRqhvVBoGg
AAANAAAkoTaIKepo0GgyADIDINBoAAGKgU/Kninink1NADGjSMmTIaAzSGTIJKBNCngJk0KeT00o
aeRMj1AAAGgvIJVTnZOrOPueWccXNHioc9ItOtrJlTMzPfENDascjjbb1Qgm8iCXQT+RR+sPXoqS
QFnyWvQSTzuPCZCetrIH3Z237/xL8tf3z49XLo9/Gcr2KFYVKxRuAidVajFrp6uuuiYYonaUb2Wb
4k4kuzdit5mijF9oO+NKDmIdgmmAl6Lf8Cho5zV6fKaOQMq3zJyRKkar9mVVMXgdbMymgedghiRz
YZWB3h3aWHFEixE2d0awqUGLlISCObTcbOThFojQPg8RERFr4X2HeqcNvzHQuE3XU0mYYFZq28Pg
YwGWdtFmLS4tjbOInEVVkcMa5oiJRRbZM0ImFVirBhDmtMKEarCvIOvwNoQLUnJgYb33KK1XolRS
L2sHMIMSaMxuBo0keB5zryCyApZg1sFO0lW+mmE9p+EZjdj/CayJooOcTssujg0JSRyEW/omk8hi
esYL6FEbStFGeJDKTSD2kpJsKj/CKC8RpXCwjlgSlrI0VbXGZVkmi2DHUxULijEYQKnQudOpG3Lh
J0ankowTrZvYiEpumhs/Eu0sxZiL3NdH4X6vTz8IQXkQsuH4lRTl8px9x/5HehwuHWGmFt6AdL5x
uGre2AuuH8NOBngwVUGmkOHjZ9UcG2g0Vka7hNpY7Z6IhHEwPxJG0tlL6GzAoqP0Tm/usw0G7v8b
CI8SX7lT3cI8nlTTmlDBe9Udvu1ZaVUEvIhJJbaPIPY9U1U/lBG8l5HGYxtIB+RyREM55mMmfQT1
DhCJbNHPXsbUaBPjVqYRuPbdbIHBj9qQBunxuBpYQmSWuVa1n2vHYZapnli5sIQ9MzY4FYYLU1F+
vXiRfV0y2IYEyHavXCdSQ1lvFgXuOk1biJV/PFjGpp4y8TkcmFR1Ior22iyGzBnRzZSx2lcAaWoc
qthZnsXu3JDo7+DzKYE80qQr6kYBXmdbJOgw3aY4hSFXBo6ycNgVBkGlHgN87x4cQhASv+m0KQpa
DleZxlSGEAn1Z3xgT0JF6cSWYVsnQ14G4zE786ZA5IcPRnSHhZRaimgCfHVvkoSIEBQHDxcolZSQ
ygkMKFppkV96tol+IyRuJCBIlIxI9RdnQnmTCZMSqjY49m1iaIqnfjuIH+s3SA+3ofTBIuJySlG5
QXSCJFRvMNfwAsNat67GrmMijAFLC/UHmHZSAZc4K7E/dAXAeOYd0azWLhSEhgQFUQfkZdrYf5rT
GXpxT4Pc8eaG3WmNSwn1WVjMAlHBeXjG91YWq/2NlnaF1AwzlKcoeSaHbMbxXJqv7BgUDPSE2XEy
sFIK7oYPDMbKWChoI0mw/4u5IpwoSBk2Rd+A


--===============8648519574287342251==--