From: Ole John Aske
Date: April 14 2011 9:21am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3477)
List-Archive: http://lists.mysql.com/commits/135406
Message-Id: <20110414092122.E8288222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2866648072444848919=="

--===============2866648072444848919==
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:ole.john.aske@stripped

 3477 Ole John Aske	2011-04-14
      SPJ: Refactoring of how NdbQueryOperationDef objects was released:
      
      Previously NdbQueryOperationDef's was released by either 
      ::~NdbQueryBuilderImpl() or ::~NdbQueryDefImpl() doing
      a 'delete' on the NdbQueryOperationDef being the root of the
      query tree and each NdbQueryOperationDef recursively deleting
      its children. This had the implicit assumption that the
      query tree was in a consistent state - Which it might not be 
      in the case where a NdbQueryBuilder factory method failed 
      before a query tree had been completed.
      
      It simplify the logic to remove the recursive deletion of children,
      and instead iterate the m_operations[] vector to find the 
      NdbQueryOperationDef to delete.

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-04-14 08:59:45 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp	2011-04-14 09:21:18 +0000
@@ -574,16 +574,15 @@ NdbQueryIndexScanOperationDef::~NdbQuery
 
 NdbQueryOperationDefImpl::~NdbQueryOperationDefImpl()
 {
+  // Unlink any parent and child refering this object
   if (m_parent != NULL)
   {
     m_parent->removeChild(this);
   }
-  // Delete children recursively also.
   for (Uint32 i = 0; i<m_children.size(); i++)
   {
     assert(m_children[i]->m_parent == this);
     m_children[i]->m_parent = NULL;
-    delete m_children[i];
   }
 }
 
@@ -1145,12 +1144,13 @@ NdbQueryBuilderImpl::NdbQueryBuilderImpl
 NdbQueryBuilderImpl::~NdbQueryBuilderImpl()
 {
   // Delete all operand and operator in Vector's
-  if (m_operations.size() > 0)
+  for (Uint32 i=0; i<m_operations.size(); ++i)
   {
-    delete m_operations[0];
+    delete m_operations[i];
   }
   for (Uint32 i=0; i<m_operands.size(); ++i)
-  { delete m_operands[i];
+  {
+    delete m_operands[i];
   }
 }
 
@@ -1297,12 +1297,13 @@ NdbQueryDefImpl(const Vector<NdbQueryOpe
 NdbQueryDefImpl::~NdbQueryDefImpl()
 {
   // Release all NdbQueryOperations
-  if (m_operations.size() > 0)
+  for (Uint32 i=0; i<m_operations.size(); ++i)
   {
-    delete m_operations[0];
+    delete m_operations[i];
   }
   for (Uint32 i=0; i<m_operands.size(); ++i)
-  { delete m_operands[i];
+  {
+    delete m_operands[i];
   }
 }
 


--===============2866648072444848919==
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\
#   d3iymdyvsdwocpjv
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: cd4cb8dc9169f52c12d5567501edbd1336fb6a7c
# timestamp: 2011-04-14 11:21:22 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   7wt8m96ehgzm5sv3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcPGwUUAAiBfgEAQUO///3Yx
/oq////5UAVNWze1rlua2us5NtZ1wSSEJtEmGTQaEwo/SEYTQNDI0bUYg0RNMj0FPJTJo00HqA9Q
AAAAAEppAiYTTSntUbSfqm1MJoxGgyNBpkABzAmJoMJkyZMjCYJppkYmAIYBJIgGmgJqaeo0ZTJi
ek/VNNAGho0AaOCNlWiOYZj9v8PKttGf0IIzHI4tpz45G7sz3oNIyGqMUtEUShKkvgWTD7w7FACT
B75FmROe3swTMkHj3pX4aGjlcG9lW2Z+Sc9ksZ5rxM9zmsezseLkapv74eezby8tK1ku9zPuUU/6
nfyXU4qoanjLgLZx0WbjaRrktagNSWuddmK+renOyyiWveKVhiBQg1bVg7KxAVpewvOt4PQMenj5
auf29acyJ58Ew8erjh0g86ix3AuMBxET0aZQoFPbs4vz5NWVodEZIwSK0jUmBWl2Q0S35dMhFihh
0BfyvmU0EqmGUTnE4MjaRrcY5yTmpDtwEpUMP31oKGKBnx8uXXQC9vIZ8sQV9YmFJLGWjDDeChjG
I4K+PmIDbaHKGAxPFdqcR43RrpsKTKxUYmdxMCi9KUn4HTT5XUBe/mNhVKkzxtGrMYlZm0S5TfNs
lrqG1jkxGJezGKHGKzC2IjeuBQcjU6lgnYxHBeYzwq1FIVVLF92YYOSrpB50Im510FtUGMTUEXIw
XUujiMkIIGiNAFQUpdHoKZWQE3hDOglImIFPAgJESTQLt0xmmGPAOOc7gi88n38FxdwhvH4Ky0Th
ix4a1kSZhnWY2ELu6R9Hpg5YXvjgqbHMkxKDKikaApUthzh0FC4zL/FncseREy27PKkTsRYY7uCi
hobN0vfeKPUcoNXOjxhtQSSN2DHvRxqDBhscjfWlN1yFN+hQDd6xwN1WJGUmgzUwRJddZdLEscPf
b6Ii9yliaJE+NzVwcwjrr1co7a3ScxBIfiaV1PCYvPqbF2kTPrJJQWbPZIU8+IqtI2+lVL1FlBJm
OjfZjCRiNBtJMQJVEXeFHfwRxt5sjpFZvLYKhZOqmUx4IJEfMPhirwvbnH8bycq1Yi3C4W3cPVXH
xmt+qMIExIQowrh5ibMOgatuPKjnVmVRiRC1u0DRxC/HXiYI9czoKqbjlVFS/ZxrPK/0BfDrKpgm
+rDXYuvtcwsMwKPFNFEGTbJMbZP5B0MR070POJbeQ4kmYgilPjtGGYp3jjE3SD9kB316pzuOJxKx
vOOiVFJ0CfY3AHMGsKjFIg3ZEP5Ov3LAE1HDrKkHgapSiYO0NM+J2qzs800dpJsza47UMOVt4wWs
VydKHZZcVbcl7zPnu5Yzl9MhmRdhGB+uJfmrkOcTKzZznYkOFjsrJwWwPHTfxG6o8cApC1yNoH+a
KRakOJBmFQwxbty3a4V0VCKdA0B85yjLyL3iu3YSSzqtnM/pGhhF9ypJnd6PFmIAV8cgmxmd3a+C
mcLmbhPAT6EwwMyZS67lpmOoWDI9W/z6pHu/FgajUM7jihXkGQcjIfE1pNgTYf1IZD2ZbXBuzEdd
kqdtiYWZPJjehhaJcIpEWTvXLPJLvoboNdKVruzIAg7DTUJmpkFxQbvs0SKsq3TVxjpvOulGTITM
U12pHzhsDSk+HEVdI1TcmJJYargt3z1Ev20iESldsQwdNxxhGQDqKxgZrGtyHnVhUw98GMmAFS+k
uIYAkQg+l8rtRzJmHU6r7cSJnIYm2NjCvSHpqn0vT+HReKBjwOcbpgVF2iMyQISWSvir0bBTTBaL
tCuZZFuBVK4A5iMRdUBZPDtCuw4T/i7kinChIYeNgoo=


--===============2866648072444848919==--