diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
| commit | fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf (patch) | |
| tree | 0c7d096327ae1ce637c2042f7daee1589cf36e90 /sql/sql_union.cc | |
| parent | 6feb74c4b21143ece69bcc1e04474a528f122cdb (diff) | |
| parent | 6d49ef49e57708b4bbc6b428c9e6228685e59452 (diff) | |
| download | mariadb-git-fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index d987636a2ac..3a96e958f56 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -68,14 +68,14 @@ void select_unit::change_select() curr_sel= current_select_number; /* New SELECT processing starts */ DBUG_ASSERT(table->file->inited == 0); - switch (thd->lex->current_select->linkage) + step= thd->lex->current_select->linkage; + switch (step) { case INTERSECT_TYPE: intersect_mark->value= prev_step= curr_step; curr_step= current_select_number; - /* fall through */ + break; case EXCEPT_TYPE: - step= thd->lex->current_select->linkage; break; default: step= UNION_TYPE; |