From: magnus.blaudd
Date: June 7 2011 12:29pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4443)
List-Archive: http://lists.mysql.com/commits/138767
Message-Id: <20110607123003.885C9134079@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5339374880042622952=="

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

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4443 magnus.blaudd@stripped	2011-06-07
      ndb
       - move reset of m_is_bulk_delete flag to top of function, thus
        avoiding that it have to be reset in every if branch of the function

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-06 12:18:27 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-07 12:29:53 +0000
@@ -5007,6 +5007,8 @@ int ha_ndbcluster::end_bulk_delete()
 {
   DBUG_ENTER("end_bulk_delete");
   assert(m_is_bulk_delete); // Don't allow end() without start()
+  m_is_bulk_delete = false;
+
   if (m_thd_ndb->m_unsent_bytes &&
       !thd_allow_batch(table->in_use) &&
       !m_thd_ndb->m_handler)
@@ -5017,13 +5019,11 @@ int ha_ndbcluster::end_bulk_delete()
                           &ignore_count) != 0)
     {
       no_uncommitted_rows_execute_failure();
-      m_is_bulk_delete = false;
       DBUG_RETURN(ndb_err(m_thd_ndb->trans));
     }
     assert(m_rows_deleted >= ignore_count);
     m_rows_deleted-= ignore_count;
   }
-  m_is_bulk_delete = false;
   DBUG_RETURN(0);
 }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   3rea2wcrl26ytx6h
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 43a149fe72b3e9f759c704501c4d44a0ab48d77d
# timestamp: 2011-06-07 14:30:03 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   n6jiz10e1v5fwcfq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRFZ6IgAAZNfgAAQUGf//1IA
AAC////wUAO23bvTe23Tr13u97vBJRE8kwqewTI2pPTEypnqQYmmDJJhGCmTyE0j1MRkAAASiaNT
EKbKY1NBoaaGjTTTRoCRRJkyeppomGpsoZMEyGhpoElCNJ5Kep6Y1T2lND1PSeoeoaABV+diefMb
MKe9nGh2YwMVKIyzVuhGxiC5NvJ6IgHp4D4XYVizKWqRVlPXq07q7JG/9k17e8CkvDHjLu5RqKHC
flHFTXjffzn4WjWCqhc2Q9hHt5iqHW4qbHsQhFVLoIwVqR1zV1TSp0Tra1a4OLcSI2xEIBMWFaHG
YQwVUBc0HMnSSTVIrufC0gpF4Qthr4b5CEZajL+Os9qAhrGysIC7mVgmZ2idU5RWK0rEXc7chRQk
a4sv1JMERdWIv2na43p5dvMBMoE+ARJ2MGirDRl65B4adRCwPfxezpxFzRaPsLqToJGoxiVBAtN+
xTGieC9WzGkINFqwg++0MycEJnTZmDcaTploeCxe15puztzRyDXDjCEXk1EpnLimDuZF8Kgpjdbx
Jz6FqnRidY3TmrSFjKkGnm0fLAZewntsUT/A17twmLEGQmMRkHQR0brLeUg+6oOk32o7T+c2DBLa
q+SuoLfAaLJKDq5MHkuXwatrUXt0ps5MwhGaopzbobDpY/UYFydvwHtDTAeKvytMnreBxzySJe/K
ILhGpZhfSYRRVzsIiG8OOWnbZPGU31KHmIZl+nWLUMrSYJF4i9NlgQjYxIxT0ihwnGM1GOs13I1m
lUiY5WiGhSIsKumI8/Ofdne/0IwW/8zXlFlgdcNta9UvVKQHQHCcd196DvsydDgnO9Q6w6QyKHAr
SlYt0cJTgWmsYcVWNHPwVpuU7VhVZRdhgTlvzm8o6NNOyuIRMawbBSYjfdmKmNuAb/gvxOVHyRsT
VtN5kq2XZr58CtRERoFlDvnpXHJyBlx+DQJ8vpP8Xp3UiKqoBOZq0GiiFTg6NhGlaQwoJ+RJjdz1
wEYGScTvFgZkm7XHTmj4VssJzHTWi4LZYZhwnoRxkn76DnKSJ2oiIKu8snyLxzgqBc8FD/kiAUrj
BWbooFK6y8SqiFYRmF2LGSnCR1EsA/Op4Ic7yT2DeC5FhTi03OPb3ICmVn9g6psjqRjWHVIeQHc3
Z1NPWrF1aBChuXbtWdSaUQyrGC47xoaDCRCCXZGKp6TlpYTHqAcwcntVvoLiX42CMyhR5QEW3Lb1
ToUrFFLrTMrWYpigbkPDIyFJUEWjdf8XckU4UJARWeiI


--===============5339374880042622952==--