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.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-03-28 17:06:27 +02:00
parent c346029958 aafb9d44d6
commit b1818dccf7
344 changed files with 8784 additions and 6890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_union.cc
View File

@ -976,7 +976,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
*/
if (sl == first_sl)
{
if (is_recursive)
if (with_element)
{
if (derived->with->rename_columns_of_derived_unit(thd, this))
goto err;