mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 19:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

MySQL-5.5.35 merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-01-22 15:29:36 +01:00
commit 37d240ecf9
90 changed files with 864 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item_sum.cc
View file

@ -1579,8 +1579,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;
}