From 16a024c486f75b9eadc046511f48a23e566e9c4b Mon Sep 17 00:00:00 2001
From: Mikael Ronstrom <mikael@mysql.com>
Date: Sat, 20 Dec 2008 11:01:41 +0100
Subject: Backport of DTrace patches from 6.0

---
 sql/filesort.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql/filesort.cc')

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 2850ada1ffb..e95d1741b06 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -27,6 +27,7 @@
 #endif
 #include <m_ctype.h>
 #include "sql_sort.h"
+#include "probes_mysql.h"
 
 #ifndef THREAD
 #define SKIP_DBUG_IN_FILESORT
@@ -121,6 +122,8 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
   TABLE_LIST *tab= table->pos_in_table_list;
   Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
 
+  MYSQL_FILESORT_START(table->s->db.str, table->s->tablename.str);
+
   /*
    Release InnoDB's adaptive hash index latch (if holding) before
    running a sort.
@@ -331,6 +334,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
 #endif
   memcpy(&table->sort, &table_sort, sizeof(FILESORT_INFO));
   DBUG_PRINT("exit",("records: %ld", (long) records));
+  MYSQL_FILESORT_DONE(error, records);
   DBUG_RETURN(error ? HA_POS_ERROR : records);
 } /* filesort */
 
-- 
cgit v1.2.1