database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed merge problems to allow mysql-test suite 'main' to pass

Browse Source
This commit is contained in:
Galina Shalygina
2016-05-10 22:32:02 +03:00
parent f516b966e1
commit d0e973a3b0
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_union.cc
View File

@ -1285,7 +1285,7 @@ bool st_select_lex_unit::cleanup()
if (with_element && with_element->is_recursive)
with_element->mark_as_cleaned();
if (union_result && !(with_element->is_recursive))
if (union_result && !(with_element &&with_element->is_recursive))
{
delete union_result;
union_result=0; // Safety