svnno****@sourc*****
svnno****@sourc*****
2008年 6月 11日 (水) 10:30:18 JST
Revision: 140
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=140
Author: mir
Date: 2008-06-11 10:30:18 +0900 (Wed, 11 Jun 2008)
Log Message:
-----------
fixed bug for 2ind + sum(), this fix should be better than r135.
Modified Paths:
--------------
tags/tritonn-1.0.10-mysql-5.0.51a/sql/sql_select.cc
-------------- next part --------------
Modified: tags/tritonn-1.0.10-mysql-5.0.51a/sql/sql_select.cc
===================================================================
--- tags/tritonn-1.0.10-mysql-5.0.51a/sql/sql_select.cc 2008-06-10 09:20:15 UTC (rev 139)
+++ tags/tritonn-1.0.10-mysql-5.0.51a/sql/sql_select.cc 2008-06-11 01:30:18 UTC (rev 140)
@@ -10458,7 +10458,8 @@
decide_read_or_skip(JOIN *join,JOIN_TAB *join_tab,bool needs_record)
{
if (needs_record || (my_thread_var->sen_flags & (SENNA_DISTINCT | SENNA_FIRST_CALL)) ||
- (!join->unit->offset_limit_cnt &&
+ (*join->sum_funcs && (*join->sum_funcs)->sum_func() != Item_sum::COUNT_FUNC &&
+ !join->unit->offset_limit_cnt &&
join->send_records < join->unit->select_limit_cnt)) {
DEBUG_2IND(my_thread_var->sen_flags |= SENNA_IF_READ_RECORD);
} else {