summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2007-01-25 02:27:28 +0300
committerunknown <sergefp@mysql.com>2007-01-25 02:27:28 +0300
commita34166065de1ba4180a6c7c1c46dfa09ddd34954 (patch)
treed3106a34e012b2eae4d1449df54246b8fad4cd40
parent130523af45fed617e44d454e3901cf5a560ccd90 (diff)
downloadmariadb-git-a34166065de1ba4180a6c7c1c46dfa09ddd34954.tar.gz
BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...):
Fixed typo problem that surfaced after the merge
-rw-r--r--sql/sql_select.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 19034c44ba0..dbfdb783c9a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2973,14 +2973,14 @@ add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level,
if (cond->type() == Item::FUNC_ITEM &&
((Item_func*)cond)->functype() == Item_func::TRIG_COND_FUNC)
{
- cond= ((Item_func*)cond)->arguments()[0];
+ Item *cond_arg= ((Item_func*)cond)->arguments()[0];
if (!join->group_list && !join->order &&
join->unit->item &&
join->unit->item->substype() == Item_subselect::IN_SUBS &&
!join->unit->first_select()->next_select())
{
KEY_FIELD *save= *key_fields;
- add_key_fields(join, key_fields, and_level, cond, usable_tables,
+ add_key_fields(join, key_fields, and_level, cond_arg, usable_tables,
sargables);
// Indicate that this ref access candidate is for subquery lookup:
for (; save != *key_fields; save++)