dbms: fixed error [#CONV-2944].

This commit is contained in:
Alexey Milovidov 2012-09-12 19:58:38 +00:00
parent c584e302e5
commit 20d1415938

View File

@ -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)