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

--===============2187540831235312500==
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-bug57431/ 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:53:09 +0000
+++ b/sql/sql_select.cc	2011-01-21 12:59:00 +0000
@@ -17094,13 +17094,16 @@ sub_select_sjm(JOIN *join, JOIN_TAB *joi
   {
     /* Do full scan of the materialized table */
     JOIN_TAB *last_tab= join_tab + (sjm->table_count - 1);
-
-
     Item *save_cond= last_tab->select_cond;
     st_join_table *save_last_inner= last_tab->last_inner;
+
+    // Why are we overwriting information in last_tab here?
     last_tab->set_select_cond(sjm->join_cond, __LINE__);
     last_tab->last_inner= NULL;
+
     rc= sub_select(join, last_tab, end_of_records);
+
+    // And why do we need to restore previous information?
     last_tab->set_select_cond(save_cond, __LINE__);
     last_tab->last_inner= save_last_inner;
     DBUG_RETURN(rc);


--===============2187540831235312500==
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\
#   d4dvuj63jvvnefvn
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-bug57431/
# testament_sha1: 0b8cdb343a808379879f13471e5951608f99837f
# timestamp: 2011-01-21 13:59:04 +0100
# base_revision_id: tor.didriksen@stripped\
#   by4q2erky06b6yy0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTuW4zgAAZXfgEAQUGP/9/YA
BIC////wUAO5eyTpzRztakJKEA1J+oxT9U2U9TaNExNAGgaBlU9Cemk2m1T1NA9RoA0AAACSIJoJ
ink00pvVPU0MjymhoekZAwAAAAA0GgDQDQCSTSZGlPTU8jU2iam2qM9UGmQxPUGcstMOGtTP5eXe
3AmVmuG+JawGm5nqhGMdcBOT7PDVmZF/irvOVTYsF7SmPeps9PZ1b++rfX8vr9qeX8ffQtd8GhO1
zYUxr0VTb01iLuyc+RHzfZiDxMKpDnbGHMoJLakSSOB3mFpSTirYZu2AoaObBaGciJzEMCw6msAd
rgsu94rVAJKb8vpRTuerBKciREROCgNxOHtiIxSIRgIqEXlISxir059zL92WVd2KDx48zxJl3Aa3
bnAoGNYisRDri4hzdk5nGF99rhlsMCJ0ClKHkDEPnI5FjbasnyLIk57DhwF2SV7SyYu4Rk8U7ZaQ
N0VxM679BVehw5BaELN+wU74ExStZzccx5aNni2pl6C05Y4qSGKraws4I0HWKSwDJtlmWYVig0uc
Z3BwepE0TiOlkkz4mBQCABGrK5A2cCFY0cni17XcmlY5VKCa2jzJBVRqI8TOnO/Eb5Pnz6SkCo9b
JjzhDo9kJsHLbgpLZb4hpkotHb/UOJeWO9I0meYpzyhxre6Wx6LOxGLZWdesgy0Nxx1RvcjBJynN
mU43qLmTYck/hdfOxgKVI0zcS1E8KExRXbgLVloWVMjOMPbbEqEiA1h7CDW4GHEZAoC7XmaBg0wJ
OBt2VRryY3qeG6Dlslhjjg5O8XCxGE21nf6tKUlWdFa1XRjbPkGunGoqSbnpUlhfq7jRZeSGA8hz
3ZTZ2m5ox4mnBpkh+bXiMuCmrafrII0rNcX6f5f3RIefwcmCgYqJcYB1QHOm/CqOKZrEU7oD65i3
i3kuJuB+0FQGPTMLQtgDrHIlWkMVLbswr6JFyJYZ1j6zMpzKuO8r3UeA7MoJDY09Zg6YUrKZEUcq
sh6JWBEaoXRroihTC4OM3ShI6JDIsRsOsq87r0+TMoEu3od1m06Up4B8bQpHajpG9MktWi7IpSbc
3KtOILwcLEXfXKdspDMsORLCp6lmCwO1oag0lhederUZize1gMz41f7BRhAw3M92418692lxthEn
EMTEaH0uReFbBYuzLjqLSu/WxEM/AZFCaKxNQXQVWJ6DXuHeQXcHqGAQMw47ymJE/4u5IpwoSB3L
cZwA


--===============2187540831235312500==--