From: Ole John Aske
Date: April 27 2011 8:16am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3481)
List-Archive: http://lists.mysql.com/commits/136161
Message-Id: <20110427081641.CA240222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4660933860049529831=="

--===============4660933860049529831==
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

 3481 Ole John Aske	2011-04-27
      SPJ: Remove compiler warning about 'unused parent_no' 

    modified:
      sql/ha_ndbcluster_push.cc
=== modified file 'sql/ha_ndbcluster_push.cc'
--- a/sql/ha_ndbcluster_push.cc	2011-04-27 07:42:18 +0000
+++ b/sql/ha_ndbcluster_push.cc	2011-04-27 08:16:37 +0000
@@ -1075,9 +1075,6 @@ ndb_pushed_builder_ctx::build_key(const 
       }
     }
 
-    const uint parent_no= m_tables[tab_no].m_parent;
-    DBUG_ASSERT(parent_no!=MAX_TABLES);
-
     const Item* join_items[ndb_pushed_join::MAX_LINKED_KEYS+1];
     collect_key_refs(table,join_items);
 
@@ -1196,6 +1193,7 @@ ndb_pushed_builder_ctx::build_query()
     } 
     if (table != m_join_root)
     {
+      DBUG_ASSERT(m_tables[tab_no].m_parent!=MAX_TABLES);
       const uint parent_no= m_tables[tab_no].m_parent;
       const AQP::Table_access* parent= m_plan.get_table_access(parent_no);
 


--===============4660933860049529831==
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\
#   1da7fy54f7b30au7
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 26bba63ccca3c60e964df61bbc2db5db7eec5944
# timestamp: 2011-04-27 10:16:41 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   a9xc8s4lio516ayz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXZDQ6wAAZTfgBAQcOP//3aW
3kq////wUAN6vVQt3WM6nQ0JAmJ4plHlPAo9R6gGgaB5EyYQDKVPyBtRoUfqjymRiYhkAPIh6hkD
aDITQjQE1PJpIzRD1DCNA0AeoAHMAmAmRgBGJiYTCYIaYmmAkoFNNqbSYCTapp7QKG1A0aAGm1Gj
1C27tqfTPFNmjGV7UEUB5GzbSCvaV/FePr1REP1+JjCKHJlSNThq94Ds+UoPT+4N2mhgIznXJIxs
d5IZCqYaJtGsPg0HEEMwScQNcPtxbTDTKnPBYkiZyBI+eTvW8ALWKPJu9Ccs5ulweIem7hoOPAZE
cLwM4PUwmPxWvssBS3oceRAQ53DTZvoAfVdJggjKbvN0qlHiahzjaBXgFxnrtBpx4jXMVGi8V1cL
pQBMwCN40QisLGAcNJqXA68kK+FVIgBKxspILcw3XlxQ3pME4jDePMXUukyRDW8X6/YNpq4BZ4xy
FVsDKocXxtHkWWFbrnJXRjHKh6sRMLYNPJ0NZcSqZmHFgqTDM/E61QI1XbNtGORILmBe1UCxbSwz
C0SwqYiLBgDbJn6IHVNq/pTSD8DXEv0zFI/FhPSQIOKw/FF+BSrY1lyPeoohDsUkjiYEpp3dw5er
KvRfKo9vDv7Ykh4/myNwZTBjTq+sXfbZv3Q34eb8LpoqPe2BXrn3cG1WIB2EnfgsLboAzgAg6R0A
2gMN8QquQkWukCTQAa6G+bFUoV/vokWrtF7wxzncdwmQiz42K15t5InkTGYZ9QYrwsMXYPbkqlUo
kVn1jJDsKCyhz0SUuhL9QZCZAY5WFmhnFIgv1S4m8ZEQfS6hiD7QJbkIhlmO5IoAOi2IYg6Z6uZh
zsYlDHTt2oJM/SBQRlxyreAzVu18ggAeJIBF1CcFXUFByUcrrQ8qYULDeF1S6UFwWCUshFHZORmB
h9ifgCkupX6yXp7UyGJpV7i3eGif+atL9gWh1hsa6jsSNQ8FCwOw5mAQCdqOmU6RrSGrz7Qyr9Uc
6mSMM+YzzsGXgn0YykITWfVB1JCnwtADaVgw3zcdaxSgxWNUvLY4KnTc/FIrDicRjd0UKIcpzoke
YLj41Oe/EdO7beoQwEfEsatGjM6REeXUD0hDQk2wJq6bhGkjSXsweyUgOwBXu5w2NyFGSraAnfaS
Kj180x+kCFCFR0hSh6C+adbZll40VtfzuEQEwC1F88QPFzbpy1Nps4XBXKjMDDzDtAY4m0HfgRuO
SJH/i7kinChIOyGh1gA=


--===============4660933860049529831==--