summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-03-11 14:29:59 +0200
committerGeorgi Kodinov <joro@sun.com>2009-03-11 14:29:59 +0200
commitba1b5eb4b5149293df466f8713c02f2614dd22f4 (patch)
tree1833fea621f6e100c4be1abf244ade1bf17c8f5a /sql/item_sum.cc
parent16d7c26b7139fd6ae0ef05b0b2cbf3286de06582 (diff)
parentd3d6f4fdad8176abe0d8981d79a925731df9a5d0 (diff)
downloadmariadb-git-ba1b5eb4b5149293df466f8713c02f2614dd22f4.tar.gz
merged bug 43354 to 5.1-bugteam
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 1821136cc9d..a6d8bb8a52d 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -439,7 +439,8 @@ void Item_sum::make_field(Send_field *tmp_field)
void Item_sum::print(String *str, enum_query_type query_type)
{
- Item **pargs= orig_args;
+ /* orig_args is not filled with valid values until fix_fields() */
+ Item **pargs= fixed ? orig_args : args;
str->append(func_name());
for (uint i=0 ; i < arg_count ; i++)
{