From: Ole John Aske
Date: December 7 2010 3:06pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3391)
List-Archive: http://lists.mysql.com/commits/126224
Message-Id: <20101207150634.03652223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6457618289897027584=="

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

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jan.wedvik@stripped

 3391 Ole John Aske	2010-12-07
      SPJ-scan-scan: Updated cherry picked fix for bug 58490 to latest fix being reviewed

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-07 11:56:10 +0000
+++ b/sql/sql_select.cc	2010-12-07 15:06:29 +0000
@@ -11661,6 +11661,16 @@ evaluate_join_record(JOIN *join, JOIN_TA
     }
 
     /*
+     Setting NESTED_LOOP_NO_MORE_ROWS (if not_exists_optimize) 
+     also implies a 'not found' condition. However we could not
+     set this inside the  loop above as it would prematurely
+     have terminated the 'first_unmatched' / 'first_unmatched->found'
+     calculations above.
+    */
+    if (rc == NESTED_LOOP_NO_MORE_ROWS)
+      found= false;
+
+    /*
       It was not just a return to lower loop level when one
       of the newly activated predicates is evaluated as false
       (See above join->return_tab= tab).
@@ -11673,7 +11683,6 @@ evaluate_join_record(JOIN *join, JOIN_TA
     if (found)
     {
       DBUG_PRINT("info", ("  found match"));
-      DBUG_ASSERT(rc==NESTED_LOOP_OK);
       /* A match from join_tab is found for the current partial join. */
       rc= (*join_tab->next_select)(join, join_tab+1, 0);
       if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS)


--===============6457618289897027584==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   4ccfweuygzyj0dq7
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 5de17b2d6a63150ffd803915d22990273a8e2800
# timestamp: 2010-12-07 16:06:33 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: jan.wedvik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSGjtaoAAbrfgHAQUPP//3ZX
3oC////wUAR1ryuVzcu1Ou2x3cElBGlPU8p6YqeNNTRiaeknppNgp4oGmm1BoNEmJpoaaNEwIjTQ
AGjQAAAGiZBEzJJk9TNJoyeoeiNAABoGgHNMTJk0YTBMTTAJgEMEYEYBJJGIMoNU/Q1J5NNTymym
nqBoMgA8ppokgLrcZj87hrwsg6uyer9+c0gmRc0jMhhOjDKKJkxAMMIHIOBRv1w409nD4MYxfn7F
98jmlTKmt+vfG4vSy4nQ8NHP4Nv7s14VgeBXfGdbWzhmXEuOlILUgoMGk+F7K7a7HWwwBrBNVAse
afJ8eklXMRz0iZhmieZK/blzeWwk6zPTHgxQnSBNQcmSTL1aL2om+y14qxmd1puul5w4YjiIikn5
BcSA8RqLSkHqKqzCZ05DMpttlAF2MaSzNTIhz2xCI2Pnr7S3oXDAmeMzxVXxiGV1vuwNNxAtsvYp
WD3CGEXGerIOFTnk4Lv7fQcK5qsdNaDKR8akFSlBrsVcdVUI8hIIHekG2JgpEsy5VioRisTgnVj7
bKqQFgTY75NC5Y5pc9JYDPS/OMRIEY8gS9tAZJGCWTM8ApGhYY5Kgea1hMwHsYNWWVCLlDfjfqvm
6nfDmh7ytGWVNjR+klouUb4hXAlmw6RmjSxTk0XTKgGCoJqKDQSByBoxtwiqIcFlSITR4XLOVU15
JTG5CoQPMIhG82iAD4Hf6BZzR0tvSUkdv6tWZoAuJ1CAGPNO5H6ORDk3gDDH8OZzIETs7nhE8CmZ
+IFsTmMTkZisZSjWedyeEup4PWS40e8cDjwA0k87g28dmGqqI5JkGecyJ+IGgNMuBzGYdjizWyxu
43FG3cyilZ26kXxUiNZqkYaQ9+hUi7+rYpC6OrWXX0DAYWpGZ53jSSjIwehqDPZfBVwhOMrX7Hzl
KR3motOIRhTMagvUO0UOW+Czm+z35NbZla4QQZmptiuxyeEwEtR3NmkChqSvUhIe8y0bcWaQ7W2B
Fm1RYdHsgPsLgAtIyOi1SjrxxGJ7ItdiXSiPbBQcWFSo66MuXRcRFkpV+++HqMJMbVo628+xPYLV
Ga1WaUU6NQpLhmUPl2E703UgzF9OU+YvYruAqWaYXa9loQhWTSyDjrAvrfbNmrdJ5kc40UAfM8Yq
RjZL1dop1sAtO9QQNkgYQ8oz1MASBM0HLxWXdcP20HdZjA8wDrBop2OrortoJxrSNhsGofmkU3s3
IWveGvYzI5oNgApJCQzFLUUMANUNCzqG6D6Z4Q8ihDWLENVDcuGro9uAFfqcBjbpAUyGb22y0s7r
38AyA5a3LpUbeMF2n+fmzr4rTezLxeQ8747R+TY59dWTeKtGNVv3dQOBZfXOEESlvcV4WJ2L5YPs
fqGiaWHVUy8pWXbwj0yWTtZ7UW2g7xkBaaGgWbtzWnsc4xFwbgHbhIg6pC1zwJaotYjJIQYlfbEY
pMtkUlDhaxy2TAUgHBhNk6znUMry4JDeoJhWBkn8sREE+J1qShxXBodRaq3bFQKWsirIw3XsWALz
ycXULPmVe1TKaMvixn/F3JFOFCQIaO1qgA==


--===============6457618289897027584==--