Merge lp:~percona-dev/percona-server/release-5.1.53-response_time_distribution into lp:~percona-dev/percona-server/release-5.1.53

[Oleg Tsarev]

Add option "--without-response_time_distribution"
Documentation is actual

[Alexey Kopytov (akopytov)]

Looks good to me.

review: Approve

[Alexey Kopytov (akopytov)]

This looks even better to me

review: Approve

=== modified file 'fix-bug671764.patch'
--- fix-bug671764.patch	2010-12-02 17:11:35 +0000
+++ fix-bug671764.patch	2010-12-14 20:08:09 +0000
@@ -1,7 +1,7 @@
-diff -Nur a/configure.in b/configure.in
+diff -ruN a/configure.in b/configure.in
 --- a/configure.in	2010-11-29 18:45:47.000000000 +0000
 +++ b/configure.in	2010-11-29 18:45:51.000000000 +0000
-@@ -2816,7 +2816,7 @@
+@@ -2837,7 +2837,7 @@
  fi
  
  # "innochecksum" is not in the "innobase/" subdirectory, but should be switched

=== modified file 'install_tests.sh'
--- install_tests.sh	2010-12-06 00:27:05 +0000
+++ install_tests.sh	2010-12-14 20:08:09 +0000
@@ -9,6 +9,7 @@
     find $1 -iname '*.test' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
     find $1 -iname '*.opt' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
     find $1 -iname '*.result' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
+    find $1 -iname '*.require' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
     find $1 -iname '*.inc' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/include/ ';'
 }
 

