1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bug in count(distinct)

Browse Source
This commit is contained in:
sasha@mysql.sashanet.com 2001-05-24 18:00:52 -06:00
parent 072cca77b2
commit 8a3f87ab07
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item_sum.cc
View File

@ -986,9 +986,12 @@ bool Item_sum_count_distinct::add()
{ {
// if the tree got too big, convert to MyISAM, otherwise // if the tree got too big, convert to MyISAM, otherwise
// insert into the tree // insert into the tree
if((tree.elements_in_tree > max_elements_in_tree && tree_to_myisam()) if(tree.elements_in_tree > max_elements_in_tree)
|| {
!tree_insert(&tree, table->record[0] + rec_offset, 0)) if(tree_to_myisam())
return 1;
}
else if(!tree_insert(&tree, table->record[0] + rec_offset, 0))
return 1; return 1;
} }
else if ((error=table->file->write_row(table->record[0]))) else if ((error=table->file->write_row(table->record[0])))