svnno****@sourc*****
svnno****@sourc*****
2008年 1月 23日 (水) 17:32:59 JST
Revision: 87
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=87
Author: mir
Date: 2008-01-23 17:32:57 +0900 (Wed, 23 Jan 2008)
Log Message:
-----------
Fixed a bug: sen_flags for 2ind in sql/sql_select.cc.
Modified Paths:
--------------
tags/tritonn-1.0.9-mysql-5.0.51/sql/sql_select.cc
Modified: tags/tritonn-1.0.9-mysql-5.0.51/sql/sql_select.cc
===================================================================
--- tags/tritonn-1.0.9-mysql-5.0.51/sql/sql_select.cc 2008-01-22 09:08:15 UTC (rev 86)
+++ tags/tritonn-1.0.9-mysql-5.0.51/sql/sql_select.cc 2008-01-23 08:32:57 UTC (rev 87)
@@ -2324,6 +2324,9 @@
}
err:
+#ifdef ENABLE_SENNA
+ my_thread_var->sen_flags &= SENNA_USE_2IND;
+#endif
if (free_join)
{
thd_proc_info(thd, "end");
@@ -10645,7 +10648,8 @@
join->thd->row_count= 0;
#ifdef ENABLE_SENNA
- decide_read_or_skip(join, join_tab, needs_record);
+ if (my_thread_var->sen_flags & SENNA_USE_2IND)
+ decide_read_or_skip(join, join_tab, needs_record);
#endif /* ENABLE_SENNA */
error= (*join_tab->read_first_record)(join_tab);
rc= evaluate_join_record(join, join_tab, error, report_error);
@@ -10654,7 +10658,8 @@
while (rc == NESTED_LOOP_OK)
{
#ifdef ENABLE_SENNA
- decide_read_or_skip(join, join_tab, needs_record);
+ if (my_thread_var->sen_flags & SENNA_USE_2IND)
+ decide_read_or_skip(join, join_tab, needs_record);
#endif /* ENABLE_SENNA */
error= info->read_record(info);
rc= evaluate_join_record(join, join_tab, error, report_error);