From d595a91bc6bfb9f9c38bf91738b2a563d80c62e0 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Fri, 17 Jan 2020 18:39:00 +0300
Subject: Fix a merge typo

---
 sql/sql_select.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_select.cc')

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)
-- 
cgit v1.2.1