Commit 0410766f authored by unknown's avatar unknown
Browse files

Removed double cond_push

parent 2275c048

sql/ha_ndbcluster.cc

+16 −14
Original line number Diff line number Diff line
@@ -6101,8 +6101,10 @@ const 
COND* 

ha_ndbcluster::cond_push(const COND *cond) 

{ 

  Ndb_cond_stack *ndb_cond = new Ndb_cond_stack();

  DBUG_ENTER("cond_push");

  if (cond)

  {

    Ndb_cond_stack *ndb_cond = new Ndb_cond_stack();

    DBUG_EXECUTE("where",print_where((COND *)cond, m_tabname););

    if (m_cond_stack)

    ndb_cond->next= m_cond_stack;
@@ -6118,7 +6120,7 @@ ha_ndbcluster::cond_push(const COND *cond) 
    {

      cond_pop();

    }



  }

  DBUG_RETURN(cond); 

}

sql/sql_select.cc

+4 −9
Original line number Diff line number Diff line
@@ -5403,10 +5403,12 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) 
          tab->select_cond=sel->cond=tmp;

	  if (thd->variables.engine_condition_pushdown)

          {

            COND *push_cond= 

              make_cond_for_table(cond,current_map,current_map);

            tab->table->file->pushed_cond= NULL;

	    /* Push condition to handler */

            if (!tab->table->file->cond_push(tmp))

              tab->table->file->pushed_cond= tmp;

            if (!tab->table->file->cond_push(push_cond))

              tab->table->file->pushed_cond= push_cond;

          }

        }

        else
@@ -5530,13 +5532,6 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) 
		thd->memdup((gptr) sel, sizeof(SQL_SELECT));

	      tab->cache.select->cond=tmp;

	      tab->cache.select->read_tables=join->const_table_map;

	      if (thd->variables.engine_condition_pushdown &&

		  (!tab->table->file->pushed_cond))

              {

		/* Push condition to handler */

		if (!tab->table->file->cond_push(tmp))

                  tab->table->file->pushed_cond= tmp;

              }

	    }

	  }

	}