diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
| commit | 210a412522b10115d34b431c66acf403faab7bfe (patch) | |
| tree | 56c09cfd1053265897d114e4acb52d395185f27e /sql/item_sum.cc | |
| parent | 059b9356a19118a48fbad31be81c4859e15d3bc8 (diff) | |
| parent | 4aeeb1d157a67c5359475d8941267641fb894b22 (diff) | |
| download | mariadb-git-210a412522b10115d34b431c66acf403faab7bfe.tar.gz | |
bzr merge from guilhem's maria tree to our local 5.1
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index bae01542d5c..21501d9becf 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++) { |