Merge for condition pushdown

sql/ha_ndbcluster.cc

@@ -228,7 +228,7 @@ Ndb_item::Ndb_item(NDB_ITEM_TYPE item_type,
       break;
     case(Item::VARBIN_ITEM): {
       Ndb_item_string_value *string_value = new Ndb_item_string_value();
-      Item_varbinary *varbin_item= (Item_varbinary *)item_value;
+      Item_bin_string *varbin_item= (Item_bin_string *)item_value;
       string_value->s= varbin_item->str_value;
       string_value->c= varbin_item->collation.collation;
       value.string_value= string_value;

sql/ha_ndbcluster.h

@@ -383,9 +383,9 @@ class ha_ndbcluster: public handler
   void generate_scan_filter(Ndb_cond_stack* cond_stack, 
 			    NdbScanOperation* op);
 
-  friend int execute_commit(ha_ndbcluster*, NdbConnection*);
-  friend int execute_no_commit(ha_ndbcluster*, NdbConnection*);
-  friend int execute_no_commit_ie(ha_ndbcluster*, NdbConnection*);
+  friend int execute_commit(ha_ndbcluster*, NdbTransaction*);
+  friend int execute_no_commit(ha_ndbcluster*, NdbTransaction*);
+  friend int execute_no_commit_ie(ha_ndbcluster*, NdbTransaction*);
 
   NdbTransaction *m_active_trans;
   NdbScanOperation *m_active_cursor;