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

merge

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-05-05 22:30:01 +03:00
parent 62fca61bc4 4e2b94dea6
commit 26f0825cae
76 changed files with 1038 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_union.cc
View File

@ -366,8 +366,6 @@ int st_select_lex_unit::exec()
optimized= 1;
/* Send result to 'result' */
res= -1;
{
List<Item_func_match> empty_list;
@ -395,7 +393,7 @@ int st_select_lex_unit::exec()
if (!join)
{
/*
allocate JOIN for fake select only once (privent
allocate JOIN for fake select only once (prevent
mysql_select automatic allocation)
*/
if (!(fake_select_lex->join= new JOIN(thd, item_list, thd->options,