diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-11-25 16:18:46 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-11-25 16:18:46 +0400 |
| commit | 026259249e716fad2923218055afdb32c1ea3776 (patch) | |
| tree | 1e3e049ffa58df843452e98f70d56e73ef735ef9 /sql/item_sum.h | |
| parent | 897b7cbd4421277a6d35f38f230179a76fd8d683 (diff) | |
| parent | 3f07afbea005900c185a769ea23381f1bba0ef23 (diff) | |
| download | mariadb-git-026259249e716fad2923218055afdb32c1ea3776.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
sql/item_func.cc:
Auto merged
sql/item_sum.h:
Auto merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index f9c48304795..521c595712b 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -531,7 +531,7 @@ public: :Item_sum( list ), udf(udf_arg) { quick_group=0;} Item_udf_sum(THD *thd, Item_udf_sum *item) - :Item_sum(thd, item), udf(item->udf) {} + :Item_sum(thd, item), udf(item->udf) { udf.not_original= TRUE; } const char *func_name() const { return udf.name(); } bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { |