Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/opt_subselect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6863,7 +6863,7 @@ bool Item::pushable_equality_checker_for_subquery(uchar *arg)
NULL if the matching Field_pair wasn't found.
*/

Field_pair *find_matching_field_pair(Item *item, List<Field_pair> pair_list)
Field_pair *find_matching_field_pair(Item *item, List<Field_pair> &pair_list)
{
Field_pair *field_pair= get_corresponding_field_pair(item, pair_list);
if (field_pair)
Expand Down
2 changes: 1 addition & 1 deletion sql/sql_lex.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11310,7 +11310,7 @@ st_select_lex::build_pushable_cond_for_having_pushdown(THD *thd, Item *cond)
*/

Field_pair *get_corresponding_field_pair(Item *item,
List<Field_pair> pair_list)
List<Field_pair> &pair_list)
{
DBUG_ASSERT(item->type() == Item::DEFAULT_VALUE_ITEM ||
item->type() == Item::FIELD_ITEM ||
Expand Down
4 changes: 2 additions & 2 deletions sql/sql_lex.h
Original file line number Diff line number Diff line change
Expand Up @@ -1099,8 +1099,8 @@ class Field_pair :public Sql_alloc
};

Field_pair *get_corresponding_field_pair(Item *item,
List<Field_pair> pair_list);
Field_pair *find_matching_field_pair(Item *item, List<Field_pair> pair_list);
List<Field_pair> &pair_list);
Field_pair *find_matching_field_pair(Item *item, List<Field_pair> & pair_list);


#define TOUCHED_SEL_COND 1/* WHERE/HAVING/ON should be reinited before use */
Expand Down