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

[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

 3324 Ole John Aske	2010-10-26
      Fixed buildfailure after previous commit:
      
      get_referred_table_access_name() is now also used wo/ DBUG code as part of EXPLAIN_NO_PUSH() - Removed
      enclosing '#if !defined(DBUG_OFF)' around this function.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-10-26 09:21:10 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-26 09:42:11 +0000
@@ -689,13 +689,11 @@ static const char* get_referred_field_na
   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]