diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-10-30 15:56:52 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-10-30 15:56:52 +0200 |
| commit | b90ae6fdc2486a981f06a07bf28a8ff8a471f24b (patch) | |
| tree | b32302fccdf1e6bb34e0c474e6f85a09c028b7c6 /sql | |
| parent | 87e6c2ba77a514456f9f33e69984d67d0a588469 (diff) | |
| parent | a4161274ef18a38eff95272cf9f05f46fb08fcb7 (diff) | |
| download | mariadb-git-b90ae6fdc2486a981f06a07bf28a8ff8a471f24b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 | ||||
| -rw-r--r-- | sql/item_sum.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1731f5859b3..b73a3b990fa 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -429,6 +429,7 @@ bool Item_in_optimizer::fix_left(THD *thd, not_null_tables_cache= args[0]->not_null_tables(); with_sum_func= args[0]->with_sum_func; const_item_cache= args[0]->const_item(); + fixed= 1; return 0; } diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e5f88156c2d..74dd95bf0ab 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1830,7 +1830,7 @@ bool Item_func_group_concat::setup(THD *thd) if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) 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; for (uint i= 0; i < arg_count; i++) |