diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-12 16:24:11 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-12 16:24:11 +0300 |
| commit | eb261517a38fa146ca974f125e667eb434a2bcec (patch) | |
| tree | c960ae314f3d83cc192505e90c0434abb2a1d15c /sql | |
| parent | de861db3e73b72a01eceed23095c4793f893d6c4 (diff) | |
| parent | 01925fa550d93778cdf009fe5a5f59eed14d8652 (diff) | |
| download | mariadb-git-eb261517a38fa146ca974f125e667eb434a2bcec.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5db4a0042ea..c330d1e6b54 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -367,7 +367,7 @@ JOIN::prepare(Item ***rref_pointer_array, { if (item->with_sum_func) flag|=1; - else if (!(flag & 2) && !item->const_item()) + else if (!(flag & 2) && !item->const_during_execution()) flag|=2; } if (flag == 3) |