Commit facce925 authored by unknown's avatar unknown
Browse files

Removed call to cond_push for empty cond

parent c6ac6aa5

sql/ha_ndbcluster.cc

+13 −16
Original line number Diff line number Diff line
@@ -6106,8 +6106,6 @@ COND* 
ha_ndbcluster::cond_push(const COND *cond) 

{ 

  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)
@@ -6124,7 +6122,6 @@ ha_ndbcluster::cond_push(const COND *cond) 
  {

    cond_pop();

  }

  }

  DBUG_RETURN(cond); 

}

sql/sql_select.cc

+6 −3
Original line number Diff line number Diff line
@@ -5406,11 +5406,14 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) 
            COND *push_cond= 

              make_cond_for_table(cond,current_map,current_map);

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

            if (push_cond)

            {

              /* Push condition to handler */

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

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

            }

          }

        }

        else

          tab->select_cond= sel->cond= NULL;