diff options
| -rw-r--r-- | sql/ha_ndbcluster.cc | 29 | ||||
| -rw-r--r-- | sql/sql_select.cc | 9 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e175b2b95f9..372a178b59a 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6106,24 +6106,21 @@ 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) + 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; - else - ndb_cond->next= NULL; - m_cond_stack= ndb_cond; - - if (serialize_cond(cond, ndb_cond)) - { + else + ndb_cond->next= NULL; + m_cond_stack= ndb_cond; + + if (serialize_cond(cond, ndb_cond)) + { DBUG_RETURN(NULL); - } - else - { - cond_pop(); - } + } + else + { + cond_pop(); } DBUG_RETURN(cond); } diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1503639669e..47c7de6eba7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5406,9 +5406,12 @@ 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; - /* Push condition to handler */ - if (!tab->table->file->cond_push(push_cond)) - tab->table->file->pushed_cond= push_cond; + if (push_cond) + { + /* Push condition to handler */ + if (!tab->table->file->cond_push(push_cond)) + tab->table->file->pushed_cond= push_cond; + } } } else |