From 20d14159380e441ca103ef352438d8c8a7ca14e0 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Wed, 12 Sep 2012 19:58:38 +0000 Subject: [PATCH] dbms: fixed error [#CONV-2944]. --- dbms/src/Interpreters/Aggregator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp index 4bb121b0352..721f46703f8 100644 --- a/dbms/src/Interpreters/Aggregator.cpp +++ b/dbms/src/Interpreters/Aggregator.cpp @@ -514,7 +514,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va } } else - res_it->second = it->second; + new(&res_it->second) AggregateFunctionsPlainPtrs(it->second); } } else if (res->type == AggregatedDataVariants::KEY_STRING) @@ -538,7 +538,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va } } else - res_it->second = it->second; + new(&res_it->second) AggregateFunctionsPlainPtrs(it->second); } } else if (res->type == AggregatedDataVariants::HASHED) @@ -562,7 +562,7 @@ AggregatedDataVariantsPtr Aggregator::merge(ManyAggregatedDataVariants & data_va } } else - res_it->second = it->second; + new(&res_it->second) AggregatedDataHashed::mapped_type(it->second); } } else if (res->type == AggregatedDataVariants::GENERIC)