From 10cdf90bd37fe5eb2cb22398520f3c6e8cb693ae Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Wed, 3 Jan 2007 17:15:10 -0500
Subject: Bug#24795: Add SHOW PROFILE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch contributed by Jeremy Cole.  CLA received Oct 2006 by Kaj Arnö

Add rudimentary query profiling support.
---
 sql/sql_view.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_view.cc')

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 53844eb0fd2..15c58bd0673 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -589,7 +589,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   DBUG_RETURN(0);
 
 err:
-  thd->proc_info= "end";
+  THD_PROC_INFO(thd, "end");
   lex->link_first_table_back(view, link_to_local);
   unit->cleanup();
   DBUG_RETURN(res || thd->net.report_error);
-- 
cgit v1.2.1


From 6e096ee8d9f5aa2cbe3c2bba4aecde6fceaa888f Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Thu, 22 Feb 2007 10:03:08 -0500
Subject: Prevent bugs by making DBUG_* expressions syntactically equivalent to
 a single statement. --- Bug#24795: SHOW PROFILE

Profiling is only partially functional on some architectures.  Where
there is no getrusage() system call, presently Null values are
returned where it would be required.  Notably, Windows needs some love
applied to make it as useful.

  Syntax this adds:

  SHOW PROFILES

  SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]
   where "n" is an integer
   and "types" is zero or many (comma-separated) of
      "CPU"
      "MEMORY" (not presently supported)
      "BLOCK IO"
      "CONTEXT SWITCHES"
      "PAGE FAULTS"
      "IPC"
      "SWAPS"
      "SOURCE"
      "ALL"

It also adds a session variable (boolean) "profiling", set to "no"
by default, and (integer) profiling_history_size, set to 15 by
default.

This patch abstracts setting THDs' "proc_info" behind a macro that
can be used as a hook into the profiling code when profiling
support is compiled in.  All future code in this line should use
that mechanism for setting thd->proc_info.

---

Tests are now set to omit the statistics.

---

Adds an Information_schema table, "profiling" for access to
"show profile" data.
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-3--bug24795
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
---
Fix merge problems.
---
Fixed one bug in the query_source being NULL.

Updated test results.
---
Include more thorough profiling tests.

Improve support for prepared statements.

Use session-specific query IDs, starting at zero.
---
Selecting from I_S.profiling is no longer quashed in profiling, as
requested by Giuseppe.

Limit the size of captured query text.

No longer log queries that are zero length.
---
 sql/sql_view.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_view.cc')

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index c03dd1f782e..c570c0e6570 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -588,7 +588,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   DBUG_RETURN(0);
 
 err:
-  THD_PROC_INFO(thd, "end");
+  thd_proc_info(thd, "end");
   lex->link_first_table_back(view, link_to_local);
   unit->cleanup();
   DBUG_RETURN(res || thd->net.report_error);
-- 
cgit v1.2.1