=== modified file 'mysql-syslog.patch'
--- mysql-syslog.patch	2010-11-18 10:17:25 +0000
+++ mysql-syslog.patch	2010-12-14 20:08:09 +0000
@@ -77,12 +77,12 @@
 +void write_syslog(char *line){
 +#ifndef __WIN__
 +  char buff[901];
-+  int i, buff_pos=0;
++  uint i, buff_pos=0;
 +  for (i=0;i < strlen(line); i++){
 +    buff[buff_pos] = line[i];
 +    buff_pos++;
 +    if (buff_pos >= 900){
-+      buff[900] = NULL;
++      buff[900] = 0;
 +      buff_pos = 0;
 +      syslog(LOG_INFO, "SYSTEM_USER:%s, MYSQL_USER:%s, CONNECTION_ID:%lu, DB_SERVER:%s, DB:%s, QUERY:%s",
 +             getenv("SUDO_USER") ? getenv("SUDO_USER") :
@@ -95,7 +95,7 @@
 +    }
 +  }
 +  if (buff_pos > 0){
-+    buff[buff_pos] = NULL;
++    buff[buff_pos] = 0;
 +    syslog(LOG_INFO, "SYSTEM_USER:%s, MYSQL_USER:%s, CONNECTION_ID:%lu, DB_SERVER:%s, DB:%s, QUERY:%s",
 +           getenv("SUDO_USER") ? getenv("SUDO_USER") :
 +           getenv("USER") ? getenv("USER") : "--",

=== added file 'mysql-test/have_response_time_distribution.inc'
--- mysql-test/have_response_time_distribution.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/have_response_time_distribution.inc	2010-12-14 20:08:09 +0000
@@ -0,0 +1,4 @@
+-- require r/have_response_time_distribution.require
+disable_query_log;
+show variables like 'have_response_time_distribution';
+enable_query_log;

=== added file 'mysql-test/have_response_time_distribution.require'
--- mysql-test/have_response_time_distribution.require	1970-01-01 00:00:00 +0000
+++ mysql-test/have_response_time_distribution.require	2010-12-14 20:08:09 +0000
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_response_time_distribution	YES

=== modified file 'mysql-test/percona_server_variables.result'
--- mysql-test/percona_server_variables.result	2010-10-04 11:11:06 +0000
+++ mysql-test/percona_server_variables.result	2010-12-14 20:08:09 +0000
@@ -64,6 +64,7 @@
 have_openssl	Value
 have_partitioning	Value
 have_query_cache	Value
+have_response_time_distribution	Value
 have_rtree_keys	Value
 have_ssl	Value
 have_symlink	Value

=== modified file 'mysql-test/percona_server_variables.test'
--- mysql-test/percona_server_variables.test	2010-08-11 15:03:01 +0000
+++ mysql-test/percona_server_variables.test	2010-12-14 20:08:09 +0000
@@ -1,3 +1,4 @@
+--source include/have_response_time_distribution.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
 

=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test	2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test	2010-12-14 20:08:09 +0000
@@ -1,3 +1,4 @@
+--source include/have_response_time_distribution.inc
 --source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
 --source include/have_debug.inc

=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test	2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test	2010-12-14 20:08:09 +0000
@@ -1,5 +1,5 @@
-source include/have_innodb.inc;
-source include/have_debug.inc;
+--source include/have_response_time_distribution.inc
+--source include/have_debug.inc
 SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
 
 delimiter /;

=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time.test	2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time.test	2010-12-14 20:08:09 +0000
@@ -1,5 +1,5 @@
-source include/have_innodb.inc;
-source include/have_debug.inc;
+--source include/have_response_time_distribution.inc
+--source include/have_debug.inc
 SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
 SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
 SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';

=== modified file 'mysql_remove_eol_carret.patch'
--- mysql_remove_eol_carret.patch	2010-12-09 18:03:54 +0000
+++ mysql_remove_eol_carret.patch	2010-12-14 20:08:09 +0000
@@ -1,17 +1,24 @@
-diff -Nur a/client/client_priv.h b/client/client_priv.h
+# name       : mysql_remove_eol_carret.patch
+# introduced : 11 or before
+# maintainer : Oleg
+#
+#!!! notice !!!
+# Any small change to this file in the main branch
+# should be done or reviewed by the maintainer!
+diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2010-07-06 15:06:50.000000000 -0700
 +++ b/client/client_priv.h	2010-07-06 15:07:18.000000000 -0700
-@@ -92,5 +92,6 @@
-   OPT_WRITE_BINLOG, OPT_DUMP_DATE,
+@@ -93,5 +93,6 @@
+   OPT_SYSLOG,
    OPT_FIRST_SLAVE,
    OPT_ALL,
 +  OPT_NO_REMOVE_EOL_CARRET,
    OPT_MAX_CLIENT_OPTION
  };
-diff -Nur a/client/mysql.cc b/client/mysql.cc
+diff -ruN a/client/mysql.cc b/client/mysql.cc
 --- a/client/mysql.cc	2010-06-03 08:50:02.000000000 -0700
 +++ b/client/mysql.cc	2010-07-06 15:07:18.000000000 -0700
-@@ -141,6 +141,8 @@
+@@ -143,6 +143,8 @@
  enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
  typedef enum enum_info_type INFO_TYPE;
  
@@ -20,7 +27,7 @@
  static MYSQL mysql;			/* The connection */
  static my_bool ignore_errors=0,wait_flag=0,quick=0,
                 connected=0,opt_raw_data=0,unbuffered=0,output_tables=0,
-@@ -1426,6 +1428,10 @@
+@@ -1437,6 +1439,10 @@
     NO_ARG, 1, 0, 0, 0, 0, 0},  
    {"skip-line-numbers", 'L', "Don't write line number for errors.", 0, 0, 0, GET_NO_ARG,
     NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -29,9 +36,9 @@
 +   GET_BOOL,
 +   NO_ARG, 0, 0, 0, 0, 0, 0},
    {"unbuffered", 'n', "Flush buffer after each query.", &unbuffered,
-    (uchar**) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+    &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"column-names", OPT_COLUMN_NAMES, "Write column names in results.",
-diff -Nur a/client/readline.cc b/client/readline.cc
+diff -ruN a/client/readline.cc b/client/readline.cc
 --- a/client/readline.cc	2010-06-03 08:50:23.000000000 -0700
 +++ b/client/readline.cc	2010-07-06 15:07:18.000000000 -0700
 @@ -20,6 +20,8 @@
@@ -52,10 +59,10 @@
        out_length--;                                 /* Remove '\r' */
    line_buff->read_length=out_length;
    pos[out_length]=0;
-diff -Nur a/patch_info/mysql_remove_eol_carret.patch b/patch_info/mysql_remove_eol_carret.patch
+diff -ruN a/patch_info/mysql_remove_eol_carret.patch b/patch_info/mysql_remove_eol_carret.patch
 --- a/patch_info/mysql_remove_eol_carret.patch	1969-12-31 16:00:00.000000000 -0800
 +++ b/patch_info/mysql_remove_eol_carret.patch	2010-07-06 15:10:10.000000000 -0700
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,7 @@
 +File=mysql_remove_eol_carret.patch
 +Name=
 +Version=1.1
@@ -63,4 +70,3 @@
 +License=GPL
 +Comment=Do not remove carret before eol if --no-remove-eol-carret is enabled in MySQL client.
 +Changelog
-+

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-12-06 03:08:42 +0000
+++ response-time-distribution.patch	2010-12-14 20:08:09 +0000
@@ -110,65 +110,84 @@
 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
-@@ -2091,6 +2091,8 @@
+@@ -2091,6 +2091,11 @@
  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;
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +extern ulong   opt_query_response_time_range_base;
 +extern my_bool opt_enable_query_response_time_stats;
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++extern SHOW_COMP_OPTION have_response_time_distribution;
  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
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,7 @@
  
  #include "rpl_injector.h"
  
 +#include "query_response_time.h"
-+
  #ifdef HAVE_SYS_PRCTL_H
  #include <sys/prctl.h>
  #endif
-@@ -530,6 +532,8 @@
+@@ -530,6 +531,10 @@
  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;
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +ulong   opt_query_response_time_range_base  = QRT_DEFAULT_BASE;
 +my_bool opt_enable_query_response_time_stats= 0;
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
  my_bool lower_case_file_system= 0;
  my_bool opt_large_pages= 0;
  my_bool opt_myisam_use_mmap= 0;
-@@ -1385,6 +1389,7 @@
+@@ -675,6 +680,7 @@
+ MY_LOCALE *my_default_lc_time_names;
+ 
+ SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache;
++SHOW_COMP_OPTION have_response_time_distribution;
+ SHOW_COMP_OPTION have_geometry, have_rtree_keys;
+ SHOW_COMP_OPTION have_crypt, have_compress;
+ SHOW_COMP_OPTION have_community_features;
+@@ -1385,6 +1391,9 @@
    free_global_thread_stats();
    free_global_table_stats();
    free_global_index_stats();
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  query_response_time_free();
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -4087,6 +4092,7 @@
+@@ -4087,6 +4096,9 @@
  
    init_global_table_stats();
    init_global_index_stats();
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  query_response_time_init();
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
  
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
-@@ -5900,6 +5906,8 @@
+@@ -5900,6 +5912,10 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  OPT_QRT_RANGE_BASE,
 +  OPT_ENABLE_QRT_STATS,
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    OPT_IGNORE_BUILTIN_INNODB,
    OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
    OPT_DEFAULT_CHARACTER_SET_OLD
-@@ -6969,6 +6977,21 @@
+@@ -6969,6 +6985,23 @@
     "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},
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  {"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,
@@ -184,18 +203,32 @@
 +   "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},
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    {"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-"
+@@ -8183,6 +8216,11 @@
+ #else
+   have_query_cache=SHOW_OPTION_NO;
+ #endif
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
++  have_response_time_distribution= SHOW_OPTION_YES;
++#else /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++  have_response_time_distribution= SHOW_OPTION_NO;
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
+ #ifdef HAVE_SPATIAL
+   have_geometry=SHOW_OPTION_YES;
+ #else
 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
-@@ -0,0 +1,367 @@
+@@ -0,0 +1,365 @@
 +#ifdef __FreeBSD__
 +#include <sys/types.h>
 +#include <machine/atomic.h>
 +#endif // __FreeBSD__
 +#include "my_global.h"
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +#include "mysql_priv.h"
 +#include "mysql_com.h"
 +#include "rpl_tblmap.h"
@@ -558,10 +591,11 @@
 +{
 +  return query_response_time::g_collector.fill(thd,tables,cond);
 +}
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
 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
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,71 @@
 +#ifndef QUERY_RESPONSE_TIME_H
 +#define QUERY_RESPONSE_TIME_H
 +
@@ -624,24 +658,30 @@
 +
 +extern ST_SCHEMA_TABLE query_response_time_table;
 +
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +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 /* HAVE_RESPONSE_TIME_DISTRIBUTION */
 +
 +#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
-@@ -1006,6 +1006,10 @@
+@@ -1006,6 +1006,14 @@
  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);
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +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);
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++static sys_var_have_variable sys_have_response_time_distribution(&vars, "have_response_time_distribution",
++                                                       &have_response_time_distribution);
  /* 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);
@@ -656,12 +696,15 @@
  
  /**
    @defgroup Runtime_Environment Runtime Environment
-@@ -1750,23 +1751,31 @@
+@@ -1750,23 +1751,37 @@
      Do not log administrative statements unless the appropriate option is
      set.
    */
--  if (thd->enable_slow_log)
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  if (opt_enable_query_response_time_stats || thd->enable_slow_log)
++#else /* HAVE_RESPONSE_TIME_DISTRIBUTION */
+   if (thd->enable_slow_log)
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    {
 -    ulonglong end_utime_of_query= thd->current_utime();
 -    thd_proc_info(thd, "logging slow query");
@@ -675,10 +718,12 @@
 -        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;
++    #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +    if(opt_enable_query_response_time_stats)
 +    {
 +      query_response_time_collect(query_execution_time);
 +    }
++    #endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
 +    if (thd->enable_slow_log)
      {
        thd_proc_info(thd, "logging slow query");
@@ -702,7 +747,7 @@
      }
    }
    DBUG_VOID_RETURN;
-@@ -1891,6 +1900,7 @@
+@@ -1891,6 +1906,7 @@
    case SCH_CHARSETS:
    case SCH_ENGINES:
    case SCH_COLLATIONS:
@@ -710,14 +755,16 @@
    case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
    case SCH_USER_PRIVILEGES:
    case SCH_SCHEMA_PRIVILEGES:
-@@ -7234,6 +7244,10 @@
+@@ -7234,6 +7250,12 @@
      init_global_index_stats();
      pthread_mutex_unlock(&LOCK_global_index_stats);
    }
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  if (options & REFRESH_QUERY_RESPONSE_TIME)
 +  {
 +    query_response_time_flush();
 +  }
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    if (options & (REFRESH_USER_STATS | REFRESH_CLIENT_STATS | REFRESH_THREAD_STATS))
    {
      pthread_mutex_lock(&LOCK_global_user_client_stats);
@@ -732,7 +779,7 @@
  #include "debug_sync.h"
  
  #define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
-@@ -7467,6 +7468,14 @@
+@@ -7467,6 +7468,13 @@
  
  */
  
@@ -743,16 +790,20 @@
 +    {"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, 
-@@ -7521,6 +7530,8 @@
+@@ -7521,6 +7529,13 @@
     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},
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  {"QUERY_RESPONSE_TIME", query_response_time_fields_info, create_schema_table, 
 +   query_response_time_fill, make_old_format, 0, -1, -1, 0, 0},
++#else /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++  {"QUERY_RESPONSE_TIME", query_response_time_fields_info, create_schema_table, 
++   0, make_old_format, 0, -1, -1, 0, 0},
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    {"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,
@@ -767,30 +818,36 @@
  %token  QUICK
  %token  RANGE_SYM                     /* SQL-2003-R */
  %token  READS_SYM                     /* SQL-2003-R */
-@@ -10396,6 +10397,13 @@
+@@ -10396,6 +10397,15 @@
             if (prepare_schema_table(YYTHD, lex, 0, SCH_INDEX_STATS))
               MYSQL_YYABORT;
            }
 +        | QUERY_RESPONSE_TIME_SYM wild_and_where
 +	  {
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +           LEX *lex= Lex;
 +           lex->sql_command= SQLCOM_SELECT;
 +           if (prepare_schema_table(YYTHD, lex, 0, SCH_QUERY_RESPONSE_TIME))
 +             MYSQL_YYABORT;	  
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
 +	  }
          | CREATE PROCEDURE sp_name
            {
              LEX *lex= Lex;
-@@ -10616,6 +10624,8 @@
+@@ -10616,6 +10626,12 @@
            { Lex->type|= REFRESH_TABLE_STATS; }
          | INDEX_STATS_SYM
            { Lex->type|= REFRESH_INDEX_STATS; }
 +        | QUERY_RESPONSE_TIME_SYM
-+          { Lex->type|= REFRESH_QUERY_RESPONSE_TIME; }
++          { 
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
++            Lex->type|= REFRESH_QUERY_RESPONSE_TIME; 
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++          }
          | MASTER_SYM
            { Lex->type|= REFRESH_MASTER; }
          | DES_KEY_FILE
-@@ -11895,6 +11905,7 @@
+@@ -11895,6 +11911,7 @@
          | PROFILES_SYM             {}
          | QUARTER_SYM              {}
          | QUERY_SYM                {}
@@ -809,3 +866,23 @@
    SCH_SCHEMATA,
    SCH_SCHEMA_PRIVILEGES,
    SCH_SESSION_STATUS,
+diff -ruN a/configure.in b/configure.in
+--- a/configure.in	2010-12-07 19:19:42.000000000 +0300
++++ b/configure.in	2010-12-07 19:21:39.000000000 +0300
+@@ -2718,7 +2718,16 @@
+ AC_SUBST(readline_link)
+ AC_SUBST(readline_h_ln_cmd)
+ 
++AC_ARG_WITH(response_time_distribution,
++    AC_HELP_STRING([--without-response_time_distribution],[Disable response_time_distribution feature.]),
++    [with_response_time_distribution=$withval],
++    [with_response_time_distribution=yes]
++)
+ 
++if test "$with_response_time_distribution" = "yes"
++then
++  AC_DEFINE([HAVE_RESPONSE_TIME_DISTRIBUTION], [1], [If we want to have response_time_distribution])
++fi
+ 
+ # Include man pages, if desired, adapted to the configured parts.
+ if test X"$with_man" = Xyes

=== modified file 'show_slave_status_nolock.patch'
--- show_slave_status_nolock.patch	2010-11-28 09:59:36 +0000
+++ show_slave_status_nolock.patch	2010-12-14 20:08:09 +0000
@@ -29,7 +29,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-11-17 18:45:47.000000000 +0300
 +++ b/sql/mysqld.cc	2010-11-17 18:46:55.000000000 +0300
-@@ -3248,6 +3248,7 @@
+@@ -3252,6 +3252,7 @@
    {"show_profiles",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILES]), SHOW_LONG_STATUS},
    {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
    {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
@@ -61,7 +61,7 @@
    sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
-@@ -2539,12 +2540,16 @@
+@@ -2545,12 +2546,16 @@
      pthread_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -79,7 +79,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2555,7 +2560,10 @@
+@@ -2561,7 +2566,10 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }

=== modified file 'sql_no_fcache.patch'
--- sql_no_fcache.patch	2010-10-05 03:10:41 +0000
+++ sql_no_fcache.patch	2010-12-14 20:08:09 +0000
@@ -156,7 +156,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-28 16:47:58.565318871 +0400
 +++ b/sql/mysqld.cc	2010-07-28 16:48:03.004544367 +0400
-@@ -46,6 +46,11 @@
+@@ -45,6 +45,11 @@
  #define OPT_NDB_SHM_DEFAULT 0
  #endif
  #endif
@@ -168,7 +168,7 @@
  
  #ifndef DEFAULT_SKIP_THREAD_PRIORITY
  #define DEFAULT_SKIP_THREAD_PRIORITY 0
-@@ -594,6 +599,11 @@
+@@ -595,6 +600,11 @@
  ulong max_connections, max_connect_errors;
  uint  max_user_connections= 0;
  ulonglong denied_connections = 0;
@@ -180,7 +180,7 @@
  /**
    Limit of the total number of prepared statements in the server.
    Is necessary to protect the server against out-of-memory attacks.
-@@ -4375,6 +4385,97 @@
+@@ -4381,6 +4391,97 @@
  }
  #endif//DBUG_OFF
  
@@ -278,7 +278,7 @@
  
  #ifdef __WIN__
  int win_main(int argc, char **argv)
-@@ -4479,6 +4580,10 @@
+@@ -4485,6 +4586,10 @@
    test_lc_time_sz();
  #endif
  
@@ -289,7 +289,7 @@
    /*
      We have enough space for fiddling with the argv, continue
    */
-@@ -4680,6 +4785,10 @@
+@@ -4686,6 +4791,10 @@
    clean_up_mutexes();
    my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
  
@@ -300,7 +300,7 @@
    exit(0);
    return(0);					/* purecov: deadcode */
  }
-@@ -7832,6 +7941,7 @@
+@@ -7842,6 +7951,7 @@
    {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
    {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_NOFLUSH},
    {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},