summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-05 22:48:09 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-05 22:48:09 +0200
commit6d49ef49e57708b4bbc6b428c9e6228685e59452 (patch)
tree3f9270c1116ec802c012c562bd7aede5c83dfc9b
parentf77fe24d2daf911417d1e40b4d8eb7be8a8ba12f (diff)
downloadmariadb-git-6d49ef49e57708b4bbc6b428c9e6228685e59452.tar.gz
Fix a -Wimplicit-fallthrough warning
-rw-r--r--sql/sql_union.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index e637110c798..3903f3e8d9e 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -68,13 +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;
+ break;
case EXCEPT_TYPE:
- step= thd->lex->current_select->linkage;
break;
default:
step= UNION_TYPE;