bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3481)

[Ole John Aske]

#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);
 


Attachment: [text/bzr-bundle] bzr/[e-mail]