Commit d595a91b authored by Sergei Petrunia's avatar Sergei Petrunia

Fix a merge typo

parent 7b70cbd8
...@@ -13874,7 +13874,7 @@ static int compare_fields_by_table_order(Item *field1, ...@@ -13874,7 +13874,7 @@ static int compare_fields_by_table_order(Item *field1,
Item_field *f2= (Item_field *) field2_real; Item_field *f2= (Item_field *) field2_real;
if (f1->used_tables() & OUTER_REF_TABLE_BIT) if (f1->used_tables() & OUTER_REF_TABLE_BIT)
{ {
outer_ref= -1; outer_ref= 1;
cmp= -1; cmp= -1;
} }
if (f2->used_tables() & OUTER_REF_TABLE_BIT) if (f2->used_tables() & OUTER_REF_TABLE_BIT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment