diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 12:02:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 12:02:07 +0300 |
| commit | 97a4a3872e5037b8db1e8c27152740190330ab9c (patch) | |
| tree | 4ac50bc687f7f1e55f4d4ff25e8a96555501e2bf /sql/item_subselect.cc | |
| parent | 8f8f2aea93835899345454f87768fd649749e29c (diff) | |
| parent | 1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (diff) | |
| download | mariadb-git-97a4a3872e5037b8db1e8c27152740190330ab9c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 9525019888d..334fec2e048 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -6361,6 +6361,9 @@ subselect_rowid_merge_engine::init(MY_BITMAP *non_null_key_parts, while (TRUE) { error= tmp_table->file->ha_rnd_next(tmp_table->record[0]); + + if (error == HA_ERR_ABORTED_BY_USER) + break; /* This is a temp table that we fully own, there should be no other cause to stop the iteration than EOF. |