1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
This commit is contained in:
unknown 2003-10-30 15:56:52 +02:00
commit b90ae6fdc2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/item_cmpfunc.cc
View File

@ -429,6 +429,7 @@ bool Item_in_optimizer::fix_left(THD *thd,
not_null_tables_cache= args[0]->not_null_tables(); not_null_tables_cache= args[0]->not_null_tables();
with_sum_func= args[0]->with_sum_func; with_sum_func= args[0]->with_sum_func;
const_item_cache= args[0]->const_item(); const_item_cache= args[0]->const_item();
fixed= 1;
return 0; return 0;
} }

2
sql/item_sum.cc
View File

@ -1830,7 +1830,7 @@ bool Item_func_group_concat::setup(THD *thd)
if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) if (select_lex->linkage == GLOBAL_OPTIONS_TYPE)
DBUG_RETURN(1); DBUG_RETURN(1);
/* /*
all not constant fields are push to list and create temp table push all not constant fields to list and create temp table
*/ */
always_null= 0; always_null= 0;
for (uint i= 0; i < arg_count; i++) for (uint i= 0; i < arg_count; i++)