5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-01 00:54:03 +01:00
commit 59d9d08e2b
304 changed files with 12471 additions and 940 deletions

View file

@ -1595,8 +1595,12 @@ void Item_sum_count::clear()
bool Item_sum_count::add()
{
if (!args[0]->maybe_null || !args[0]->is_null())
count++;
for (uint i=0; i<arg_count; i++)
{
if (args[i]->maybe_null && args[i]->is_null())
return 0;
}
count++;
return 0;
}