database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-05 22:52:06 +02:00
parent 6feb74c4b2 6d49ef49e5
commit fa7d85bb87
73 changed files with 2051 additions and 5588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_union.cc
View File

@ -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;