bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3241 to 3242)

[Ole John Aske]

 3242 Ole John Aske	2010-08-24
      Try to remove compiler warning in order to get Club status 'green'
      
      static function get_referred_table_access_name() was only used inside DBUG_PRINT(), and 
      should therefore only be defined when we are compiling without 'DBUG_OFF'.

    modified:
      sql/ha_ndbcluster.cc
 3241 Ole John Aske	2010-08-24
      Try to avoid creating 'bushy scans' by serialize scans as much as possible when defining a NdbQueryDef.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-08-24 09:45:21 +0000
+++ b/sql/ha_ndbcluster.cc	2010-08-24 11:35:20 +0000
@@ -645,11 +645,14 @@ static const char* get_referred_field_na
   DBUG_ASSERT(field_item->type() == Item::FIELD_ITEM);
   return field_item->field->field_name;
 }
+
+#if !defined(DBUG_OFF)
 static const char* get_referred_table_access_name(const Item_field* field_item)
 {
   DBUG_ASSERT(field_item->type() == Item::FIELD_ITEM);
   return field_item->field->table->alias;
 }
+#endif
 
 static bool is_lookup_operation(AQP::enum_access_type accessType)
 {


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