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 10.3 into 10.4

Browse Source 
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
This commit is contained in:
Marko Mäkelä
2019-09-23 17:35:29 +03:00
parent c997af7d1f c016ea660e
commit 5a92ccbaea
101 changed files with 1292 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_union.cc
View File

@ -1875,6 +1875,7 @@ bool st_select_lex_unit::cleanup()
DBUG_RETURN(FALSE);
}
}
columns_are_renamed= false;
cleaned= 1;
for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select())