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

[Ole John Aske]

#At file:///home/oa136780/mysql/mysql-5.1-telco-7.0-spj/ based on revid:ole.john.aske@stripped

 2996 Ole John Aske	2009-11-23
      Windows compiler warning - which turned out to be a real error.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-11-23 08:06:38 +0000
+++ b/sql/ha_ndbcluster.cc	2009-11-23 09:06:50 +0000
@@ -229,7 +229,7 @@ field_ref_is_join_pushable(const JOIN_TA
 {
   DBUG_ENTER("field_ref_is_join_pushable");
 
-  if (join_tabs[inx].type != JT_EQ_REF & join_tabs[inx].type != JT_CONST)
+  if (join_tabs[inx].type != JT_EQ_REF && join_tabs[inx].type != JT_CONST)
     DBUG_RETURN(false);
 
   TABLE* parent= NULL;
@@ -394,7 +394,7 @@ ha_ndbcluster::make_pushed_join(struct s
 
       QUICK_SELECT_I *quick = join_root.select->quick;
       DBUG_EXECUTE("info", quick->dbug_dump(0, true););
-      DBUG_ASSERT (!quick->sorted);
+//    DBUG_ASSERT (!quick->sorted);  -- TODO: Don't handle ordered scans yet, let it through anyway
 
       // Bounds will be generated and supplied during execute
       operationDefs[0]= builder.scanIndex(m_index[quick->index].index, m_table);


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