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 branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-23 22:36:46 +01:00
parent a75d269464 2783fc7d14
commit f67a2211ec
298 changed files with 4436 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_union.cc
View File

@ -1160,11 +1160,22 @@ List<Item> *st_select_lex_unit::get_unit_column_types()
return &sl->item_list;
}
static void cleanup_order(ORDER *order)
{
for (; order; order= order->next)
order->counter_used= 0;
}
bool st_select_lex::cleanup()
{
bool error= FALSE;
DBUG_ENTER("st_select_lex::cleanup()");
cleanup_order(order_list.first);
cleanup_order(group_list.first);
if (join)
{
DBUG_ASSERT((st_select_lex*)join->select_lex == this);