~percona-dev/percona-server/release-5.1.53-12-for_xtrabackup

diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h

--- a/sql/mysql_priv.h  2010-11-01 08:43:57.000000000 +0000

+++ b/sql/mysql_priv.h  2010-11-01 08:52:40.000000000 +0000

 extern my_bool opt_query_cache_strip_comments;

 extern my_bool opt_use_global_long_query_time;

 extern my_bool opt_slow_query_log_microseconds_timestamp;

+extern ulong   opt_query_response_time_range_base;

+extern my_bool opt_enable_query_response_time_stats;

 extern my_bool sp_automatic_privileges, opt_noacl;

 extern my_bool opt_old_style_user_limits, trust_function_creators;

 extern uint opt_crash_binlog_innodb;

diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc

--- a/sql/mysqld.cc     2010-11-01 08:43:57.000000000 +0000

+++ b/sql/mysqld.cc     2010-11-01 08:52:40.000000000 +0000

 

 #include "rpl_injector.h"

 

+#include "query_response_time.h"

 #ifdef HAVE_SYS_PRCTL_H

 #include <sys/prctl.h>

 #endif

 my_bool opt_query_cache_strip_comments = 0;

 my_bool opt_use_global_long_query_time= 0;

 my_bool opt_slow_query_log_microseconds_timestamp= 0;

+ulong   opt_query_response_time_range_base  = QRT_DEFAULT_BASE;

+my_bool opt_enable_query_response_time_stats= 0;

 my_bool lower_case_file_system= 0;

 my_bool opt_large_pages= 0;

 my_bool opt_myisam_use_mmap= 0;

   free_global_thread_stats();

   free_global_table_stats();

   free_global_index_stats();

+  query_response_time_free();

 #ifdef HAVE_REPLICATION

   end_slave_list();

 #endif

 

   init_global_table_stats();

   init_global_index_stats();

+  query_response_time_init();

 

   /* We have to initialize the storage engines before CSV logging */

   if (ha_init())

   OPT_USE_GLOBAL_LONG_QUERY_TIME,

   OPT_USE_GLOBAL_LOG_SLOW_CONTROL,

   OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,

+  OPT_QRT_RANGE_BASE,

+  OPT_ENABLE_QRT_STATS,

   OPT_IGNORE_BUILTIN_INNODB,

   OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,

   OPT_DEFAULT_CHARACTER_SET_OLD

    "Use microsecond time's precision in slow query log",

    (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,

    0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},

+  {"query_response_time_range_base", OPT_QRT_RANGE_BASE,

+     "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",

+   (uchar**) &opt_query_response_time_range_base, (uchar**) &opt_query_response_time_range_base,

+   "Enable or disable query response time statisics collecting",

+   (uchar**) &opt_enable_query_response_time_stats, (uchar**) &opt_enable_query_response_time_stats,

+   0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},

   {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,

    "If set to 1, table names are stored in lowercase on disk and table names "

    "will be case-insensitive.  Should be set to 2 if you are using a case-"

diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc

--- a/sql/query_response_time.cc        1970-01-01 00:00:00.000000000 +0000

+++ b/sql/query_response_time.cc        2010-11-02 15:34:52.000000000 +0000

+#ifdef __FreeBSD__

+#include <sys/types.h>

+#include <machine/atomic.h>

+#endif // __FreeBSD__

+#include "my_global.h"

+#include "mysql_priv.h"

+#include "mysql_com.h"

+#include "rpl_tblmap.h"

+{

+  return query_response_time::g_collector.fill(thd,tables,cond);

+}

diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h

--- a/sql/query_response_time.h 1970-01-01 00:00:00.000000000 +0000

+++ b/sql/query_response_time.h 2010-11-01 08:52:40.000000000 +0000

+#ifndef QUERY_RESPONSE_TIME_H

+#define QUERY_RESPONSE_TIME_H

+

+

+extern ST_SCHEMA_TABLE query_response_time_table;

+

+extern void query_response_time_init   ();

+extern void query_response_time_free   ();

+extern void query_response_time_flush  ();

+extern void query_response_time_collect(ulonglong query_time);

+extern int  query_response_time_fill   (THD* thd, TABLE_LIST *tables, COND *cond);

+

+#endif // QUERY_RESPONSE_TIME_H

diff -ruN a/sql/set_var.cc b/sql/set_var.cc

--- a/sql/set_var.cc    2010-11-01 08:43:57.000000000 +0000

+++ b/sql/set_var.cc    2010-11-01 08:52:40.000000000 +0000

 static sys_var_use_global_long_query_time sys_use_global_long_query_time;

 static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",

                                                        &opt_slow_query_log_microseconds_timestamp);

