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

System Versioning 1.0 pre8

Browse Source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov
2018-01-10 12:36:55 +03:00
parent 26971c9aea 0b597d3ab2
commit c59c1a0736
353 changed files with 12715 additions and 8094 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;