summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-31 22:24:33 +0200
committermonty@hundin.mysql.fi <>2001-10-31 22:24:33 +0200
commit44a2a213b810fabe43c555170b59f6c19a357ef1 (patch)
tree7518cec72f32a406f865d819c9e1f08095eb0c7c /sql
parent0716bf4d0ef4ec4dd4eb945c2db54f1e9962f401 (diff)
downloadmariadb-git-44a2a213b810fabe43c555170b59f6c19a357ef1.tar.gz
Changed time -> query_time in slow query log.
Fixed Rows_examined in slow query log.
Diffstat (limited to 'sql')
-rw-r--r--sql/log.cc2
-rw-r--r--sql/sql_select.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 0417f7eb06b..1b236d342f5 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -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,
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c4cd4421f98..431674a58e2 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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;