diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
commit | 6373ec3ec74515574f8a08535ed0d090b13d9122 (patch) | |
tree | d2a7393afdf99b7b609a9c911e16a121c862b403 /sql/sql_select.cc | |
parent | e709eb9bf712006d070767629518f827cd2f6bed (diff) | |
parent | d595a91bc6bfb9f9c38bf91738b2a563d80c62e0 (diff) | |
download | mariadb-git-6373ec3ec74515574f8a08535ed0d090b13d9122.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0d47aee9882..87a45a1baed 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14554,7 +14554,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) |