diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-01 16:20:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-01 16:20:23 +0300 |
| commit | 4d51ca63867e0d082ec25548ce9c6b4418407dd0 (patch) | |
| tree | a386fe447939dc83efdb8f70f3cccb6d39e08610 /sql/sql_select.cc | |
| parent | ebafe5a2367478413bd582487c9afc18ccd7f4f7 (diff) | |
| parent | 94e9dc95d4bebf711f001e16bbb53fd8d6a58b8c (diff) | |
| download | mariadb-git-4d51ca63867e0d082ec25548ce9c6b4418407dd0.tar.gz | |
Merge 10.1 into 10.2
This also fixes MDEV-20464.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 96e9602d77d..19a9cdad184 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -21924,6 +21924,9 @@ check_reverse_order: else if (select && select->quick) select->quick->need_sorted_output(); + tab->read_record.unlock_row= (tab->type == JT_EQ_REF) ? + join_read_key_unlock_row : rr_unlock_row; + } // QEP has been modified /* |