summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2020-01-17 18:39:00 +0300
committerSergei Petrunia <psergey@askmonty.org>2020-01-17 18:39:00 +0300
commitd595a91bc6bfb9f9c38bf91738b2a563d80c62e0 (patch)
treec3efb8a41dd8e318d8e5a8b2fffb87526584d251
parent7b70cbd8389083eed22bba6526e32ab24dc61083 (diff)
downloadmariadb-git-d595a91bc6bfb9f9c38bf91738b2a563d80c62e0.tar.gz
Fix a merge typo
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 44ac1056a8a..59bb4ac1e81 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13874,7 +13874,7 @@ static int compare_fields_by_table_order(Item *field1,
Item_field *f2= (Item_field *) field2_real;
if (f1->used_tables() & OUTER_REF_TABLE_BIT)
{
- outer_ref= -1;
+ outer_ref= 1;
cmp= -1;
}
if (f2->used_tables() & OUTER_REF_TABLE_BIT)