Commit 44a2a213 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Changed time -> query_time in slow query log. 

Fixed Rows_examined in slow query log.
parent 0716bf4d

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -46843,6 +46843,8 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.44

@itemize @bullet

@item

Fixed @code{Rows_examined} count in slow query log.

@item

Fixed bug when using a reference to a @code{AVG()} column in @code{HAVING}.

@item

Fixed that date functions that require correct dates, like

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length, 
      {

	/* For slow query log */

	if (my_b_printf(&log_file,

			"# Time: %lu  Lock_time: %lu  Rows_sent: %lu  Rows_examined: %lu\n",

			"# Query_time: %lu  Lock_time: %lu  Rows_sent: %lu  Rows_examined: %lu\n",

			(ulong) (current_time - query_start),

			(ulong) (thd->time_after_lock - query_start),

			(ulong) thd->sent_row_count,

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -4121,7 +4121,6 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) 
    bool not_used_in_distinct=join_tab->not_used_in_distinct;

    ha_rows found_records=join->found_records;

    READ_RECORD *info= &join_tab->read_record;

    join->examined_rows++;



    do

    {
@@ -4130,6 +4129,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) 
	my_error(ER_SERVER_SHUTDOWN,MYF(0));	/* purecov: inspected */

	return -2;				/* purecov: inspected */

      }

      join->examined_rows++;

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

      {

	found=1;