database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
This commit is contained in:
unknown
2004-05-05 21:24:45 +03:00
parent b30d0883b1 000f76cfb8
commit e5d43578fd
72 changed files with 1031 additions and 465 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;
@@ -404,7 +402,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,