database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Removed call to cond_push for empty cond

Browse Source
This commit is contained in:
unknown
2005-05-08 22:42:40 +02:00
parent c6ac6aa559
commit facce9257b
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/ha_ndbcluster.cc
View File

@@ -6106,24 +6106,21 @@ COND*
ha_ndbcluster::cond_push(const COND *cond) ha_ndbcluster::cond_push(const COND *cond)
{ {
DBUG_ENTER("cond_push"); DBUG_ENTER("cond_push");
if (cond) Ndb_cond_stack *ndb_cond = new Ndb_cond_stack();
{ DBUG_EXECUTE("where",print_where((COND *)cond, m_tabname););
Ndb_cond_stack *ndb_cond = new Ndb_cond_stack(); if (m_cond_stack)
DBUG_EXECUTE("where",print_where((COND *)cond, m_tabname););
if (m_cond_stack)
ndb_cond->next= m_cond_stack; ndb_cond->next= m_cond_stack;
else else
ndb_cond->next= NULL; ndb_cond->next= NULL;
m_cond_stack= ndb_cond; m_cond_stack= ndb_cond;
if (serialize_cond(cond, ndb_cond)) if (serialize_cond(cond, ndb_cond))
{ {
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
} }
else else
{ {
cond_pop(); cond_pop();
}
} }
DBUG_RETURN(cond); DBUG_RETURN(cond);
} }

9
sql/sql_select.cc
View File

@@ -5406,9 +5406,12 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
COND *push_cond= COND *push_cond=
make_cond_for_table(cond,current_map,current_map); make_cond_for_table(cond,current_map,current_map);
tab->table->file->pushed_cond= NULL; tab->table->file->pushed_cond= NULL;
/* Push condition to handler */ if (push_cond)
if (!tab->table->file->cond_push(push_cond)) {
tab->table->file->pushed_cond= push_cond; /* Push condition to handler */
if (!tab->table->file->cond_push(push_cond))
tab->table->file->pushed_cond= push_cond;
}
} }
} }
else else