summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2003-10-03 17:22:47 -0400
committerunknown <vva@eagle.mysql.r18.ru>2003-10-03 17:22:47 -0400
commitffc5c6692763ca104b160c69b2a8148d41fb617d (patch)
treeb7d4f40b06d76675f433da985d217958e6587b2e /sql
parent9a0b864a23d1d1a17e32e63a2089d67633a82957 (diff)
parentc9c6ae3872af0758f50c3b302bc81fe6e7d5c603 (diff)
downloadmariadb-git-ffc5c6692763ca104b160c69b2a8148d41fb617d.tar.gz
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
Diffstat (limited to 'sql')
-rw-r--r--sql/item_sum.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 78d887782e2..c6fed46a338 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -387,7 +387,7 @@ class Item_sum_hybrid :public Item_sum
Item_sum(thd, item), value(item.value), tmp_value(item.tmp_value),
sum(item.sum), sum_int(item.sum_int), hybrid_type(item.hybrid_type),
hybrid_field_type(item.hybrid_field_type),cmp_sign(item.cmp_sign),
- used_table_cache(used_table_cache), cmp_charset(item.cmp_charset) {}
+ used_table_cache(item.used_table_cache), cmp_charset(item.cmp_charset) {}
bool fix_fields(THD *, TABLE_LIST *, Item **);
table_map used_tables() const { return used_table_cache; }
bool const_item() const { return !used_table_cache; }