+static sys_var_bool_ptr       sys_enable_query_response_time_stats(&vars, "enable_query_response_time_stats",

+                                                       &opt_enable_query_response_time_stats);

+static sys_var_long_ptr       sys_query_response_time_range_base(&vars, "query_response_time_range_base",

+                                                      &opt_query_response_time_range_base);

 /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */

 static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",

                                           &opt_slow_log, QUERY_LOG_SLOW);

 

 /**

   @defgroup Runtime_Environment Runtime Environment

     Do not log administrative statements unless the appropriate option is

     set.

   */

+  if (opt_enable_query_response_time_stats || thd->enable_slow_log)

   {

-    ulonglong end_utime_of_query= thd->current_utime();

-    thd_proc_info(thd, "logging slow query");

-        thd->examined_row_count >= thd->variables.min_examined_row_limit)

+    ulonglong end_utime_of_query   = thd->current_utime();

+    ulonglong query_execution_time = end_utime_of_query - thd->utime_after_lock;

+    if(opt_enable_query_response_time_stats)

+    {

+      query_response_time_collect(query_execution_time);

+    }

+    if (thd->enable_slow_log)

     {

       thd_proc_info(thd, "logging slow query");

     }

   }

   DBUG_VOID_RETURN;

   case SCH_CHARSETS:

   case SCH_ENGINES:

   case SCH_COLLATIONS:

   case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:

   case SCH_USER_PRIVILEGES:

   case SCH_SCHEMA_PRIVILEGES:

     init_global_index_stats();

     pthread_mutex_unlock(&LOCK_global_index_stats);

   }

+  if (options & REFRESH_QUERY_RESPONSE_TIME)

+  {

+    query_response_time_flush();

+  }

   if (options & (REFRESH_USER_STATS | REFRESH_CLIENT_STATS | REFRESH_THREAD_STATS))

   {

     pthread_mutex_lock(&LOCK_global_user_client_stats);

 #include "debug_sync.h"

 

 #define STR_OR_NIL(S) ((S) ? (S) : "<nil>")

 

 */

 

+    {"total",  QRT_TIME_STRING_LENGTH,     MYSQL_TYPE_STRING,  0, 0,            "", SKIP_OPEN_TABLE },

+    {0,       0,                           MYSQL_TYPE_STRING,  0, 0,             0, SKIP_OPEN_TABLE }

+  };

 ST_SCHEMA_TABLE schema_tables[]=

 {

   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 

    1, 9, 0, OPEN_TABLE_ONLY},

   {"ROUTINES", proc_fields_info, create_schema_table, 

    fill_schema_proc, make_proc_old_format, 0, -1, -1, 0, 0},

+  {"QUERY_RESPONSE_TIME", query_response_time_fields_info, create_schema_table, 

+   query_response_time_fill, make_old_format, 0, -1, -1, 0, 0},

   {"SCHEMATA", schema_fields_info, create_schema_table,

    fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0},

   {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table,

 %token  QUICK

 %token  RANGE_SYM                     /* SQL-2003-R */

 %token  READS_SYM                     /* SQL-2003-R */

            if (prepare_schema_table(YYTHD, lex, 0, SCH_INDEX_STATS))

              MYSQL_YYABORT;

           }

+        | QUERY_RESPONSE_TIME_SYM wild_and_where

+         {

+           LEX *lex= Lex;

+           lex->sql_command= SQLCOM_SELECT;

+           if (prepare_schema_table(YYTHD, lex, 0, SCH_QUERY_RESPONSE_TIME))

+             MYSQL_YYABORT;      

+         }

         | CREATE PROCEDURE sp_name

           {

             LEX *lex= Lex;

           { Lex->type|= REFRESH_TABLE_STATS; }

         | INDEX_STATS_SYM

           { Lex->type|= REFRESH_INDEX_STATS; }

+        | QUERY_RESPONSE_TIME_SYM

         | MASTER_SYM

           { Lex->type|= REFRESH_MASTER; }

         | DES_KEY_FILE

         | PROFILES_SYM             {}

         | QUARTER_SYM              {}

         | QUERY_SYM                {}

   SCH_SCHEMATA,

   SCH_SCHEMA_PRIVILEGES,

   SCH_SESSION_STATUS,