Commit 29929bb6 authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-4.1--team 

into  chilla.local:/home/mydev/mysql-4.1-bug12240
parents 679b5848 ddc5ae38

sql/sql_select.cc

+18 −6
Original line number Diff line number Diff line
@@ -1172,11 +1172,12 @@ JOIN::exec() 
    DBUG_VOID_RETURN;

  }

  /*

    don't reset the found rows count if there're no tables

    as FOUND_ROWS() may be called.

    Don't reset the found rows count if there're no tables as

    FOUND_ROWS() may be called. Never reset the examined row count here.

    It must be accumulated from all join iterations of all join parts.

  */

  if (tables)

    thd->limit_found_rows= thd->examined_row_count= 0;

    thd->limit_found_rows= 0;



  if (zero_result_cause)

  {
@@ -1224,6 +1225,12 @@ JOIN::exec() 
  List<Item> *curr_all_fields= &all_fields;

  List<Item> *curr_fields_list= &fields_list;

  TABLE *curr_tmp_table= 0;

  /*

    Initialize examined rows here because the values from all join parts

    must be accumulated in examined_row_count. Hence every join

    iteration must count from zero.

  */

  curr_join->examined_rows= 0;



  /* Create a tmp table if distinct or if the sort is too complicated */

  if (need_tmp)
@@ -1572,7 +1579,10 @@ JOIN::exec() 
  error= thd->net.report_error ? -1 :

    do_select(curr_join, curr_fields_list, NULL, procedure);

  thd->limit_found_rows= curr_join->send_records;

  thd->examined_row_count= curr_join->examined_rows;

  /* Accumulate the counts from all join iterations of all join parts. */

  thd->examined_row_count+= curr_join->examined_rows;

  DBUG_PRINT("counts", ("thd->examined_row_count: %lu",

                        (ulong) thd->examined_row_count));

  DBUG_VOID_RETURN;

}
@@ -6179,6 +6189,8 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) 
	return -2;				/* purecov: inspected */

      }

      join->examined_rows++;

      DBUG_PRINT("counts", ("join->examined_rows++: %lu",

                            (ulong) join->examined_rows));

      join->thd->row_count++;

      if (!on_expr || on_expr->val_int())

      {