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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-09-04 18:44:44 +03:00
parent 938db04898 7f8cd326c6
commit 5ff7e68c7e
94 changed files with 2110 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_union.cc
View File

@ -2721,6 +2721,8 @@ bool st_select_lex::cleanup()
bool error= FALSE;
DBUG_ENTER("st_select_lex::cleanup()");
DBUG_PRINT("info", ("select: %p (%u) JOIN %p",
this, select_number, join));
cleanup_order(order_list.first);
cleanup_order(group_list.first);
cleanup_ftfuncs(this);