From: Ole John Aske
Date: October 15 2010 4:17pm
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3313 to 3314)
List-Archive: http://lists.mysql.com/commits/120866
Message-Id: <20101015161712.D9B2921E@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2326528649890148255=="

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

 3314 Ole John Aske	2010-10-15
      Fixed compiler warning

    modified:
      sql/ha_ndbcluster.cc
 3313 Ole John Aske	2010-10-15
      Recommit after fixing diverged-branches:
      
      spj-svs: MRR read may fail to close cursors for pending ScanOperations 
      causing 'out of transaction / operation / lock' errors depending on the database config.
      
      This fix is cherry picked from proposed fix for bug 57481, with the addition of an
      additional SPJ test for the same scenario.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-10-15 13:49:39 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-15 14:47:35 +0000
@@ -13738,7 +13738,7 @@ ha_ndbcluster::read_multi_range_first(KE
    * mrr access on this handler.
    * Close it now to free up resources for this NdbScanOperation.
    */ 
-  if (unlikely(error= close_scan()))
+  if (unlikely((error= close_scan())))
     DBUG_RETURN(error);
 
   thd_ndb->query_state|= NDB_QUERY_MULTI_READ_RANGE;


--===============2326528649890148255==
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\
#   kil26cyxzn3io457
# target_branch: file:///export/home/tmp/oleja/mysql/mysql-5.1-telco-\
#   7.0-spj-scan-scan/
# testament_sha1: e974c8097a6ef3bd341cfd7b0b6d491d765351a3
# timestamp: 2010-10-15 18:17:12 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@stripped\
#   gyyr3z1p31p8m25j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWusUr0AAYhfgEAQUGP/93MQ
gAC////wUAN6d4Peeeh7uzewkkmip+JpiNTwI00NFNlBtqmhmglJGkeo2k9NTaQNA0AAAAJRJgRp
E/KnppogMmgD0gACSU9KNPUGj0pgAEGAAhgJKTAhomRhKe0p6ntFPUwIeoNGOpXFq54HJXCqStfc
A+r7INY5W9unsiqqZ+KfDYKKZMzu0TY9nfr5vfr92Q0tlFGvbVOnMiajdOWWsQajQRoYYheS38he
MTSGn0wxrke0SRgsRIsgkg+10IpObtyE4iTWGEWSdZWB07TqDEBq2aqI+2EYCWd5nc0lszLAtmrf
wonkQF+p1iNzoxL9uXOZDFpOgkd8Wwee4VAw8S1gjDUblI1DATbro32uCQwp5FqzpZcFC7akgkKW
MBwVXhjN0s3+xpzFnuCxYU6FVZBjh7xpicZNKGC6iuLh4mA43m1f32Hiuu2yEdMKLuIdLUb2YGJQ
Ms6NMgbwYSGZ8lZTOCvRNVKJgWLXEQVHXoqeJNOii+xr3OTi+w+snutVIZKQiLbHXwJMcNm7brtp
eGhgTJVCdtNlIxGGgUoRlAYtrmX3K+bC5UHWIsFcRCEV8jZ1btNq7tSavTg5EJNKwzNo657Sano6
LPvA8crGtrMzbWZRL1wvOF6RvopgDOrbQPaqRHz0SMFys52DuLX2nFTbuAUKEhlICQuqhRNd287M
kZ4r6nSKIWxYSmVqxSWlBYqHqJk849i0h69qUC/HxU4jypLjjvlSH5bx00wV8vPCInizO2xrp22x
xs2jimLoeUy2PVdbqvGGFxIES9hxA+g6lHfpVQdzEkJ/fP7y3uNXEbND5evgOZeHtAR6HqCnW5WY
GuPymh2WmXIW1WxETwmlyu2PrF6B3OYcfh9NEQeqRwHgo8sRZBmdT5A8UQm1Hu6pI0SKFlyw4vkq
SiIcAW9I67inQ/J7yyDIbnOViIM7hFOlrgvKaDl+Mr5weSKrJlbpmFKp64JFIfprGm1RQohhSv+k
dgsWtC0x+Zf9F6BMYGlzGJ5HOiNe9sKvsQOxHjwF4gyYB3cirrsPUjr3KVsp++cLeFJLqMUSNYuH
v0pY3IF/pohJM9+9YmMzak0JV4jGYFFkxL8TL4ZC80YEoRqSnOOhF1stTcxKAtjpZhaEBJGKKBoc
+wqw8wkbqyQm/Au5IpwoSDXWKV6A


--===============2326528649890148255==--