Merge lp:~akopytov/percona-server/slow_extended_and_rtd_fixes into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/95/

=== modified file 'bugfix48929.patch'
--- bugfix48929.patch	2011-07-20 03:48:37 +0000
+++ bugfix48929.patch	2011-07-27 08:44:25 +0000
@@ -6,8 +6,8 @@
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
 diff -ruN a/configure.in b/configure.in
---- a/configure.in	2010-07-07 03:33:05.008972002 +0400
-+++ b/configure.in	2010-07-07 03:33:05.788972002 +0400
+--- a/configure.in
++++ b/configure.in
 @@ -815,7 +815,7 @@
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
@@ -18,8 +18,8 @@
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-07 03:33:05.278972002 +0400
-+++ b/sql/mysqld.cc	2010-07-07 03:33:05.788972002 +0400
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -55,6 +55,10 @@
  #include "sp_rcontext.h"
  #include "sp_cache.h"
@@ -31,7 +31,7 @@
  #define mysqld_charset &my_charset_latin1
  
  #ifdef HAVE_purify
-@@ -5124,28 +5128,49 @@
+@@ -5125,28 +5129,49 @@
  {
    my_socket sock,new_sock;
    uint error_count=0;
@@ -84,7 +84,7 @@
  #ifdef HAVE_FCNTL
    socket_flags=fcntl(unix_sock, F_GETFL, 0);
  #endif
-@@ -5155,12 +5180,15 @@
+@@ -5156,12 +5181,15 @@
    MAYBE_BROKEN_SYSCALL;
    while (!abort_loop)
    {
@@ -105,7 +105,7 @@
      {
        if (socket_errno != SOCKET_EINTR)
        {
-@@ -5170,7 +5198,7 @@
+@@ -5171,7 +5199,7 @@
        MAYBE_BROKEN_SYSCALL
        continue;
      }
@@ -114,7 +114,7 @@
      if (abort_loop)
      {
        MAYBE_BROKEN_SYSCALL;
-@@ -5178,6 +5206,21 @@
+@@ -5179,6 +5207,21 @@
      }
  
      /* Is this a new connection request ? */
@@ -136,7 +136,7 @@
  #ifdef HAVE_SYS_UN_H
      if (FD_ISSET(unix_sock,&readFDs))
      {
-@@ -5185,11 +5228,12 @@
+@@ -5186,11 +5229,12 @@
        flags= socket_flags;
      }
      else
 
=== modified file 'control_online_alter_index.patch'
--- control_online_alter_index.patch	2011-05-10 07:31:20 +0000
+++ control_online_alter_index.patch	2011-07-27 08:44:25 +0000
@@ -6,8 +6,8 @@
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
 diff -ruN a/sql/handler.h b/sql/handler.h
---- a/sql/handler.h	2010-07-21 22:49:53.660561079 +0900
-+++ b/sql/handler.h	2010-07-21 22:50:24.106530090 +0900
+--- a/sql/handler.h
++++ b/sql/handler.h
 @@ -169,6 +169,19 @@
  #define HA_ONLINE_DROP_UNIQUE_INDEX             (1L << 9) /*drop uniq. online*/
  #define HA_ONLINE_ADD_PK_INDEX                  (1L << 10)/*add prim. online*/
@@ -29,9 +29,9 @@
    HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is
    supported at all.
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-21 22:49:54.011529414 +0900
-+++ b/sql/mysqld.cc	2010-07-21 22:50:24.112527179 +0900
-@@ -5898,6 +5898,7 @@
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -5900,6 +5900,7 @@
    OPT_USERSTAT_RUNNING,
    OPT_THREAD_STATISTICS,
    OPT_OPTIMIZER_FIX,
@@ -39,7 +39,7 @@
    OPT_SUPPRESS_LOG_WARNING_1592,
    OPT_QUERY_CACHE_STRIP_COMMENTS,
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
-@@ -5930,6 +5931,13 @@
+@@ -5932,6 +5933,13 @@
     "from libc.so",
     &opt_allow_suspicious_udfs, &opt_allow_suspicious_udfs,
     0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -54,8 +54,8 @@
     "will also set transaction isolation level 'serializable'.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc	2010-07-21 22:49:54.019529438 +0900
-+++ b/sql/set_var.cc	2010-07-21 22:50:24.122532110 +0900
+--- a/sql/set_var.cc
++++ b/sql/set_var.cc
 @@ -758,6 +758,11 @@
  sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
  			      &SV::engine_condition_pushdown);
@@ -69,8 +69,8 @@
  /* ndb thread specific variable settings */
  static sys_var_thd_ulong
 diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	2010-07-21 22:49:53.742561560 +0900
-+++ b/sql/sql_class.h	2010-07-21 22:50:24.130529404 +0900
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
 @@ -381,6 +381,8 @@
    my_bool ndb_use_transactions;
    my_bool ndb_index_stat_enable;
@@ -81,8 +81,8 @@
    my_bool old_passwords;
  
 diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
---- a/sql/sql_partition.cc	2010-06-04 00:50:11.000000000 +0900
-+++ b/sql/sql_partition.cc	2010-07-21 22:50:24.140530183 +0900
+--- a/sql/sql_partition.cc
++++ b/sql/sql_partition.cc
 @@ -4381,7 +4381,12 @@
          alter_info->no_parts= curr_part_no - new_part_no;
        }
@@ -98,8 +98,8 @@
        my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
        DBUG_RETURN(1);
 diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
---- a/sql/sql_table.cc	2010-06-04 00:50:11.000000000 +0900
-+++ b/sql/sql_table.cc	2010-07-21 22:50:24.146531063 +0900
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
 @@ -7003,6 +7003,10 @@
      uint  *idx_end_p;
  
 
=== modified file 'fix-bug671764.patch'
--- fix-bug671764.patch	2011-03-13 21:40:40 +0000
+++ fix-bug671764.patch	2011-07-27 08:44:25 +0000
@@ -6,9 +6,9 @@
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
 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
-@@ -2727,7 +2727,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2776,7 +2776,7 @@
      MAN_DROP="$MAN_DROP embedded"
      grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
    fi
@@ -17,7 +17,7 @@
    then
      MAN_DROP="$MAN_DROP innodb"
      grep -v 'inno' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
-@@ -2806,7 +2806,7 @@
+@@ -2855,7 +2855,7 @@
  fi
  
  # "innochecksum" is not in the "innobase/" subdirectory, but should be switched
 
=== modified file 'microsec_process.patch'
--- microsec_process.patch	2011-05-10 07:31:20 +0000
+++ microsec_process.patch	2011-07-27 08:44:25 +0000
@@ -5,9 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ b/patch_info/microsec_process.info	2010-08-27 14:45:52.941058849 +0900
+diff -ruN /dev/null Percona-Server/patch_info/microsec_process.info
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ Percona-Server/patch_info/microsec_process.info	2011-07-26 10:21:40.000000000 +0400
 @@ -0,0 +1,8 @@
 +File=microsec_process.patch
 +Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
@@ -17,10 +17,10 @@
 +Comment=
 +2010-01
 +Ported to 5.1.42
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc	2010-08-27 14:38:08.781057666 +0900
-+++ b/sql/sql_show.cc	2010-08-27 14:45:52.946058726 +0900
-@@ -1913,7 +1913,8 @@
+diff -ruN Percona-Server.orig/sql/sql_show.cc Percona-Server/sql/sql_show.cc
+--- Percona-Server.orig/sql/sql_show.cc	2011-07-26 10:21:36.000000000 +0400
++++ Percona-Server/sql/sql_show.cc	2011-07-26 10:24:56.000000000 +0400
+@@ -1913,7 +1913,8 @@ int fill_schema_processlist(THD* thd, TA
    TABLE *table= tables->table;
    CHARSET_INFO *cs= system_charset_info;
    char *user;
@@ -30,7 +30,7 @@
    DBUG_ENTER("fill_process_list");
  
    user= thd->security_ctx->master_access & PROCESS_ACL ?
-@@ -2018,6 +2019,10 @@
+@@ -2018,6 +2019,10 @@ int fill_schema_processlist(THD* thd, TA
        }
        pthread_mutex_unlock(&tmp->LOCK_thd_data);
  
@@ -41,7 +41,7 @@
        if (schema_table_store_record(thd, table))
        {
          VOID(pthread_mutex_unlock(&LOCK_thread_count));
-@@ -6718,6 +6723,8 @@
+@@ -6718,6 +6723,8 @@ ST_FIELD_INFO processlist_fields_info[]=
    {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE},
    {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info",
     SKIP_OPEN_TABLE},
 
=== removed file 'mysql-test/have_response_time_distribution.inc'
--- mysql-test/have_response_time_distribution.inc	2010-12-14 20:03:02 +0000
+++ mysql-test/have_response_time_distribution.inc	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
--- require r/have_response_time_distribution.require
-disable_query_log;
-show variables like 'have_response_time_distribution';
-enable_query_log;
 
=== removed file 'mysql-test/have_response_time_distribution.require'
--- mysql-test/have_response_time_distribution.require	2010-12-14 20:03:02 +0000
+++ mysql-test/have_response_time_distribution.require	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Variable_name	Value
-have_response_time_distribution	YES
 
=== modified file 'mysql-test/percona_server_variables_debug.result'
--- mysql-test/percona_server_variables_debug.result	2011-06-23 02:21:00 +0000
+++ mysql-test/percona_server_variables_debug.result	2011-07-27 08:44:25 +0000
@@ -253,6 +253,7 @@
 QUERY_CACHE_STRIP_COMMENTS
 QUERY_CACHE_TYPE
 QUERY_CACHE_WLOCK_INVALIDATE
+QUERY_EXEC_TIME
 QUERY_PREALLOC_SIZE
 QUERY_RESPONSE_TIME_RANGE_BASE
 RAND_SEED1
 
=== removed directory 'mysql-test/response-time-distribution.patch'
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result	2011-05-26 11:10:25 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-include/master-slave.inc
-[connection master]
-SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
-DROP TABLE IF EXISTS t;
-CREATE TABLE t(id INT);
-SELECT * from t;
-id
-SELECT * from t;
-id
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_response_time_range_base value: '1'
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	10
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON;
-INSERT INTO t SELECT SLEEP(0.4);
-Warnings:
-Note	1592	Statement may not be safe to log in statement format.
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-0
-INSERT INTO t SELECT SLEEP(0.4);
-Warnings:
-Note	1592	Statement may not be safe to log in statement format.
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-0
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-2
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-3
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-FLUSH QUERY_RESPONSE_TIME;
-INSERT INTO t SELECT SLEEP(0.4);
-Warnings:
-Note	1592	Statement may not be safe to log in statement format.
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-0
-INSERT INTO t SELECT SLEEP(0.4);
-Warnings:
-Note	1592	Statement may not be safe to log in statement format.
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-0
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-2
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count)
-3
-DROP TABLE IF EXISTS t;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
-include/rpl_end.inc
 
=== removed 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	2011-05-26 11:10:25 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
---source include/have_response_time_distribution.inc
---source include/master-slave.inc
---source include/have_binlog_format_statement.inc
---source include/have_debug.inc
-SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
-
-connection master;
--- disable_warnings
-DROP TABLE IF EXISTS t;
--- enable_warnings
-CREATE TABLE t(id INT);
-SELECT * from t;
-
-sync_slave_with_master;
-
-connection slave;
-SELECT * from t;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON;
-
-connection master;
-INSERT INTO t SELECT SLEEP(0.4);
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-INSERT INTO t SELECT SLEEP(0.4);
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-sync_slave_with_master;
-
-connection slave;
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-source include/percona_query_response_time_flush.inc;
-
-connection master;
-INSERT INTO t SELECT SLEEP(0.4);
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-INSERT INTO t SELECT SLEEP(0.4);
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-sync_slave_with_master;
-
-connection slave;
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-
-connection master;
-DROP TABLE IF EXISTS t;
-sync_slave_with_master;
-connection slave;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
-
---source include/rpl_end.inc
 
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result	2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.result	1970-01-01 00:00:00 +0000
@@ -1,313 +0,0 @@
-SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
-CREATE FUNCTION test_f()
-RETURNS CHAR(30) DETERMINISTIC
-BEGIN
-DECLARE first  VARCHAR(5);
-DECLARE second VARCHAR(5);
-DECLARE result VARCHAR(20);
-SELECT SLEEP(1.11) INTO first;
-SET first= 'Hello';
-SET second=', ';
-SET result= CONCAT(first,second);
-SET result= CONCAT(result,'world!');
-RETURN result;
-END/
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_response_time_range_base value: '1'
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-FLUSH QUERY_RESPONSE_TIME;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-44
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000003
-      0.000007
-      0.000015
-      0.000030
-      0.000061
-      0.000122
-      0.000244
-      0.000488
-      0.000976
-      0.001953
-      0.003906
-      0.007812
-      0.015625
-      0.031250
-      0.062500
-      0.125000
-      0.250000
-      0.500000
-      1.000000
-      2.000000
-      4.000000
-      8.000000
-     16.000000
-     32.000000
-     64.000000
-    128.000000
-    256.000000
-    512.000000
-   1024.000000
-   2048.000000
-   4096.000000
-   8192.000000
-  16384.000000
-  32768.000000
-  65536.000000
- 131072.000000
- 262144.000000
- 524288.000000
- 1048576.00000
- 2097152.00000
- 4194304.00000
- 8388608.00000
-TOO LONG
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-test_f()
-Hello, world!
-SELECT test_f();
-test_f()
-Hello, world!
-SELECT test_f();
-test_f()
-Hello, world!
-SELECT test_f();
-test_f()
-Hello, world!
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-4	4	4	1	44
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-44
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000003
-      0.000007
-      0.000015
-      0.000030
-      0.000061
-      0.000122
-      0.000244
-      0.000488
-      0.000976
-      0.001953
-      0.003906
-      0.007812
-      0.015625
-      0.031250
-      0.062500
-      0.125000
-      0.250000
-      0.500000
-      1.000000
-      2.000000
-      4.000000
-      8.000000
-     16.000000
-     32.000000
-     64.000000
-    128.000000
-    256.000000
-    512.000000
-   1024.000000
-   2048.000000
-   4096.000000
-   8192.000000
-  16384.000000
-  32768.000000
-  65536.000000
- 131072.000000
- 262144.000000
- 524288.000000
- 1048576.00000
- 2097152.00000
- 4194304.00000
- 8388608.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	10
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-test_f()
-Hello, world!
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-1	1	1	1	14
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-14
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000010
-      0.000100
-      0.001000
-      0.010000
-      0.100000
-      1.000000
-     10.000000
-    100.000000
-   1000.000000
-  10000.000000
- 100000.000000
- 1000000.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	10
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	7
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-test_f()
-Hello, world!
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-1	1	1	1	17
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-17
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000008
-      0.000059
-      0.000416
-      0.002915
-      0.020408
-      0.142857
-      1.000000
-      7.000000
-     49.000000
-    343.000000
-   2401.000000
-  16807.000000
- 117649.000000
- 823543.000000
- 5764801.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	7
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	156
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-test_f()
-Hello, world!
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-1	1	1	1	7
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-7
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000041
-      0.006410
-      1.000000
-    156.000000
-  24336.000000
- 3796416.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	156
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-test_f()
-Hello, world!
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-1	1	1	1	6
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-6
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.001000
-      1.000000
-   1000.000000
- 1000000.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
-Warnings:
-Warning	1292	Truncated incorrect query_response_time_range_base value: '1001'
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE  =10;
-DROP FUNCTION test_f;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
 
=== removed 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-14 20:03:02 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-stored.test	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
---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 /;
-CREATE FUNCTION test_f()
-RETURNS CHAR(30) DETERMINISTIC
-BEGIN
-	DECLARE first  VARCHAR(5);
-	DECLARE second VARCHAR(5);
-	DECLARE result VARCHAR(20);
-	SELECT SLEEP(1.11) INTO first;
-	SET first= 'Hello';
-	SET second=', ';
-	SET result= CONCAT(first,second);
-	SET result= CONCAT(result,'world!');
-	RETURN result;
-END/
-delimiter ;/
-
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-source include/percona_query_response_time_show.inc;
-
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-SELECT test_f();
-SELECT test_f();
-SELECT test_f();
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT test_f();
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE  =10;
-
-DROP FUNCTION test_f;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
 
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time.result	2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time.result	1970-01-01 00:00:00 +0000
@@ -1,567 +0,0 @@
-SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_response_time_range_base value: '1'
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-FLUSH QUERY_RESPONSE_TIME;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-44
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000003
-      0.000007
-      0.000015
-      0.000030
-      0.000061
-      0.000122
-      0.000244
-      0.000488
-      0.000976
-      0.001953
-      0.003906
-      0.007812
-      0.015625
-      0.031250
-      0.062500
-      0.125000
-      0.250000
-      0.500000
-      1.000000
-      2.000000
-      4.000000
-      8.000000
-     16.000000
-     32.000000
-     64.000000
-    128.000000
-    256.000000
-    512.000000
-   1024.000000
-   2048.000000
-   4096.000000
-   8192.000000
-  16384.000000
-  32768.000000
-  65536.000000
- 131072.000000
- 262144.000000
- 524288.000000
- 1048576.00000
- 2097152.00000
- 4194304.00000
- 8388608.00000
-TOO LONG
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT SLEEP(0.31);
-SLEEP(0.31)
-0
-SELECT SLEEP(0.32);
-SLEEP(0.32)
-0
-SELECT SLEEP(0.33);
-SLEEP(0.33)
-0
-SELECT SLEEP(0.34);
-SLEEP(0.34)
-0
-SELECT SLEEP(0.35);
-SLEEP(0.35)
-0
-SELECT SLEEP(0.36);
-SLEEP(0.36)
-0
-SELECT SLEEP(0.37);
-SLEEP(0.37)
-0
-SELECT SLEEP(0.38);
-SLEEP(0.38)
-0
-SELECT SLEEP(0.39);
-SLEEP(0.39)
-0
-SELECT SLEEP(0.40);
-SLEEP(0.40)
-0
-SELECT SLEEP(1.1);
-SLEEP(1.1)
-0
-SELECT SLEEP(1.2);
-SLEEP(1.2)
-0
-SELECT SLEEP(1.3);
-SLEEP(1.3)
-0
-SELECT SLEEP(1.5);
-SLEEP(1.5)
-0
-SELECT SLEEP(1.4);
-SLEEP(1.4)
-0
-SELECT SLEEP(0.5);
-SLEEP(0.5)
-0
-SELECT SLEEP(2.1);
-SLEEP(2.1)
-0
-SELECT SLEEP(2.3);
-SLEEP(2.3)
-0
-SELECT SLEEP(2.5);
-SLEEP(2.5)
-0
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-10	19	15	4	44
-1	19	15	4	44
-5	19	15	4	44
-3	19	15	4	44
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-44
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000003
-      0.000007
-      0.000015
-      0.000030
-      0.000061
-      0.000122
-      0.000244
-      0.000488
-      0.000976
-      0.001953
-      0.003906
-      0.007812
-      0.015625
-      0.031250
-      0.062500
-      0.125000
-      0.250000
-      0.500000
-      1.000000
-      2.000000
-      4.000000
-      8.000000
-     16.000000
-     32.000000
-     64.000000
-    128.000000
-    256.000000
-    512.000000
-   1024.000000
-   2048.000000
-   4096.000000
-   8192.000000
-  16384.000000
-  32768.000000
-  65536.000000
- 131072.000000
- 262144.000000
- 524288.000000
- 1048576.00000
- 2097152.00000
- 4194304.00000
- 8388608.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	2
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	10
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT SLEEP(0.31);
-SLEEP(0.31)
-0
-SELECT SLEEP(0.32);
-SLEEP(0.32)
-0
-SELECT SLEEP(0.33);
-SLEEP(0.33)
-0
-SELECT SLEEP(0.34);
-SLEEP(0.34)
-0
-SELECT SLEEP(0.35);
-SLEEP(0.35)
-0
-SELECT SLEEP(0.36);
-SLEEP(0.36)
-0
-SELECT SLEEP(0.37);
-SLEEP(0.37)
-0
-SELECT SLEEP(0.38);
-SLEEP(0.38)
-0
-SELECT SLEEP(0.39);
-SLEEP(0.39)
-0
-SELECT SLEEP(0.40);
-SLEEP(0.40)
-0
-SELECT SLEEP(1.1);
-SLEEP(1.1)
-0
-SELECT SLEEP(1.2);
-SLEEP(1.2)
-0
-SELECT SLEEP(1.3);
-SLEEP(1.3)
-0
-SELECT SLEEP(1.5);
-SLEEP(1.5)
-0
-SELECT SLEEP(1.4);
-SLEEP(1.4)
-0
-SELECT SLEEP(0.5);
-SLEEP(0.5)
-0
-SELECT SLEEP(2.1);
-SLEEP(2.1)
-0
-SELECT SLEEP(2.3);
-SLEEP(2.3)
-0
-SELECT SLEEP(2.5);
-SLEEP(2.5)
-0
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-11	19	17	2	14
-8	19	17	2	14
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-14
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000010
-      0.000100
-      0.001000
-      0.010000
-      0.100000
-      1.000000
-     10.000000
-    100.000000
-   1000.000000
-  10000.000000
- 100000.000000
- 1000000.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	10
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	7
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT SLEEP(0.31);
-SLEEP(0.31)
-0
-SELECT SLEEP(0.32);
-SLEEP(0.32)
-0
-SELECT SLEEP(0.33);
-SLEEP(0.33)
-0
-SELECT SLEEP(0.34);
-SLEEP(0.34)
-0
-SELECT SLEEP(0.35);
-SLEEP(0.35)
-0
-SELECT SLEEP(0.36);
-SLEEP(0.36)
-0
-SELECT SLEEP(0.37);
-SLEEP(0.37)
-0
-SELECT SLEEP(0.38);
-SLEEP(0.38)
-0
-SELECT SLEEP(0.39);
-SLEEP(0.39)
-0
-SELECT SLEEP(0.40);
-SLEEP(0.40)
-0
-SELECT SLEEP(1.1);
-SLEEP(1.1)
-0
-SELECT SLEEP(1.2);
-SLEEP(1.2)
-0
-SELECT SLEEP(1.3);
-SLEEP(1.3)
-0
-SELECT SLEEP(1.5);
-SLEEP(1.5)
-0
-SELECT SLEEP(1.4);
-SLEEP(1.4)
-0
-SELECT SLEEP(0.5);
-SLEEP(0.5)
-0
-SELECT SLEEP(2.1);
-SLEEP(2.1)
-0
-SELECT SLEEP(2.3);
-SLEEP(2.3)
-0
-SELECT SLEEP(2.5);
-SLEEP(2.5)
-0
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-11	19	17	2	17
-8	19	17	2	17
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-17
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.000008
-      0.000059
-      0.000416
-      0.002915
-      0.020408
-      0.142857
-      1.000000
-      7.000000
-     49.000000
-    343.000000
-   2401.000000
-  16807.000000
- 117649.000000
- 823543.000000
- 5764801.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	7
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	156
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT SLEEP(0.31);
-SLEEP(0.31)
-0
-SELECT SLEEP(0.32);
-SLEEP(0.32)
-0
-SELECT SLEEP(0.33);
-SLEEP(0.33)
-0
-SELECT SLEEP(0.34);
-SLEEP(0.34)
-0
-SELECT SLEEP(0.35);
-SLEEP(0.35)
-0
-SELECT SLEEP(0.36);
-SLEEP(0.36)
-0
-SELECT SLEEP(0.37);
-SLEEP(0.37)
-0
-SELECT SLEEP(0.38);
-SLEEP(0.38)
-0
-SELECT SLEEP(0.39);
-SLEEP(0.39)
-0
-SELECT SLEEP(0.40);
-SLEEP(0.40)
-0
-SELECT SLEEP(1.1);
-SLEEP(1.1)
-0
-SELECT SLEEP(1.2);
-SLEEP(1.2)
-0
-SELECT SLEEP(1.3);
-SLEEP(1.3)
-0
-SELECT SLEEP(1.5);
-SLEEP(1.5)
-0
-SELECT SLEEP(1.4);
-SLEEP(1.4)
-0
-SELECT SLEEP(0.5);
-SLEEP(0.5)
-0
-SELECT SLEEP(2.1);
-SLEEP(2.1)
-0
-SELECT SLEEP(2.3);
-SLEEP(2.3)
-0
-SELECT SLEEP(2.5);
-SLEEP(2.5)
-0
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-11	19	17	2	7
-8	19	17	2	7
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-7
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000041
-      0.006410
-      1.000000
-    156.000000
-  24336.000000
- 3796416.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	156
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-FLUSH QUERY_RESPONSE_TIME;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-SELECT SLEEP(0.31);
-SLEEP(0.31)
-0
-SELECT SLEEP(0.32);
-SLEEP(0.32)
-0
-SELECT SLEEP(0.33);
-SLEEP(0.33)
-0
-SELECT SLEEP(0.34);
-SLEEP(0.34)
-0
-SELECT SLEEP(0.35);
-SLEEP(0.35)
-0
-SELECT SLEEP(0.36);
-SLEEP(0.36)
-0
-SELECT SLEEP(0.37);
-SLEEP(0.37)
-0
-SELECT SLEEP(0.38);
-SLEEP(0.38)
-0
-SELECT SLEEP(0.39);
-SLEEP(0.39)
-0
-SELECT SLEEP(0.40);
-SLEEP(0.40)
-0
-SELECT SLEEP(1.1);
-SLEEP(1.1)
-0
-SELECT SLEEP(1.2);
-SLEEP(1.2)
-0
-SELECT SLEEP(1.3);
-SLEEP(1.3)
-0
-SELECT SLEEP(1.5);
-SLEEP(1.5)
-0
-SELECT SLEEP(1.4);
-SLEEP(1.4)
-0
-SELECT SLEEP(0.5);
-SLEEP(0.5)
-0
-SELECT SLEEP(2.1);
-SLEEP(2.1)
-0
-SELECT SLEEP(2.3);
-SLEEP(2.3)
-0
-SELECT SLEEP(2.5);
-SLEEP(2.5)
-0
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-count	query_count	query_total	not_zero_region_count	region_count
-11	19	17	2	6
-8	19	17	2	6
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-region_count
-6
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-time
-      0.000001
-      0.001000
-      1.000000
-   1000.000000
- 1000000.00000
-TOO LONG
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
-Warnings:
-Warning	1292	Truncated incorrect query_response_time_range_base value: '1001'
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-Variable_name	Value
-query_response_time_range_base	1000
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE  =10;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
 
=== removed 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-14 20:03:02 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time.test	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
---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';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-source include/percona_query_response_time_show.inc;
-
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-source include/percona_query_response_time_sleep.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-source include/percona_query_response_time_sleep.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-source include/percona_query_response_time_sleep.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-source include/percona_query_response_time_sleep.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-source include/percona_query_response_time_flush.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
-source include/percona_query_response_time_sleep.inc;
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-
-source include/percona_query_response_time_show.inc;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001;
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-
-SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
-SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE  =10;
-SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
 
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time_flush.inc'
--- mysql-test/response-time-distribution.patch/percona_query_response_time_flush.inc	2010-09-29 21:16:20 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time_flush.inc	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-FLUSH QUERY_RESPONSE_TIME;
 
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time_show.inc'
--- mysql-test/response-time-distribution.patch/percona_query_response_time_show.inc	2010-09-29 21:16:20 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time_show.inc	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-SELECT d.count,
-(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count,
-(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count,
-(SELECT COUNT(*)     FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count
-FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0;
-SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 
=== removed file 'mysql-test/response-time-distribution.patch/percona_query_response_time_sleep.inc'
--- mysql-test/response-time-distribution.patch/percona_query_response_time_sleep.inc	2010-09-29 21:16:20 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time_sleep.inc	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-SELECT SLEEP(0.31);
-SELECT SLEEP(0.32);
-SELECT SLEEP(0.33);
-SELECT SLEEP(0.34);
-SELECT SLEEP(0.35);
-SELECT SLEEP(0.36);
-SELECT SLEEP(0.37);
-SELECT SLEEP(0.38);
-SELECT SLEEP(0.39);
-SELECT SLEEP(0.40);
-SELECT SLEEP(1.1);
-SELECT SLEEP(1.2);
-SELECT SLEEP(1.3);
-SELECT SLEEP(1.5);
-SELECT SLEEP(1.4);
-SELECT SLEEP(0.5);
-SELECT SLEEP(2.1);
-SELECT SLEEP(2.3);
-SELECT SLEEP(2.5);
 
=== removed directory 'mysql-test/slow_extended.patch'
=== removed file 'mysql-test/slow_extended.patch/grep.inc'
--- mysql-test/slow_extended.patch/grep.inc	2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/grep.inc	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-perl;
-
-  $file = $ENV{'grep_file'};
-  $pattern = $ENV{'grep_pattern'};
-
-  open(FILE, "$file")
-    or die("Cannot open file $file: $!\n");
-
-  $lines = 0;
-  while(<FILE>) {
-    $lines++ if (/$pattern/);
-  }
-  print "$lines\n";
-
-  close(FILE);
-EOF
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---use_global_long_query_time --log_slow_verbosity="full"
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.result	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-show variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-show variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	long_query_time
-show variables like 'log_slow_verbosity';
-Variable_name	Value
-log_slow_verbosity	microtime,query_plan,innodb
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-show global variables like 'log_slow_verbosity';
-Variable_name	Value
-log_slow_verbosity	microtime,query_plan,innodb
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	long_query_time
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.test	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-show variables like 'use_global_long_query_time';
-show variables like 'use_global_log_slow_control';
-show variables like 'log_slow_verbosity';
-show global variables like 'use_global_long_query_time';
-show global variables like 'log_slow_verbosity';
-show global variables like 'use_global_log_slow_control';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---use_global_log_slow_control="long_query_time"
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.result	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-show variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-show variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	long_query_time
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	long_query_time
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.test	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-show variables like 'use_global_long_query_time';
-show variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-show global variables like 'use_global_log_slow_control';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-SELECT sleep(2);
-sleep(2)
-0
-set global log_slow_verbosity=innodb;
-set global use_global_log_slow_control="log_slow_verbosity,long_query_time";
-SELECT sleep(2);
-sleep(2)
-0
-set global use_global_log_slow_control=none;
-set global log_slow_verbosity=microtime;
-FLUSH LOGS;
-1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-source include/have_innodb.inc;
-SELECT sleep(2);
-set global log_slow_verbosity=innodb;
-set global use_global_log_slow_control="log_slow_verbosity,long_query_time";
-SELECT sleep(2);
-set global use_global_log_slow_control=none;
-set global log_slow_verbosity=microtime;
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log
---let grep_pattern = No InnoDB statistics available for this query
---source include/grep.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-SET GLOBAL SLOW_QUERY_LOG=OFF;
-drop table if exists t;
-# Create test table
-create table t(id INT PRIMARY KEY) engine=InnoDB;
-# Insert two rows to test table
-insert into t values(1);
-insert into t values(2);
-insert into t values(3);
-SET GLOBAL SLOW_QUERY_LOG=ON;
-SELECT sleep(2);
-sleep(2)
-0
-set log_slow_filter=full_join;
-SELECT sleep(2) union select t2.id from t as t1,t as t2;
-sleep(2)
-0
-1
-2
-3
-SELECT sleep(2);
-sleep(2)
-0
-drop table if exists t;
-FLUSH LOGS;
-2
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-source include/have_innodb.inc;
-
-SET GLOBAL SLOW_QUERY_LOG=OFF;
-
---disable_warnings
-drop table if exists t;
---enable_warnings
-
---echo # Create test table
-create table t(id INT PRIMARY KEY) engine=InnoDB;
---echo # Insert two rows to test table
-insert into t values(1);
-insert into t values(2);
-insert into t values(3);
-
-SET GLOBAL SLOW_QUERY_LOG=ON;
-
-SELECT sleep(2);
-
-set log_slow_filter=full_join;
-
-SELECT sleep(2) union select t2.id from t as t1,t as t2;
-SELECT sleep(2);
-
---disable_warnings
-drop table if exists t;
---enable_warnings
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log
---let grep_pattern = Query_time
---source include/grep.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---log_slow_sp_statements
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show global variables like 'log_slow_sp_statements';
-Variable_name	Value
-log_slow_sp_statements	ON
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-show global variables like 'log_slow_sp_statements';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---log_slow_timestamp_every
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show global variables like 'log_slow_timestamp_every';
-Variable_name	Value
-log_slow_timestamp_every	ON
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-show global variables like 'log_slow_timestamp_every';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---log_slow_verbosity="full"
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-show global variables like 'log_slow_verbosity';
-Variable_name	Value
-log_slow_verbosity	microtime,query_plan,innodb
-show variables like 'log_slow_verbosity';
-Variable_name	Value
-log_slow_verbosity	microtime,query_plan,innodb
-select @@log_slow_verbosity;
-@@log_slow_verbosity
-microtime,query_plan,innodb
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show global variables like 'log_slow_verbosity';
-show variables like 'log_slow_verbosity';
-select @@log_slow_verbosity;
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-SELECT sleep(2);
-sleep(2)
-0
-set log_slow_verbosity=innodb;
-SELECT sleep(2);
-sleep(2)
-0
-FLUSH LOGS;
-1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-source include/have_innodb.inc;
-
-SELECT sleep(2);
-
-set log_slow_verbosity=innodb;
-
-SELECT sleep(2);
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log
---let grep_pattern = No InnoDB statistics available for this query
---source include/grep.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-SELECT sleep(1);
-sleep(1)
-0
-SELECT sleep(3);
-sleep(3)
-0
-SELECT sleep(5);
-sleep(5)
-0
-set long_query_time=4;
-SELECT sleep(1);
-sleep(1)
-0
-SELECT sleep(3);
-sleep(3)
-0
-SELECT sleep(5);
-sleep(5)
-0
-set long_query_time=2;
-FLUSH LOGS;
-3
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-source include/have_innodb.inc;
-
-SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
-
-set long_query_time=4;
-
-SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
-
-set long_query_time=2;
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
---let grep_pattern = Query_time
---source include/grep.inc
-
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-SELECT sleep(2);
-sleep(2)
-0
-set global slow_query_log_microseconds_timestamp=ON;
-SELECT sleep(2);
-sleep(2)
-0
-set global slow_query_log_microseconds_timestamp=OFF;
-FLUSH LOGS;
-1
-2
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-source include/have_innodb.inc;
-
-SELECT sleep(2);
-
-set global slow_query_log_microseconds_timestamp=ON;
-
-SELECT sleep(2);
-
-set global slow_query_log_microseconds_timestamp=OFF;
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
---let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
---source include/grep.inc
-
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log 
---let grep_pattern =  # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
---source include/grep.inc
-
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-SET GLOBAL SLOW_QUERY_LOG=OFF;
-drop table if exists t;
-# Create test table
-create table t(id INT PRIMARY KEY) engine=InnoDB;
-# Insert two rows to test table
-insert into t values(1);
-insert into t values(2);
-insert into t values(3);
-SET GLOBAL SLOW_QUERY_LOG=ON;
-SELECT sleep(2);
-sleep(2)
-0
-set min_examined_row_limit=5;
-SELECT sleep(2) union select t2.id from t as t1,t as t2;
-sleep(2)
-0
-1
-2
-3
-SELECT sleep(2);
-sleep(2)
-0
-drop table if exists t;
-FLUSH LOGS;
-2
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-source include/have_innodb.inc;
-
-SET GLOBAL SLOW_QUERY_LOG=OFF;
-
---disable_warnings
-drop table if exists t;
---enable_warnings
-
---echo # Create test table
-create table t(id INT PRIMARY KEY) engine=InnoDB;
---echo # Insert two rows to test table
-insert into t values(1);
-insert into t values(2);
-insert into t values(3);
-
-SET GLOBAL SLOW_QUERY_LOG=ON;
-
-SELECT sleep(2);
-
-set min_examined_row_limit=5;
-
-SELECT sleep(2) union select t2.id from t as t1,t as t2;
-SELECT sleep(2);
-
---disable_warnings
-drop table if exists t;
---enable_warnings
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log
---let grep_pattern = Query_time
---source include/grep.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt	2010-11-18 12:38:25 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt	2010-11-18 12:38:25 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result	2011-05-26 10:57:17 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-include/master-slave.inc
-[connection master]
-DROP TABLE IF EXISTS t;
-CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
-INSERT INTO t VALUES
-(1,"aaaaabbbbbcccccdddddeeeeefffff"),
-(2,"aaaaabbbbbcccccdddddeeeeefffff"),
-(3,"aaaaabbbbbcccccdddddeeeeefffff"),
-(4,"aaaaabbbbbcccccdddddeeeeefffff"),
-(5,"aaaaabbbbbcccccdddddeeeeefffff");
-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t SELECT t.id,t.data from t;
-FLUSH LOGS;
-4
-DROP TABLE IF EXISTS t;
-include/rpl_end.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test	2011-05-26 10:57:17 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
--- source include/have_binlog_format_mixed_or_statement.inc
--- source include/have_innodb.inc
--- source include/master-slave.inc
-
-connection master;
--- disable_warnings
-DROP TABLE IF EXISTS t;
--- enable_warnings
-CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
-INSERT INTO t VALUES
-(1,"aaaaabbbbbcccccdddddeeeeefffff"),
-(2,"aaaaabbbbbcccccdddddeeeeefffff"),
-(3,"aaaaabbbbbcccccdddddeeeeefffff"),
-(4,"aaaaabbbbbcccccdddddeeeeefffff"),
-(5,"aaaaabbbbbcccccdddddeeeeefffff");
-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
-INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
-sync_slave_with_master;
-
-connection slave;
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
-
-connection master;
-INSERT INTO t SELECT t.id,t.data from t;
-sync_slave_with_master;
-
-connection slave;
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
---let grep_pattern =  InnoDB_IO_r_ops
---source include/grep.inc
-
-connection master;
-DROP TABLE IF EXISTS t;
---source include/rpl_end.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result	2011-02-26 09:03:28 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-# Activate master-slave replication
-include/master-slave.inc
-[connection master]
-# Make table t for test
-DROP TABLE IF EXISTS t;
-CREATE TABLE t(id INT);
-# Start slave replication
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (1);
-# Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	OFF
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	ON
-INSERT INTO t VALUES (2);
-# Restart slave
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (3);
-show        variables like 'long_query_time';
-Variable_name	Value
-long_query_time	1.000000
-show global variables like 'long_query_time';
-Variable_name	Value
-long_query_time	1.000000
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-set global long_query_time=0;
-show        variables like 'long_query_time';
-Variable_name	Value
-long_query_time	1.000000
-show global variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-INSERT INTO t VALUES (4);
-show        variables like 'long_query_time';
-Variable_name	Value
-long_query_time	1.000000
-show global variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-set global  use_global_long_query_time=1;
-show        variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-INSERT INTO t VALUES (5);
-show        variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'long_query_time';
-Variable_name	Value
-long_query_time	0.000000
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-set global long_query_time=1;
-set global use_global_long_query_time=0;
-FLUSH LOGS;
-# Analyse master slow_query_log
-0
-0
-0
-0
-0
-FLUSH LOGS;
-# Analyse slave slow_query_log
-0
-0
-0
-0
-1
-set global log_slow_slave_statements=OFF;
-DROP TABLE t;
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test	2011-02-26 09:03:28 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
--- source include/have_binlog_format_mixed_or_statement.inc
--- echo # Activate master-slave replication
--- source include/master-slave.inc
-
-connection master;
--- echo # Make table t for test
--- disable_warnings
-DROP TABLE IF EXISTS t;
--- enable_warnings
-CREATE TABLE t(id INT);
-
-
--- echo # Start slave replication
--- disable_warnings
-connection slave;
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
--- enable_warnings
-
-#-- echo # Make insert(1) on master
-connection master;
-INSERT INTO t VALUES (1);
-sync_slave_with_master;
-connection slave;
--- echo # Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-
-#-- echo # Make insert(2) on master
-connection master;
-INSERT INTO t VALUES (2);
-sync_slave_with_master;
-connection slave;
--- echo # Restart slave
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
-
-#-- echo # Make insert(3) on master
-connection master;
-INSERT INTO t VALUES (3);
-sync_slave_with_master;
-connection slave;
-show        variables like 'long_query_time';
-show global variables like 'long_query_time';
-show global variables like 'use_global_long_query_time';
-set global long_query_time=0;
-show        variables like 'long_query_time';
-show global variables like 'long_query_time';
-show global variables like 'use_global_long_query_time';
-
-#-- echo # Make insert(4) on master
-connection master;
-INSERT INTO t VALUES (4);
-sync_slave_with_master;
-connection slave;
-show        variables like 'long_query_time';
-show global variables like 'long_query_time';
-show global variables like 'use_global_long_query_time';
-set global  use_global_long_query_time=1;
-show        variables like 'long_query_time';
-show global variables like 'long_query_time';
-show global variables like 'use_global_long_query_time';
-
-#-- echo # Make insert(5) on master
-connection master;
-INSERT INTO t VALUES (5);
-sync_slave_with_master;
-connection slave;
-show        variables like 'long_query_time';
-show global variables like 'long_query_time';
-show global variables like 'use_global_long_query_time';
-set global long_query_time=1;
-set global use_global_long_query_time=0;
-
-connection master;
-FLUSH LOGS;
-
--- echo # Analyse master slow_query_log
-let $i=5;
-let $k=1;
-while($i)
-{
-    --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
-    --let grep_pattern = INSERT INTO t VALUES \($k\)
-    --source include/grep.inc
-    dec $i;
-    inc $k;
-}
-
-connection slave;
-FLUSH LOGS;
-
--- echo # Analyse slave slow_query_log
-let $i=5;
-let $k=1;
-while($i)
-{
-    --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
-    --let grep_pattern = INSERT INTO t VALUES \($k\)
-    --source include/grep.inc
-    dec $i;
-    inc $k;
-}
-set global log_slow_slave_statements=OFF;
-
-connection master;
-DROP TABLE t;
-
-sync_slave_with_master;
-connection slave;
-
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=0
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=0
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result	2011-02-26 09:03:28 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-# Activate master-slave replication
-include/master-slave.inc
-[connection master]
-# Make table t for test
-DROP TABLE IF EXISTS t;
-CREATE TABLE t(id INT);
-# Start slave replication
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (1);
-# Read information about master binlog
-# Sync(1) slave thread
-# Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	OFF
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	ON
-INSERT INTO t VALUES (2);
-# Read information about master binlog
-# Sync slave(2) thread
-# Restart slave
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (3);
-# Read information about master binlog
-# Sync(3) slave thread
-# Read and change log_slow_slave_statements to OFF on slave
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	ON
-set global log_slow_slave_statements=OFF;
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	OFF
-INSERT INTO t VALUES (4);
-# Read information about master binlog
-# Sync slave(4) thread
-# Restart slave
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (5);
-# Read information about master binlog
-# Sync slave(5) thread
-# Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	OFF
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-Variable_name	Value
-log_slow_slave_statements	ON
-INSERT INTO t VALUES (6);
-# Read information about master binlog
-# Sync slave(6) thread
-# Restart slave
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
-START SLAVE;
-include/wait_for_slave_to_start.inc
-INSERT INTO t VALUES (7);
-# Read information about master binlog
-# Sync slave(7) thread
-FLUSH LOGS;
-# Analyse master slow_query_log
-1
-1
-1
-1
-1
-1
-1
-FLUSH LOGS;
-# Analyse slave slow_query_log
-0
-0
-1
-0
-0
-0
-1
-set global log_slow_slave_statements=OFF;
-DROP TABLE t;
-# Read information about master binlog
-# Sync slave(8) thread
-STOP SLAVE;
-include/wait_for_slave_to_stop.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test	2011-02-26 09:03:28 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
--- source include/have_binlog_format_mixed_or_statement.inc
--- echo # Activate master-slave replication
--- source include/master-slave.inc
-
-connection master;
--- echo # Make table t for test
--- disable_warnings
-DROP TABLE IF EXISTS t;
--- enable_warnings
-CREATE TABLE t(id INT);
-
-
--- echo # Start slave replication
--- disable_warnings
-connection slave;
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
--- enable_warnings
-
-#-- echo # Make insert(1) on master
-connection master;
-INSERT INTO t VALUES (1);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync(1) slave thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
-
--- echo # Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-
-#-- echo # Make insert(2) on master
-connection master;
-INSERT INTO t VALUES (2);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(2) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
--- echo # Restart slave
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
-
-#-- echo # Make insert(3) on master
-connection master;
-INSERT INTO t VALUES (3);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync(3) slave thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
--- echo # Read and change log_slow_slave_statements to OFF on slave
-show variables like 'log_slow_slave_statements';
-set global log_slow_slave_statements=OFF;
-show variables like 'log_slow_slave_statements';
-
-#-- echo # Make insert(4) on master
-connection master;
-INSERT INTO t VALUES (4);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let  $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(4) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
--- echo # Restart slave
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
-
-#-- echo # Make insert(5) on master
-connection master;
-INSERT INTO t VALUES (5);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(5) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
--- echo # Read and change log_slow_slave_statements to ON on slave
-show variables like 'log_slow_slave_statements';
-set global log_slow_slave_statements=ON;
-show variables like 'log_slow_slave_statements';
-
-#-- echo # Make insert(6) on master
-connection master;
-INSERT INTO t VALUES (6);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(6) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
--- echo # Restart slave
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
-START SLAVE;
--- source include/wait_for_slave_to_start.inc
-
-#-- echo # Make insert(7) on master
-connection master;
-INSERT INTO t VALUES (7);
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(7) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
-
-connection master;
-FLUSH LOGS;
-
--- echo # Analyse master slow_query_log
-let $i=7;
-let $k=1;
-while($i)
-{
-    --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
-    --let grep_pattern = INSERT INTO t VALUES \($k\)
-    --source include/grep.inc
-    dec $i;
-    inc $k;
-}
-
-connection slave;
-FLUSH LOGS;
-
--- echo # Analyse slave slow_query_log
-let $i=7;
-let $k=1;
-while($i)
-{
-    --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
-    --let grep_pattern = INSERT INTO t VALUES \($k\)
-    --source include/grep.inc
-    dec $i;
-    inc $k;
-}
-set global log_slow_slave_statements=OFF;
-
-connection master;
-DROP TABLE t;
-
--- echo # Read information about master binlog
-let $binlog_file     = query_get_value(SHOW MASTER STATUS,File,1);
-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
-
--- echo # Sync slave(8) thread
-connection slave;
-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
-
-STOP SLAVE;
--- source include/wait_for_slave_to_stop.inc
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow_query_log_microseconds_timestamp
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show global variables like 'slow_query_log_microseconds_timestamp';
-Variable_name	Value
-slow_query_log_microseconds_timestamp	ON
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-show global variables like 'slow_query_log_microseconds_timestamp';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---use_global_long_query_time
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test	2010-12-22 20:15:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-show global variables like 'use_global_long_query_time';
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --use_global_log_slow_control=long_query_time --use_global_long_query_time=1
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-SELECT sleep(1);
-sleep(1)
-0
-SELECT sleep(3);
-sleep(3)
-0
-SELECT sleep(5);
-sleep(5)
-0
-set global long_query_time=4;
-set global use_global_long_query_time=1;
-SELECT sleep(1);
-sleep(1)
-0
-SELECT sleep(3);
-sleep(3)
-0
-SELECT sleep(5);
-sleep(5)
-0
-set global long_query_time=2;
-set global use_global_long_query_time=0;
-FLUSH LOGS;
-3
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	none
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-set global use_global_log_slow_control = long_query_time;
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	long_query_time
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-set global use_global_log_slow_control = log_slow_filter;
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	log_slow_filter
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-set global use_global_long_query_time = ON;
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	log_slow_filter,long_query_time
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	ON
-set global use_global_long_query_time = OFF;
-show global variables like 'use_global_log_slow_control';
-Variable_name	Value
-use_global_log_slow_control	log_slow_filter
-show global variables like 'use_global_long_query_time';
-Variable_name	Value
-use_global_long_query_time	OFF
-set global use_global_log_slow_control = long_query_time;
 
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test	2010-12-29 19:06:24 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-source include/have_innodb.inc;
-
-SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
-
-set global long_query_time=4;
-set global use_global_long_query_time=1;
-
-SELECT sleep(1);
-SELECT sleep(3);
-SELECT sleep(5);
-
-set global long_query_time=2;
-set global use_global_long_query_time=0;
-
-FLUSH LOGS;
---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
---let grep_pattern = Query_time
---source include/grep.inc
-
-show global variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-
-set global use_global_log_slow_control = long_query_time;
-show global variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-
-set global use_global_log_slow_control = log_slow_filter;
-show global variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-
-set global use_global_long_query_time = ON;
-show global variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-
-set global use_global_long_query_time = OFF;
-show global variables like 'use_global_log_slow_control';
-show global variables like 'use_global_long_query_time';
-
-set global use_global_log_slow_control = long_query_time;
 
=== modified file 'mysql_dump_ignore_ct.patch'
--- mysql_dump_ignore_ct.patch	2011-05-10 07:31:20 +0000
+++ mysql_dump_ignore_ct.patch	2011-07-27 08:44:25 +0000
@@ -6,8 +6,8 @@
 # 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-04-06 23:03:48.000000000 +0900
-+++ b/client/client_priv.h	2010-04-30 19:37:42.000000000 +0900
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -68,6 +68,7 @@
    OPT_MYSQL_LOCK_DIRECTORY,
    OPT_USE_THREADS,
@@ -17,8 +17,8 @@
    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
    OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,
 diff -ruN a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c	2010-04-06 23:03:49.000000000 +0900
-+++ b/client/mysqldump.c	2010-04-30 19:41:20.000000000 +0900
+--- a/client/mysqldump.c
++++ b/client/mysqldump.c
 @@ -98,7 +98,7 @@
                  opt_complete_insert= 0, opt_drop_database= 0,
                  opt_replace_into= 0,
@@ -38,16 +38,15 @@
    {"lines-terminated-by", OPT_LTB, 
     "Lines in the output file are terminated by the given string.",
     &lines_terminated, &lines_terminated, 0, GET_STR,
-@@ -2318,13 +2321,21 @@
-       /* Make an sql-file, if path was given iow. option -T was given */
+@@ -2319,12 +2322,20 @@
        char buff[20+FN_REFLEN];
        MYSQL_FIELD *field;
-+   
+ 
 +      my_bool old_ignore_errors=ignore_errors;
 +      //fprintf(stderr, "ignore create table %d\n", opt_ignore_show_create_table_error);
 +      if (opt_ignore_show_create_table_error)
 +         ignore_errors=1;
- 
++
        my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
  
        if (switch_character_set_results(mysql, "binary") ||
 
=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch	2011-05-12 11:00:37 +0000
+++ query_cache_enhance.patch	2011-07-27 08:44:25 +0000
@@ -5,9 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/query_cache_enhance.patch b/patch_info/query_cache_enhance.patch
---- a/patch_info/query_cache_enhance.patch	1970-01-01 03:00:00.000000000 +0300
-+++ b/patch_info/query_cache_enhance.patch	2010-07-21 01:42:09.650424002 +0400
+diff -ruN /dev/null b/patch_info/query_cache_enhance.patch
+--- /dev/null
++++ b/patch_info/query_cache_enhance.patch
 @@ -0,0 +1,14 @@
 +File=query_cache_enhance.patch
 +Name= query cache Percona's cumulative patch
@@ -24,9 +24,9 @@
 +2010-07 - Fix incorrect behavior diff (query_cache_with_comments.patch)
 +2010-09 - Merge patches to one
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-28 16:47:41.134069529 +0400
-+++ b/sql/mysqld.cc	2010-07-28 16:47:41.704071184 +0400
-@@ -526,6 +526,7 @@
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -527,6 +527,7 @@
  my_bool opt_log_slow_slave_statements= 0;
  my_bool opt_log_slow_sp_statements= 0;
  my_bool opt_log_slow_timestamp_every= 0;
@@ -34,7 +34,7 @@
  my_bool opt_use_global_long_query_time= 0;
  my_bool opt_slow_query_log_microseconds_timestamp= 0;
  my_bool lower_case_file_system= 0;
-@@ -5898,6 +5899,7 @@
+@@ -5900,6 +5901,7 @@
    OPT_THREAD_STATISTICS,
    OPT_OPTIMIZER_FIX,
    OPT_SUPPRESS_LOG_WARNING_1592,
@@ -42,7 +42,7 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
-@@ -6953,6 +6955,10 @@
+@@ -6955,6 +6957,10 @@
    {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
      "Choose flags, wich always use the global variables. Multiple flags allowed in a comma-separated string. [none, log_slow_filter, log_slow_rate_limit, log_slow_verbosity, long_query_time, min_examined_row_limit, all]",
     0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},
@@ -54,8 +54,8 @@
     "Control always use global long_query_time or local long_query_time.",
     (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
 diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
---- a/sql/mysql_priv.h	2010-07-28 16:47:41.144071083 +0400
-+++ b/sql/mysql_priv.h	2010-07-28 16:47:41.714068826 +0400
+--- a/sql/mysql_priv.h
++++ b/sql/mysql_priv.h
 @@ -2118,6 +2118,7 @@
  extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;
  extern my_bool opt_log_slow_sp_statements;
@@ -64,9 +64,9 @@
  extern my_bool opt_use_global_long_query_time;
  extern my_bool opt_slow_query_log_microseconds_timestamp;
  extern my_bool sp_automatic_privileges, opt_noacl;
-diff -ruN a/sql/query_strip_comments.h b/sql/query_strip_comments.h
---- a/sql/query_strip_comments.h	1970-01-01 03:00:00.000000000 +0300
-+++ b/sql/query_strip_comments.h	2010-07-28 16:47:41.724072335 +0400
+diff -ruN /dev/null b/sql/query_strip_comments.h
+--- /dev/null
++++ b/sql/query_strip_comments.h
 @@ -0,0 +1,37 @@
 +#ifndef _SQL_QUERY_STRIPC_COMMENTS_H_
 +#define _SQL_QUERY_STRIPC_COMMENTS_H_
@@ -106,8 +106,8 @@
 +#endif // HAVE_QUERY_CACHE
 +#endif // _SQL_QUERY_STRIPC_COMMENTS_H_
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc	2010-07-28 16:47:41.124069093 +0400
-+++ b/sql/set_var.cc	2010-07-28 16:47:41.734068580 +0400
+--- a/sql/set_var.cc
++++ b/sql/set_var.cc
 @@ -124,8 +124,10 @@
  static void fix_net_write_timeout(THD *thd, enum_var_type type);
  static void fix_net_retry_count(THD *thd, enum_var_type type);
@@ -137,15 +137,12 @@
 +                                             &query_cache_size,
 +                                             fix_query_cache_size);
  static sys_var_long_ptr	sys_query_cache_limit(&vars, "query_cache_limit",
--					      &query_cache.query_cache_limit);
+ 					      &query_cache.query_cache_limit);
 -static sys_var_long_ptr        sys_query_cache_min_res_unit(&vars, "query_cache_min_res_unit",
--						     &query_cache_min_res_unit,
--						     fix_query_cache_min_res_unit);
-+                                              &query_cache.query_cache_limit);
 +static sys_var_long_ptr
 +  sys_query_cache_min_res_unit(&vars, "query_cache_min_res_unit",
-+                               &query_cache_min_res_unit,
-+                               fix_query_cache_min_res_unit);
+ 						     &query_cache_min_res_unit,
+ 						     fix_query_cache_min_res_unit);
 +static int check_query_cache_type(THD *thd, set_var *var);
  static sys_var_thd_enum	sys_query_cache_type(&vars, "query_cache_type",
  					     &SV::query_cache_type,
@@ -164,7 +161,7 @@
  static sys_var_const_str_ptr    sys_repl_report_password(&vars, "report_password", &report_password);
  
  static uchar *slave_get_report_port(THD *thd)
-@@ -1250,10 +1257,9 @@
+@@ -1255,10 +1262,9 @@
  {}
  #endif /* HAVE_REPLICATION */
  
@@ -176,7 +173,7 @@
    ulong new_cache_size= query_cache.resize(query_cache_size);
  
    /*
-@@ -1267,11 +1273,35 @@
+@@ -1272,11 +1278,35 @@
  			query_cache_size, new_cache_size);
    
    query_cache_size= new_cache_size;
@@ -214,7 +211,7 @@
  static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
  {
    query_cache_min_res_unit= 
-@@ -3629,6 +3659,16 @@
+@@ -3634,6 +3664,16 @@
    Functions to handle SET mysql_internal_variable=const_expr
  *****************************************************************************/
  
@@ -232,8 +229,8 @@
  {
    if (var->is_readonly())
 diff -ruN a/sql/sql_cache.cc b/sql/sql_cache.cc
---- a/sql/sql_cache.cc	2010-07-28 16:47:41.134069529 +0400
-+++ b/sql/sql_cache.cc	2010-07-28 16:47:41.754069731 +0400
+--- a/sql/sql_cache.cc
++++ b/sql/sql_cache.cc
 @@ -286,6 +286,7 @@
           if (and only if) this query has a registered result set writer
           (thd->net.query_cache_query).
@@ -510,16 +507,10 @@
      goto err;
  
    if (!thd->lex->safe_to_cache_query)
-@@ -1426,21 +1621,103 @@
+@@ -1426,6 +1621,87 @@
  
    {
      uint i= 0;
--    /*
--      Skip '(' characters in queries like following:
--      (select a from t1) union (select a from t1);
--    */
--    while (sql[i]=='(')
--      i++;
 +    if(opt_query_cache_strip_comments)
 +    {
 +      /* Skip all comments and non-letter symbols */
@@ -601,32 +592,17 @@
 +    }
 +    else // if(opt_query_cache_strip_comments)
 +    {
-+      /*
-+        Skip '(' characters in queries like following:
-+        (select a from t1) union (select a from t1);
-+      */
-+      while (sql[i]=='(')
-+        i++;
+     /*
+       Skip '(' characters in queries like following:
+       (select a from t1) union (select a from t1);
+@@ -1433,6 +1709,7 @@
+     while (sql[i]=='(')
+       i++;
  
--    /*
--      Test if the query is a SELECT
--      (pre-space is removed in dispatch_command).
 +    } // if(opt_query_cache_strip_comments)    
-+      /*
-+        Test if the query is a SELECT
-+        (pre-space is removed in dispatch_command).
- 
--      First '/' looks like comment before command it is not
--      frequently appeared in real life, consequently we can
--      check all such queries, too.
--    */
-+        First '/' looks like comment before command it is not
-+        frequently appeared in real life, consequently we can
-+        check all such queries, too.
-+      */
-     if ((my_toupper(system_charset_info, sql[i])     != 'S' ||
-          my_toupper(system_charset_info, sql[i + 1]) != 'E' ||
-          my_toupper(system_charset_info, sql[i + 2]) != 'L') &&
+     /*
+       Test if the query is a SELECT
+       (pre-space is removed in dispatch_command).
 @@ -1449,7 +1726,6 @@
        DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached"));
        goto err;
@@ -689,17 +665,15 @@
    for (; tables_used; tables_used= tables_used->next_local)
    {
      thd_proc_info(thd, "invalidating query cache entries (table)");
-@@ -1804,7 +2096,9 @@
+@@ -1804,6 +2096,8 @@
  			     my_bool using_transactions)
  {
    DBUG_ENTER("Query_cache::invalidate (table)");
--  
 +  if (is_disabled())
 +    DBUG_VOID_RETURN;
-+
+   
    using_transactions= using_transactions &&
      (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
-   if (using_transactions && 
 @@ -1821,6 +2115,8 @@
  			     my_bool using_transactions)
  {
@@ -765,8 +739,8 @@
  #endif /*HAVE_QUERY_CACHE*/
 +
 diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	2010-07-28 16:47:41.134069529 +0400
-+++ b/sql/sql_class.h	2010-07-28 16:47:41.764070446 +0400
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
 @@ -22,7 +22,9 @@
  
  #include "log.h"
@@ -778,7 +752,7 @@
  /**
    An interface that is used to take an action when
    the locking module notices that a table version has changed
-@@ -667,6 +669,9 @@
+@@ -670,6 +672,9 @@
    */
    LEX_STRING query_string;
    Server_side_cursor *cursor;
@@ -788,9 +762,9 @@
  
    inline char *query() { return query_string.str; }
    inline uint32 query_length() { return query_string.length; }
-diff -ruN a/mysql-test/r/query_cache_disabled.result b/mysql-test/r/query_cache_disabled.result
---- a/mysql-test/r/query_cache_disabled.result	1970-01-01 03:00:00.000000000 +0300
-+++ b/mysql-test/r/query_cache_disabled.result	2010-07-31 20:44:34.764016531 +0400
+diff -ruN /dev/null b/mysql-test/r/query_cache_disabled.result
+--- /dev/null
++++ b/mysql-test/r/query_cache_disabled.result
 @@ -0,0 +1,14 @@
 +SHOW GLOBAL VARIABLES LIKE 'query_cache_type';
 +Variable_name	Value
@@ -806,14 +780,14 @@
 +Variable_name	Value
 +query_cache_size	1048576
 +SET GLOBAL query_cache_size=0;
-diff -ruN a/mysql-test/t/query_cache_disabled-master.opt b/mysql-test/t/query_cache_disabled-master.opt
---- a/mysql-test/t/query_cache_disabled-master.opt	1970-01-01 03:00:00.000000000 +0300
-+++ b/mysql-test/t/query_cache_disabled-master.opt	2010-07-31 20:41:47.184017514 +0400
+diff -ruN /dev/null b/mysql-test/t/query_cache_disabled-master.opt
+--- /dev/null
++++ b/mysql-test/t/query_cache_disabled-master.opt
 @@ -0,0 +1 @@
 +--query_cache_type=0
-diff -ruN a/mysql-test/t/query_cache_disabled.test b/mysql-test/t/query_cache_disabled.test
---- a/mysql-test/t/query_cache_disabled.test	1970-01-01 03:00:00.000000000 +0300
-+++ b/mysql-test/t/query_cache_disabled.test	2010-07-31 20:41:47.184017514 +0400
+diff -ruN /dev/null b/mysql-test/t/query_cache_disabled.test
+--- /dev/null
++++ b/mysql-test/t/query_cache_disabled.test
 @@ -0,0 +1,15 @@
 +-- source include/have_query_cache.inc
 +#
@@ -831,8 +805,8 @@
 +SET GLOBAL query_cache_size=0;
 +
 diff -ruN a/sql/set_var.h b/sql/set_var.h
---- a/sql/set_var.h	2010-07-31 20:42:00.884030418 +0400
-+++ b/sql/set_var.h	2010-07-31 20:41:47.224016185 +0400
+--- a/sql/set_var.h
++++ b/sql/set_var.h
 @@ -521,10 +521,16 @@
    { chain_sys_var(chain); }
    bool check(THD *thd, set_var *var)
@@ -855,8 +829,8 @@
    bool update(THD *thd, set_var *var);
    void set_default(THD *thd, enum_var_type type);
 diff -ruN a/sql/share/errmsg.txt b/sql/share/errmsg.txt
---- a/sql/share/errmsg.txt	2010-07-09 16:35:08.000000000 +0400
-+++ b/sql/share/errmsg.txt	2010-07-31 20:41:47.244015659 +0400
+--- a/sql/share/errmsg.txt
++++ b/sql/share/errmsg.txt
 @@ -6213,3 +6213,8 @@
  ER_DEBUG_SYNC_HIT_LIMIT
    eng "debug sync point hit limit reached"
@@ -867,8 +841,8 @@
 +  eng "Query cache is disabled; restart the server with query_cache_type=1 to enable it"
 +
 diff -ruN a/sql/sql_cache.h b/sql/sql_cache.h
---- a/sql/sql_cache.h	2010-07-09 16:35:15.000000000 +0400
-+++ b/sql/sql_cache.h	2010-07-31 20:41:47.264017369 +0400
+--- a/sql/sql_cache.h
++++ b/sql/sql_cache.h
 @@ -279,8 +279,11 @@
    enum Cache_lock_status { UNLOCKED, LOCKED_NO_WAIT, LOCKED };
    Cache_lock_status m_cache_lock_status;
 
=== renamed file 'response-time-distribution.patch' => 'response_time_distribution.patch'
--- response-time-distribution.patch	2011-07-20 03:48:37 +0000
+++ response_time_distribution.patch	2011-07-27 08:44:25 +0000
@@ -5,28 +5,3863 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
+diff -ruN a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -1738,6 +1738,7 @@
+   int main()
+   {
+     int foo= -10; int bar= 10;
++    long long int foo64= -10; long long int bar64= 10;
+     if (!__sync_fetch_and_add(&foo, bar) || foo)
+       return -1;
+     bar= __sync_lock_test_and_set(&foo, bar);
+@@ -1746,6 +1747,14 @@
+     bar= __sync_val_compare_and_swap(&bar, foo, 15);
+     if (bar)
+       return -1;
++    if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
++      return -1;
++    bar64= __sync_lock_test_and_set(&foo64, bar64);
++    if (bar64 || foo64 != 10)
++      return -1;
++    bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
++    if (bar64)
++      return -1;
+     return 0;
+   }
+ ], [mysql_cv_gcc_atomic_builtins=yes],
+@@ -1757,6 +1766,46 @@
+             [Define to 1 if compiler provides atomic builtins.])
+ fi
+ 
++AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
++               [mysql_cv_solaris_atomic],
++  [AC_RUN_IFELSE(
++     [AC_LANG_PROGRAM(
++        [[
++        #include <atomic.h>
++        ]],
++     [[
++        int foo = -10; int bar = 10;
++        int64_t foo64 = -10; int64_t bar64 = 10;
++        if (atomic_add_int_nv((uint_t *)&foo, bar) || foo)
++          return -1;
++        bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar);
++        if (bar || foo != 10)
++          return -1;
++        bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15);
++        if (bar)
++          return -1;
++        if (atomic_add_64_nv((volatile uint64_t *)&foo64, bar64) || foo64)
++          return -1;
++        bar64 = atomic_swap_64((volatile uint64_t *)&foo64, (uint64_t)bar64);
++        if (bar64 || foo64 != 10)
++          return -1;
++        bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
++        if (bar64)
++          return -1;
++        atomic_or_64((volatile uint64_t *)&bar64, 0);
++        return 0;
++     ]]
++     )],
++   [mysql_cv_solaris_atomic=yes],
++   [mysql_cv_solaris_atomic=no],
++   [mysql_cv_solaris_atomic=no]
++)])
++
++if test "x$mysql_cv_solaris_atomic" = xyes; then
++  AC_DEFINE(HAVE_SOLARIS_ATOMIC, 1,
++            [Define to 1 if OS provides atomic_* functions like Solaris.])
++fi
++
+ # Force static compilation to avoid linking problems/get more speed
+ AC_ARG_WITH(mysqld-ldflags,
+     [  --with-mysqld-ldflags   Extra linking arguments for mysqld],
+@@ -2687,7 +2736,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
+diff -ruN /dev/null b/include/atomic/gcc_builtins.h
+--- /dev/null
++++ b/include/atomic/gcc_builtins.h
+@@ -0,0 +1,42 @@
++#ifndef ATOMIC_GCC_BUILTINS_INCLUDED
++#define ATOMIC_GCC_BUILTINS_INCLUDED
++
++/* Copyright (C) 2008 MySQL AB
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++#define make_atomic_add_body(S)                     \
++  v= __sync_fetch_and_add(a, v);
++#define make_atomic_fas_body(S)                     \
++  v= __sync_lock_test_and_set(a, v);
++#define make_atomic_cas_body(S)                     \
++  int ## S sav;                                     \
++  int ## S cmp_val= *cmp;                           \
++  sav= __sync_val_compare_and_swap(a, cmp_val, set);\
++  if (!(ret= (sav == cmp_val))) *cmp= sav
++
++#ifdef MY_ATOMIC_MODE_DUMMY
++#define make_atomic_load_body(S)   ret= *a
++#define make_atomic_store_body(S)  *a= v
++#define MY_ATOMIC_MODE "gcc-builtins-up"
++
++#else
++#define MY_ATOMIC_MODE "gcc-builtins-smp"
++#define make_atomic_load_body(S)                    \
++  ret= __sync_fetch_and_or(a, 0);
++#define make_atomic_store_body(S)                   \
++  (void) __sync_lock_test_and_set(a, v);
++#endif
++
++#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */
+diff -ruN /dev/null b/include/atomic/generic-msvc.h
+--- /dev/null
++++ b/include/atomic/generic-msvc.h
+@@ -0,0 +1,134 @@
++/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++#ifndef _atomic_h_cleanup_
++#define _atomic_h_cleanup_ "atomic/generic-msvc.h"
++
++/*
++  We don't implement anything specific for MY_ATOMIC_MODE_DUMMY, always use
++  intrinsics.
++  8 and 16-bit atomics are not implemented, but it can be done if necessary.
++*/
++#undef MY_ATOMIC_HAS_8_16
++
++#include <windows.h>
++/*
++  x86 compilers (both VS2003 or VS2005) never use instrinsics, but generate 
++  function calls to kernel32 instead, even in the optimized build. 
++  We force intrinsics as described in MSDN documentation for 
++  _InterlockedCompareExchange.
++*/
++#ifdef _M_IX86
++
++#if (_MSC_VER >= 1500)
++#include <intrin.h>
++#else
++C_MODE_START
++/*Visual Studio 2003 and earlier do not have prototypes for atomic intrinsics*/
++LONG _InterlockedCompareExchange (LONG volatile *Target, LONG Value, LONG Comp);
++LONGLONG _InterlockedCompareExchange64 (LONGLONG volatile *Target,
++                                        LONGLONG Value, LONGLONG Comp);
++C_MODE_END
++
++#pragma intrinsic(_InterlockedCompareExchange)
++#pragma intrinsic(_InterlockedCompareExchange64)
++#endif
++
++#define InterlockedCompareExchange _InterlockedCompareExchange
++#define InterlockedCompareExchange64 _InterlockedCompareExchange64
++/*
++ No need to do something special for InterlockedCompareExchangePointer
++ as it is a #define to InterlockedCompareExchange. The same applies to
++ InterlockedExchangePointer. 
++*/
++#endif /*_M_IX86*/
++
++#define MY_ATOMIC_MODE "msvc-intrinsics"
++/* Implement using CAS on WIN32 */
++#define IL_COMP_EXCHG32(X,Y,Z)  \
++  InterlockedCompareExchange((volatile LONG *)(X),(Y),(Z))
++#define IL_COMP_EXCHG64(X,Y,Z)  \
++  InterlockedCompareExchange64((volatile LONGLONG *)(X), \
++                               (LONGLONG)(Y),(LONGLONG)(Z))
++#define IL_COMP_EXCHGptr        InterlockedCompareExchangePointer
++
++#define make_atomic_cas_body(S)                                 \
++  int ## S initial_cmp= *cmp;                                   \
++  int ## S initial_a= IL_COMP_EXCHG ## S (a, set, initial_cmp); \
++  if (!(ret= (initial_a == initial_cmp))) *cmp= initial_a;
++
++#ifndef _M_IX86
++/* Use full set of optimised functions on WIN64 */
++#define IL_EXCHG_ADD32(X,Y)     \
++  InterlockedExchangeAdd((volatile LONG *)(X),(Y))
++#define IL_EXCHG_ADD64(X,Y)     \
++  InterlockedExchangeAdd64((volatile LONGLONG *)(X),(LONGLONG)(Y))
++#define IL_EXCHG32(X,Y)         \
++  InterlockedExchange((volatile LONG *)(X),(Y))
++#define IL_EXCHG64(X,Y)         \
++  InterlockedExchange64((volatile LONGLONG *)(X),(LONGLONG)(Y))
++#define IL_EXCHGptr             InterlockedExchangePointer
++
++#define make_atomic_add_body(S) \
++  v= IL_EXCHG_ADD ## S (a, v)
++#define make_atomic_swap_body(S) \
++  v= IL_EXCHG ## S (a, v)
++#define make_atomic_load_body(S)       \
++  ret= 0; /* avoid compiler warning */ \
++  ret= IL_COMP_EXCHG ## S (a, ret, ret);
++#endif
++/*
++  my_yield_processor (equivalent of x86 PAUSE instruction) should be used
++  to improve performance on hyperthreaded CPUs. Intel recommends to use it in
++  spin loops also on non-HT machines to reduce power consumption (see e.g 
++  http://softwarecommunity.intel.com/articles/eng/2004.htm)
++
++  Running benchmarks for spinlocks implemented with InterlockedCompareExchange
++  and YieldProcessor shows that much better performance is achieved by calling
++  YieldProcessor in a loop - that is, yielding longer. On Intel boxes setting
++  loop count in the range 200-300 brought best results.
++ */
++#ifndef YIELD_LOOPS
++#define YIELD_LOOPS 200
++#endif
++
++static __inline int my_yield_processor()
++{
++  int i;
++  for(i=0; i<YIELD_LOOPS; i++)
++  {
++#if (_MSC_VER <= 1310)
++    /* On older compilers YieldProcessor is not available, use inline assembly*/
++    __asm { rep nop }
++#else
++    YieldProcessor();
++#endif
++  }
++  return 1;
++}
++
++#define LF_BACKOFF my_yield_processor()
++#else /* cleanup */
++
++#undef IL_EXCHG_ADD32
++#undef IL_EXCHG_ADD64
++#undef IL_COMP_EXCHG32
++#undef IL_COMP_EXCHG64
++#undef IL_COMP_EXCHGptr
++#undef IL_EXCHG32
++#undef IL_EXCHG64
++#undef IL_EXCHGptr
++
++#endif
+diff -ruN /dev/null b/include/atomic/nolock.h
+--- /dev/null
++++ b/include/atomic/nolock.h
+@@ -0,0 +1,69 @@
++#ifndef ATOMIC_NOLOCK_INCLUDED
++#define ATOMIC_NOLOCK_INCLUDED
++
++/* Copyright (C) 2006 MySQL AB
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
++    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
++    || defined(HAVE_SOLARIS_ATOMIC)
++
++#  ifdef MY_ATOMIC_MODE_DUMMY
++#    define LOCK_prefix ""
++#  else
++#    define LOCK_prefix "lock"
++#  endif
++/*
++  We choose implementation as follows:
++  ------------------------------------
++  On Windows using Visual C++ the native implementation should be
++  preferrable. When using gcc we prefer the Solaris implementation
++  before the gcc because of stability preference, we choose gcc
++  builtins if available, otherwise we choose the somewhat broken
++  native x86 implementation. If neither Visual C++ or gcc we still
++  choose the Solaris implementation on Solaris (mainly for SunStudio
++  compilers).
++*/
++#  if defined(_MSV_VER)
++#    include "generic-msvc.h"
++#  elif __GNUC__
++#    if defined(HAVE_SOLARIS_ATOMIC)
++#      include "solaris.h"
++#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
++#      include "gcc_builtins.h"
++#    elif defined(__i386__) || defined(__x86_64__)
++#      include "x86-gcc.h"
++#    endif
++#  elif defined(HAVE_SOLARIS_ATOMIC)
++#    include "solaris.h"
++#  endif
++#endif
++
++#if defined(make_atomic_cas_body)
++/*
++  Type not used so minimal size (emptry struct has different size between C
++  and C++, zero-length array is gcc-specific).
++*/
++typedef char my_atomic_rwlock_t __attribute__ ((unused));
++#define my_atomic_rwlock_destroy(name)
++#define my_atomic_rwlock_init(name)
++#define my_atomic_rwlock_rdlock(name)
++#define my_atomic_rwlock_wrlock(name)
++#define my_atomic_rwlock_rdunlock(name)
++#define my_atomic_rwlock_wrunlock(name)
++
++#endif
++
++#endif /* ATOMIC_NOLOCK_INCLUDED */
+diff -ruN /dev/null b/include/atomic/rwlock.h
+--- /dev/null
++++ b/include/atomic/rwlock.h
+@@ -0,0 +1,100 @@
++#ifndef ATOMIC_RWLOCK_INCLUDED
++#define ATOMIC_RWLOCK_INCLUDED
++
++/* Copyright (C) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++#define MY_ATOMIC_MODE_RWLOCKS 1
++
++#ifdef MY_ATOMIC_MODE_DUMMY
++/*
++  the following can never be enabled by ./configure, one need to put #define in
++  a source to trigger the following warning. The resulting code will be broken,
++  it only makes sense to do it to see now test_atomic detects broken
++  implementations (another way is to run a UP build on an SMP box).
++*/
++#warning MY_ATOMIC_MODE_DUMMY and MY_ATOMIC_MODE_RWLOCKS are incompatible
++
++typedef char my_atomic_rwlock_t;
++
++#define my_atomic_rwlock_destroy(name)
++#define my_atomic_rwlock_init(name)
++#define my_atomic_rwlock_rdlock(name)
++#define my_atomic_rwlock_wrlock(name)
++#define my_atomic_rwlock_rdunlock(name)
++#define my_atomic_rwlock_wrunlock(name)
++#define MY_ATOMIC_MODE "dummy (non-atomic)"
++#else /* not MY_ATOMIC_MODE_DUMMY */
++
++typedef struct {pthread_mutex_t rw;} my_atomic_rwlock_t;
++
++#ifndef SAFE_MUTEX
++
++/*
++  we're using read-write lock macros but map them to mutex locks, and they're
++  faster. Still, having semantically rich API we can change the
++  underlying implementation, if necessary.
++*/
++#define my_atomic_rwlock_destroy(name)     pthread_mutex_destroy(& (name)->rw)
++#define my_atomic_rwlock_init(name)        pthread_mutex_init(& (name)->rw, 0)
++#define my_atomic_rwlock_rdlock(name)      pthread_mutex_lock(& (name)->rw)
++#define my_atomic_rwlock_wrlock(name)      pthread_mutex_lock(& (name)->rw)
++#define my_atomic_rwlock_rdunlock(name)    pthread_mutex_unlock(& (name)->rw)
++#define my_atomic_rwlock_wrunlock(name)    pthread_mutex_unlock(& (name)->rw)
++
++#else /* SAFE_MUTEX */
++
++/*
++  SAFE_MUTEX pollutes the compiling name space with macros
++  that alter pthread_mutex_t, pthread_mutex_init, etc.
++  Atomic operations should never use the safe mutex wrappers.
++  Unfortunately, there is no way to have both:
++  - safe mutex macros expanding pthread_mutex_lock to safe_mutex_lock
++  - my_atomic macros expanding to unmodified pthread_mutex_lock
++  inlined in the same compilation unit.
++  So, in case of SAFE_MUTEX, a function call is required.
++  Given that SAFE_MUTEX is a debugging facility,
++  this extra function call is not a performance concern for
++  production builds.
++*/
++C_MODE_START
++extern void plain_pthread_mutex_init(safe_mutex_t *);
++extern void plain_pthread_mutex_destroy(safe_mutex_t *);
++extern void plain_pthread_mutex_lock(safe_mutex_t *);
++extern void plain_pthread_mutex_unlock(safe_mutex_t *);
++C_MODE_END
++
++#define my_atomic_rwlock_destroy(name)     plain_pthread_mutex_destroy(&(name)->rw)
++#define my_atomic_rwlock_init(name)        plain_pthread_mutex_init(&(name)->rw)
++#define my_atomic_rwlock_rdlock(name)      plain_pthread_mutex_lock(&(name)->rw)
++#define my_atomic_rwlock_wrlock(name)      plain_pthread_mutex_lock(&(name)->rw)
++#define my_atomic_rwlock_rdunlock(name)    plain_pthread_mutex_unlock(&(name)->rw)
++#define my_atomic_rwlock_wrunlock(name)    plain_pthread_mutex_unlock(&(name)->rw)
++
++#endif /* SAFE_MUTEX */
++
++#define MY_ATOMIC_MODE "mutex"
++#ifndef MY_ATOMIC_MODE_RWLOCKS
++#define MY_ATOMIC_MODE_RWLOCKS 1
++#endif
++#endif
++
++#define make_atomic_add_body(S)     int ## S sav; sav= *a; *a+= v; v=sav;
++#define make_atomic_fas_body(S)     int ## S sav; sav= *a; *a= v; v=sav;
++#define make_atomic_cas_body(S)     if ((ret= (*a == *cmp))) *a= set; else *cmp=*a;
++#define make_atomic_load_body(S)    ret= *a;
++#define make_atomic_store_body(S)   *a= v;
++
++#endif /* ATOMIC_RWLOCK_INCLUDED */
+diff -ruN /dev/null b/include/atomic/solaris.h
+--- /dev/null
++++ b/include/atomic/solaris.h
+@@ -0,0 +1,72 @@
++/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++#ifndef _atomic_h_cleanup_
++#define _atomic_h_cleanup_ "atomic/solaris.h"
++
++#include <atomic.h>
++
++#define	MY_ATOMIC_MODE	"solaris-atomic"
++
++#if defined(__GNUC__)
++#define atomic_typeof(T,V)      __typeof__(V)
++#else
++#define atomic_typeof(T,V)      T
++#endif
++
++#define uintptr_t void *
++#define atomic_or_ptr_nv(X,Y) (void *)atomic_or_ulong_nv((volatile ulong_t *)X, Y)
++
++#define make_atomic_cas_body(S)                         \
++  atomic_typeof(uint ## S ## _t, *cmp) sav;             \
++  sav = atomic_cas_ ## S(                               \
++           (volatile uint ## S ## _t *)a,               \
++           (uint ## S ## _t)*cmp,                       \
++           (uint ## S ## _t)set);                       \
++  if (! (ret= (sav == *cmp)))                           \
++    *cmp= sav;
++
++#define make_atomic_add_body(S)                         \
++  int ## S nv;  /* new value */                         \
++  nv= atomic_add_ ## S ## _nv((volatile uint ## S ## _t *)a, v); \
++  v= nv - v
++
++/* ------------------------------------------------------------------------ */
++
++#ifdef MY_ATOMIC_MODE_DUMMY
++
++#define make_atomic_load_body(S)  ret= *a
++#define make_atomic_store_body(S)   *a= v
++
++#else /* MY_ATOMIC_MODE_DUMMY */
++
++#define make_atomic_load_body(S)                        \
++  ret= atomic_or_ ## S ## _nv((volatile uint ## S ## _t *)a, 0)
++
++#define make_atomic_store_body(S)                       \
++  (void) atomic_swap_ ## S((volatile uint ## S ## _t *)a, (uint ## S ## _t)v)
++
++#endif
++
++#define make_atomic_fas_body(S)                        \
++  v= atomic_swap_ ## S((volatile uint ## S ## _t *)a, (uint ## S ## _t)v)
++
++#else /* cleanup */
++
++#undef uintptr_t
++#undef atomic_or_ptr_nv
++
++#endif
++
+diff -ruN /dev/null b/include/atomic/x86-gcc.h
+--- /dev/null
++++ b/include/atomic/x86-gcc.h
+@@ -0,0 +1,145 @@
++#ifndef ATOMIC_X86_GCC_INCLUDED
++#define ATOMIC_X86_GCC_INCLUDED
++
++/* Copyright (C) 2006 MySQL AB
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++/*
++  XXX 64-bit atomic operations can be implemented using
++  cmpxchg8b, if necessary. Though I've heard that not all 64-bit
++  architectures support double-word (128-bit) cas.
++*/
++
++/*
++  No special support of 8 and 16 bit operations are implemented here
++  currently.
++*/
++#undef MY_ATOMIC_HAS_8_AND_16
++
++#ifdef __x86_64__
++#  ifdef MY_ATOMIC_NO_XADD
++#    define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix "-no-xadd"
++#  else
++#    define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix
++#  endif
++#else
++#  ifdef MY_ATOMIC_NO_XADD
++#    define MY_ATOMIC_MODE "gcc-x86" LOCK_prefix "-no-xadd"
++#  else
++#    define MY_ATOMIC_MODE "gcc-x86" LOCK_prefix
++#  endif
++#endif
++
++/* fix -ansi errors while maintaining readability */
++#ifndef asm
++#define asm __asm__
++#endif
++
++#ifndef MY_ATOMIC_NO_XADD
++#define make_atomic_add_body(S)         make_atomic_add_body ## S
++#define make_atomic_cas_body(S)         make_atomic_cas_body ## S
++#endif
++
++#define make_atomic_add_body32                                  \
++  asm volatile (LOCK_prefix "; xadd %0, %1;"                    \
++                : "+r" (v), "=m" (*a)                           \
++                : "m" (*a)                                      \
++                : "memory")
++
++#define make_atomic_cas_body32                                  \
++  __typeof__(*cmp) sav;                                         \
++  asm volatile (LOCK_prefix "; cmpxchg %3, %0; setz %2;"	\
++                : "=m" (*a), "=a" (sav), "=q" (ret)             \
++                : "r" (set), "m" (*a), "a" (*cmp)               \
++                : "memory");                                    \
++  if (!ret)                                                     \
++    *cmp= sav
++
++#ifdef __x86_64__
++#define make_atomic_add_body64 make_atomic_add_body32
++#define make_atomic_cas_body64 make_atomic_cas_body32
++
++#define make_atomic_fas_body(S)                                 \
++  asm volatile ("xchg %0, %1;"                                  \
++                : "+r" (v), "=m" (*a)                           \
++                : "m" (*a)                                      \
++                : "memory")
++
++/*
++  Actually 32/64-bit reads/writes are always atomic on x86_64,
++  nonetheless issue memory barriers as appropriate.
++*/
++#define make_atomic_load_body(S)                                \
++  /* Serialize prior load and store operations. */              \
++  asm volatile ("mfence" ::: "memory");                         \
++  ret= *a;                                                      \
++  /* Prevent compiler from reordering instructions. */          \
++  asm volatile ("" ::: "memory")
++#define make_atomic_store_body(S)                               \
++  asm volatile ("; xchg %0, %1;"                                \
++                : "=m" (*a), "+r" (v)                           \
++                : "m" (*a)                                      \
++                : "memory")
++
++#else
++/*
++  Use default implementations of 64-bit operations since we solved
++  the 64-bit problem on 32-bit platforms for CAS, no need to solve it
++  once more for ADD, LOAD, STORE and FAS as well.
++  Since we already added add32 support, we need to define add64
++  here, but we haven't defined fas, load and store at all, so
++  we can fallback on default implementations.
++*/
++#define make_atomic_add_body64                                  \
++  int64 tmp=*a;                                                 \
++  while (!my_atomic_cas64(a, &tmp, tmp+v)) ;                    \
++  v=tmp;
++
++/*
++  On some platforms (e.g. Mac OS X and Solaris) the ebx register
++  is held as a pointer to the global offset table. Thus we're not
++  allowed to use the b-register on those platforms when compiling
++  PIC code, to avoid this we push ebx and pop ebx. The new value
++  is copied directly from memory to avoid problems with a implicit
++  manipulation of the stack pointer by the push.
++
++  cmpxchg8b works on both 32-bit platforms and 64-bit platforms but
++  the code here is only used on 32-bit platforms, on 64-bit
++  platforms the much simpler make_atomic_cas_body32 will work
++  fine.
++*/
++#define make_atomic_cas_body64                                    \
++  asm volatile ("push %%ebx;"                                     \
++                "movl (%%ecx), %%ebx;"                            \
++                "movl 4(%%ecx), %%ecx;"                           \
++                LOCK_prefix "; cmpxchg8b %0;"                     \
++                "setz %2; pop %%ebx"                              \
++                : "=m" (*a), "+A" (*cmp), "=c" (ret)              \
++                : "c" (&set), "m" (*a)                            \
++                : "memory", "esp")
++#endif
++
++/*
++  The implementation of make_atomic_cas_body32 is adaptable to
++  the OS word size, so on 64-bit platforms it will automatically
++  adapt to 64-bits and so it will work also on 64-bit platforms
++*/
++#define make_atomic_cas_bodyptr make_atomic_cas_body32
++
++#ifdef MY_ATOMIC_MODE_DUMMY
++#define make_atomic_load_body(S)   ret=*a
++#define make_atomic_store_body(S)  *a=v
++#endif
++#endif /* ATOMIC_X86_GCC_INCLUDED */
+diff -ruN a/include/Makefile.am b/include/Makefile.am
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -38,7 +38,10 @@
+ 			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
+ 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
+ 			my_compare.h my_time.h my_vle.h my_user.h \
+-			my_libwrap.h my_stacktrace.h
++			my_libwrap.h my_stacktrace.h my_atomic.h \
++			atomic/gcc_builtins.h atomic/generic-msvc.h \
++			atomic/nolock.h atomic/rwlock.h atomic/solaris.h \
++			atomic/x86-gcc.h
+ 
+ EXTRA_DIST =        mysql.h.pp mysql/plugin.h.pp
+ 
+diff -ruN /dev/null b/include/my_atomic.h
+--- /dev/null
++++ b/include/my_atomic.h
+@@ -0,0 +1,287 @@
++#ifndef MY_ATOMIC_INCLUDED
++#define MY_ATOMIC_INCLUDED
++
++/* Copyright (C) 2006 MySQL AB
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
++
++/*
++  This header defines five atomic operations:
++
++  my_atomic_add#(&var, what)
++    'Fetch and Add'
++    add 'what' to *var, and return the old value of *var
++
++  my_atomic_fas#(&var, what)
++    'Fetch And Store'
++    store 'what' in *var, and return the old value of *var
++
++  my_atomic_cas#(&var, &old, new)
++    An odd variation of 'Compare And Set/Swap'
++    if *var is equal to *old, then store 'new' in *var, and return TRUE
++    otherwise store *var in *old, and return FALSE
++    Usually, &old should not be accessed if the operation is successful.
++
++  my_atomic_load#(&var)
++    return *var
++
++  my_atomic_store#(&var, what)
++    store 'what' in *var
++
++  '#' is substituted by a size suffix - 8, 16, 32, 64, or ptr
++  (e.g. my_atomic_add8, my_atomic_fas32, my_atomic_casptr).
++
++  NOTE This operations are not always atomic, so they always must be
++  enclosed in my_atomic_rwlock_rdlock(lock)/my_atomic_rwlock_rdunlock(lock)
++  or my_atomic_rwlock_wrlock(lock)/my_atomic_rwlock_wrunlock(lock).
++  Hint: if a code block makes intensive use of atomic ops, it make sense
++  to take/release rwlock once for the whole block, not for every statement.
++
++  On architectures where these operations are really atomic, rwlocks will
++  be optimized away.
++  8- and 16-bit atomics aren't implemented for windows (see generic-msvc.h),
++  but can be added, if necessary. 
++*/
++
++#ifndef my_atomic_rwlock_init
++
++#define intptr         void *
++/**
++  Currently we don't support 8-bit and 16-bit operations.
++  It can be added later if needed.
++*/
++#undef MY_ATOMIC_HAS_8_16
++
++#ifndef MY_ATOMIC_MODE_RWLOCKS
++/*
++ * Attempt to do atomic ops without locks
++ */
++#include "atomic/nolock.h"
++#endif
++
++#ifndef make_atomic_cas_body
++/* nolock.h was not able to generate even a CAS function, fall back */
++#include "atomic/rwlock.h"
++#endif
++
++/* define missing functions by using the already generated ones */
++#ifndef make_atomic_add_body
++#define make_atomic_add_body(S)                                 \
++  int ## S tmp=*a;                                              \
++  while (!my_atomic_cas ## S(a, &tmp, tmp+v)) ;                 \
++  v=tmp;
++#endif
++#ifndef make_atomic_fas_body
++#define make_atomic_fas_body(S)                                 \
++  int ## S tmp=*a;                                              \
++  while (!my_atomic_cas ## S(a, &tmp, v)) ;                     \
++  v=tmp;
++#endif
++#ifndef make_atomic_load_body
++#define make_atomic_load_body(S)                                \
++  ret= 0; /* avoid compiler warning */                          \
++  (void)(my_atomic_cas ## S(a, &ret, ret));
++#endif
++#ifndef make_atomic_store_body
++#define make_atomic_store_body(S)                               \
++  (void)(my_atomic_fas ## S (a, v));
++#endif
++
++/*
++  transparent_union doesn't work in g++
++  Bug ?
++
++  Darwin's gcc doesn't want to put pointers in a transparent_union
++  when built with -arch ppc64. Complains:
++  warning: 'transparent_union' attribute ignored
++*/
++#if defined(__GNUC__) && !defined(__cplusplus) && \
++      ! (defined(__APPLE__) && (defined(_ARCH_PPC64) ||defined (_ARCH_PPC)))
++/*
++  we want to be able to use my_atomic_xxx functions with
++  both signed and unsigned integers. But gcc will issue a warning
++  "passing arg N of `my_atomic_XXX' as [un]signed due to prototype"
++  if the signedness of the argument doesn't match the prototype, or
++  "pointer targets in passing argument N of my_atomic_XXX differ in signedness"
++  if int* is used where uint* is expected (or vice versa).
++  Let's shut these warnings up
++*/
++#define make_transparent_unions(S)                              \
++        typedef union {                                         \
++          int  ## S  i;                                         \
++          uint ## S  u;                                         \
++        } U_ ## S   __attribute__ ((transparent_union));        \
++        typedef union {                                         \
++          int  ## S volatile *i;                                \
++          uint ## S volatile *u;                                \
++        } Uv_ ## S   __attribute__ ((transparent_union));
++#define uintptr intptr
++make_transparent_unions(8)
++make_transparent_unions(16)
++make_transparent_unions(32)
++make_transparent_unions(64)
++make_transparent_unions(ptr)
++#undef uintptr
++#undef make_transparent_unions
++#define a       U_a.i
++#define cmp     U_cmp.i
++#define v       U_v.i
++#define set     U_set.i
++#else
++#define U_8    int8
++#define U_16   int16
++#define U_32   int32
++#define U_64   int64
++#define U_ptr  intptr
++#define Uv_8   int8
++#define Uv_16  int16
++#define Uv_32  int32
++#define Uv_64  int64
++#define Uv_ptr intptr
++#define U_a    volatile *a
++#define U_cmp  *cmp
++#define U_v    v
++#define U_set  set
++#endif /* __GCC__ transparent_union magic */
++
++#define make_atomic_cas(S)                                      \
++static inline int my_atomic_cas ## S(Uv_ ## S U_a,              \
++                            Uv_ ## S U_cmp, U_ ## S U_set)      \
++{                                                               \
++  int8 ret;                                                     \
++  make_atomic_cas_body(S);                                      \
++  return ret;                                                   \
++}
++
++#define make_atomic_add(S)                                      \
++static inline int ## S my_atomic_add ## S(                      \
++                        Uv_ ## S U_a, U_ ## S U_v)              \
++{                                                               \
++  make_atomic_add_body(S);                                      \
++  return v;                                                     \
++}
++
++#define make_atomic_fas(S)                                      \
++static inline int ## S my_atomic_fas ## S(                      \
++                         Uv_ ## S U_a, U_ ## S U_v)             \
++{                                                               \
++  make_atomic_fas_body(S);                                      \
++  return v;                                                     \
++}
++
++#define make_atomic_load(S)                                     \
++static inline int ## S my_atomic_load ## S(Uv_ ## S U_a)        \
++{                                                               \
++  int ## S ret;                                                 \
++  make_atomic_load_body(S);                                     \
++  return ret;                                                   \
++}
++
++#define make_atomic_store(S)                                    \
++static inline void my_atomic_store ## S(                        \
++                     Uv_ ## S U_a, U_ ## S U_v)                 \
++{                                                               \
++  make_atomic_store_body(S);                                    \
++}
++
++#ifdef MY_ATOMIC_HAS_8_16
++make_atomic_cas(8)
++make_atomic_cas(16)
++#endif
++make_atomic_cas(32)
++make_atomic_cas(64)
++make_atomic_cas(ptr)
++
++#ifdef MY_ATOMIC_HAS_8_16
++make_atomic_add(8)
++make_atomic_add(16)
++#endif
++make_atomic_add(32)
++make_atomic_add(64)
++
++#ifdef MY_ATOMIC_HAS_8_16
++make_atomic_load(8)
++make_atomic_load(16)
++#endif
++make_atomic_load(32)
++make_atomic_load(64)
++make_atomic_load(ptr)
++
++#ifdef MY_ATOMIC_HAS_8_16
++make_atomic_fas(8)
++make_atomic_fas(16)
++#endif
++make_atomic_fas(32)
++make_atomic_fas(64)
++make_atomic_fas(ptr)
++
++#ifdef MY_ATOMIC_HAS_8_16
++make_atomic_store(8)
++make_atomic_store(16)
++#endif
++make_atomic_store(32)
++make_atomic_store(64)
++make_atomic_store(ptr)
++
++#ifdef _atomic_h_cleanup_
++#include _atomic_h_cleanup_
++#undef _atomic_h_cleanup_
++#endif
++
++#undef U_8
++#undef U_16
++#undef U_32
++#undef U_64
++#undef U_ptr
++#undef Uv_8
++#undef Uv_16
++#undef Uv_32
++#undef Uv_64
++#undef Uv_ptr
++#undef a
++#undef cmp
++#undef v
++#undef set
++#undef U_a
++#undef U_cmp
++#undef U_v
++#undef U_set
++#undef make_atomic_add
++#undef make_atomic_cas
++#undef make_atomic_load
++#undef make_atomic_store
++#undef make_atomic_fas
++#undef make_atomic_add_body
++#undef make_atomic_cas_body
++#undef make_atomic_load_body
++#undef make_atomic_store_body
++#undef make_atomic_fas_body
++#undef intptr
++
++/*
++  the macro below defines (as an expression) the code that
++  will be run in spin-loops. Intel manuals recummend to have PAUSE there.
++  It is expected to be defined in include/atomic/ *.h files
++*/
++#ifndef LF_BACKOFF
++#define LF_BACKOFF (1)
++#endif
++
++#define MY_ATOMIC_OK       0
++#define MY_ATOMIC_NOT_1CPU 1
++extern int my_atomic_initialize();
++
++#endif
++
++#endif /* MY_ATOMIC_INCLUDED */
 diff -ruN a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h	2010-11-01 08:43:53.000000000 +0000
-+++ b/include/mysql_com.h	2010-11-01 08:52:40.000000000 +0000
-@@ -128,10 +128,11 @@
- #define REFRESH_FAST		32768	/* Intern flag */
- 
- /* RESET (remove all queries) from query cache */
--#define REFRESH_QUERY_CACHE	65536
--#define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */
--#define REFRESH_DES_KEY_FILE	0x40000L
--#define REFRESH_USER_RESOURCES	0x80000L
-+#define REFRESH_QUERY_CACHE	     65536
-+#define REFRESH_QUERY_CACHE_FREE    0x20000L /* pack query cache */
-+#define REFRESH_DES_KEY_FILE	     0x40000L
-+#define REFRESH_USER_RESOURCES	     0x80000L
+--- a/include/mysql_com.h
++++ b/include/mysql_com.h
+@@ -132,6 +132,7 @@
+ #define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */
+ #define REFRESH_DES_KEY_FILE	0x40000L
+ #define REFRESH_USER_RESOURCES	0x80000L
 +#define REFRESH_QUERY_RESPONSE_TIME 0x100000L /* response time distibution */
  
  #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
  #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
-diff -ruN a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info
---- a/patch_info/response-time-distribution.info	1970-01-01 00:00:00.000000000 +0000
-+++ b/patch_info/response-time-distribution.info	2010-11-01 08:52:40.000000000 +0000
+diff -ruN /dev/null b/mysql-test/include/have_response_time_distribution.inc
+--- /dev/null
++++ b/mysql-test/include/have_response_time_distribution.inc
+@@ -0,0 +1,4 @@
++-- require r/have_response_time_distribution.require
++disable_query_log;
++show variables like 'have_response_time_distribution';
++enable_query_log;
+diff -ruN /dev/null b/mysql-test/r/have_response_time_distribution.require
+--- /dev/null
++++ b/mysql-test/r/have_response_time_distribution.require
+@@ -0,0 +1,2 @@
++Variable_name	Value
++have_response_time_distribution	YES
+diff -ruN /dev/null b/mysql-test/include/query_response_time.inc
+--- /dev/null
++++ b/mysql-test/include/query_response_time.inc
+@@ -0,0 +1,39 @@
++SET SESSION query_exec_time=0.1;
++
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++
++SET SESSION query_exec_time=0.31; SELECT 1;
++SET SESSION query_exec_time=0.32; SELECT 1;
++SET SESSION query_exec_time=0.33; SELECT 1;
++SET SESSION query_exec_time=0.34; SELECT 1;
++SET SESSION query_exec_time=0.35; SELECT 1;
++SET SESSION query_exec_time=0.36; SELECT 1;
++SET SESSION query_exec_time=0.37; SELECT 1;
++SET SESSION query_exec_time=0.38; SELECT 1;
++SET SESSION query_exec_time=0.39; SELECT 1;
++SET SESSION query_exec_time=0.4; SELECT 1;
++SET SESSION query_exec_time=1.1; SELECT 1;
++SET SESSION query_exec_time=1.2; SELECT 1;
++SET SESSION query_exec_time=1.3; SELECT 1;
++SET SESSION query_exec_time=1.5; SELECT 1;
++SET SESSION query_exec_time=1.4; SELECT 1;
++SET SESSION query_exec_time=0.5; SELECT 1;
++SET SESSION query_exec_time=2.1; SELECT 1;
++SET SESSION query_exec_time=2.3; SELECT 1;
++SET SESSION query_exec_time=2.5; SELECT 1;
++SET SESSION query_exec_time=3.1; SELECT 1;
++SET SESSION query_exec_time=4.1; SELECT 1;
++SET SESSION query_exec_time=5.1; SELECT 1;
++
++SET SESSION query_exec_time=0.1;
++
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++SHOW QUERY_RESPONSE_TIME;
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++
++SET SESSION query_exec_time=default;
+diff -ruN /dev/null b/mysql-test/include/query_response_time-replication.inc
+--- /dev/null
++++ b/mysql-test/include/query_response_time-replication.inc
+@@ -0,0 +1,58 @@
++connection master;
++
++CREATE TABLE t(id INT);
++sync_slave_with_master;
++
++connection slave;
++SET GLOBAL query_exec_time=0.1;
++--source include/restart_slave_sql.inc
++
++connection slave;
++
++SET SESSION query_exec_time=0.1;
++
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++
++connection master;
++
++SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1);
++
++sync_slave_with_master;
++
++connection slave;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++SHOW QUERY_RESPONSE_TIME;
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++
++connection master;
++DROP TABLE t;
++
++sync_slave_with_master;
+diff -ruN /dev/null b/mysql-test/include/query_response_time-stored.inc
+--- /dev/null
++++ b/mysql-test/include/query_response_time-stored.inc
+@@ -0,0 +1,37 @@
++SET SESSION query_exec_time=0.1;
++
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++
++CALL test_f(0.31);
++CALL test_f(0.32);
++CALL test_f(0.33);
++CALL test_f(0.34);
++CALL test_f(0.35);
++CALL test_f(0.36);
++CALL test_f(0.37);
++CALL test_f(0.38);
++CALL test_f(0.39);
++CALL test_f(0.4);
++CALL test_f(1.1);
++CALL test_f(1.2);
++CALL test_f(1.3);
++CALL test_f(1.5);
++CALL test_f(1.4);
++CALL test_f(0.5);
++CALL test_f(2.1);
++CALL test_f(2.3);
++CALL test_f(2.5);
++CALL test_f(3.1);
++CALL test_f(4.1);
++CALL test_f(5.1);
++
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++SHOW QUERY_RESPONSE_TIME;
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++
++SET SESSION query_exec_time=default;
+diff -ruN /dev/null b/mysql-test/r/percona_query_response_time-replication.result
+--- /dev/null
++++ b/mysql-test/r/percona_query_response_time-replication.result
+@@ -0,0 +1,727 @@
++SET GLOBAL query_exec_time=0.1;
++include/master-slave.inc
++[connection master]
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1;
++Warnings:
++Warning	1292	Truncated incorrect query_response_time_range_base value: '1'
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	2
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.000003	0	      0.000000
++      0.000007	0	      0.000000
++      0.000015	0	      0.000000
++      0.000030	0	      0.000000
++      0.000061	0	      0.000000
++      0.000122	0	      0.000000
++      0.000244	0	      0.000000
++      0.000488	0	      0.000000
++      0.000976	0	      0.000000
++      0.001953	0	      0.000000
++      0.003906	0	      0.000000
++      0.007812	0	      0.000000
++      0.015625	0	      0.000000
++      0.031250	0	      0.000000
++      0.062500	0	      0.000000
++      0.125000	3	      0.300000
++      0.250000	0	      0.000000
++      0.500000	10	      3.550000
++      1.000000	1	      0.500000
++      2.000000	5	      6.500000
++      4.000000	4	     10.000000
++      8.000000	2	      9.200000
++     16.000000	0	      0.000000
++     32.000000	0	      0.000000
++     64.000000	0	      0.000000
++    128.000000	0	      0.000000
++    256.000000	0	      0.000000
++    512.000000	0	      0.000000
++   1024.000000	0	      0.000000
++   2048.000000	0	      0.000000
++   4096.000000	0	      0.000000
++   8192.000000	0	      0.000000
++  16384.000000	0	      0.000000
++  32768.000000	0	      0.000000
++  65536.000000	0	      0.000000
++ 131072.000000	0	      0.000000
++ 262144.000000	0	      0.000000
++ 524288.000000	0	      0.000000
++ 1048576.00000	0	      0.000000
++ 2097152.00000	0	      0.000000
++ 4194304.00000	0	      0.000000
++ 8388608.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.000003	0	      0.000000
++      0.000007	0	      0.000000
++      0.000015	0	      0.000000
++      0.000030	0	      0.000000
++      0.000061	0	      0.000000
++      0.000122	0	      0.000000
++      0.000244	0	      0.000000
++      0.000488	0	      0.000000
++      0.000976	0	      0.000000
++      0.001953	0	      0.000000
++      0.003906	0	      0.000000
++      0.007812	0	      0.000000
++      0.015625	0	      0.000000
++      0.031250	0	      0.000000
++      0.062500	0	      0.000000
++      0.125000	4	      0.400000
++      0.250000	0	      0.000000
++      0.500000	10	      3.550000
++      1.000000	1	      0.500000
++      2.000000	5	      6.500000
++      4.000000	4	     10.000000
++      8.000000	2	      9.200000
++     16.000000	0	      0.000000
++     32.000000	0	      0.000000
++     64.000000	0	      0.000000
++    128.000000	0	      0.000000
++    256.000000	0	      0.000000
++    512.000000	0	      0.000000
++   1024.000000	0	      0.000000
++   2048.000000	0	      0.000000
++   4096.000000	0	      0.000000
++   8192.000000	0	      0.000000
++  16384.000000	0	      0.000000
++  32768.000000	0	      0.000000
++  65536.000000	0	      0.000000
++ 131072.000000	0	      0.000000
++ 262144.000000	0	      0.000000
++ 524288.000000	0	      0.000000
++ 1048576.00000	0	      0.000000
++ 2097152.00000	0	      0.000000
++ 4194304.00000	0	      0.000000
++ 8388608.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	2
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.000003	0	      0.000000
++      0.000007	0	      0.000000
++      0.000015	0	      0.000000
++      0.000030	0	      0.000000
++      0.000061	0	      0.000000
++      0.000122	0	      0.000000
++      0.000244	0	      0.000000
++      0.000488	0	      0.000000
++      0.000976	0	      0.000000
++      0.001953	0	      0.000000
++      0.003906	0	      0.000000
++      0.007812	0	      0.000000
++      0.015625	0	      0.000000
++      0.031250	0	      0.000000
++      0.062500	0	      0.000000
++      0.125000	3	      0.300000
++      0.250000	0	      0.000000
++      0.500000	10	      3.550000
++      1.000000	1	      0.500000
++      2.000000	5	      6.500000
++      4.000000	4	     10.000000
++      8.000000	2	      9.200000
++     16.000000	0	      0.000000
++     32.000000	0	      0.000000
++     64.000000	0	      0.000000
++    128.000000	0	      0.000000
++    256.000000	0	      0.000000
++    512.000000	0	      0.000000
++   1024.000000	0	      0.000000
++   2048.000000	0	      0.000000
++   4096.000000	0	      0.000000
++   8192.000000	0	      0.000000
++  16384.000000	0	      0.000000
++  32768.000000	0	      0.000000
++  65536.000000	0	      0.000000
++ 131072.000000	0	      0.000000
++ 262144.000000	0	      0.000000
++ 524288.000000	0	      0.000000
++ 1048576.00000	0	      0.000000
++ 2097152.00000	0	      0.000000
++ 4194304.00000	0	      0.000000
++ 8388608.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.000003	0	      0.000000
++      0.000007	0	      0.000000
++      0.000015	0	      0.000000
++      0.000030	0	      0.000000
++      0.000061	0	      0.000000
++      0.000122	0	      0.000000
++      0.000244	0	      0.000000
++      0.000488	0	      0.000000
++      0.000976	0	      0.000000
++      0.001953	0	      0.000000
++      0.003906	0	      0.000000
++      0.007812	0	      0.000000
++      0.015625	0	      0.000000
++      0.031250	0	      0.000000
++      0.062500	0	      0.000000
++      0.125000	4	      0.400000
++      0.250000	0	      0.000000
++      0.500000	10	      3.550000
++      1.000000	1	      0.500000
++      2.000000	5	      6.500000
++      4.000000	4	     10.000000
++      8.000000	2	      9.200000
++     16.000000	0	      0.000000
++     32.000000	0	      0.000000
++     64.000000	0	      0.000000
++    128.000000	0	      0.000000
++    256.000000	0	      0.000000
++    512.000000	0	      0.000000
++   1024.000000	0	      0.000000
++   2048.000000	0	      0.000000
++   4096.000000	0	      0.000000
++   8192.000000	0	      0.000000
++  16384.000000	0	      0.000000
++  32768.000000	0	      0.000000
++  65536.000000	0	      0.000000
++ 131072.000000	0	      0.000000
++ 262144.000000	0	      0.000000
++ 524288.000000	0	      0.000000
++ 1048576.00000	0	      0.000000
++ 2097152.00000	0	      0.000000
++ 4194304.00000	0	      0.000000
++ 8388608.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	10
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.000010	0	      0.000000
++      0.000100	0	      0.000000
++      0.001000	0	      0.000000
++      0.010000	0	      0.000000
++      0.100000	0	      0.000000
++      1.000000	14	      4.350000
++     10.000000	11	     25.700000
++    100.000000	0	      0.000000
++   1000.000000	0	      0.000000
++  10000.000000	0	      0.000000
++ 100000.000000	0	      0.000000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.000010	0	      0.000000
++      0.000100	0	      0.000000
++      0.001000	0	      0.000000
++      0.010000	0	      0.000000
++      0.100000	0	      0.000000
++      1.000000	15	      4.450000
++     10.000000	11	     25.700000
++    100.000000	0	      0.000000
++   1000.000000	0	      0.000000
++  10000.000000	0	      0.000000
++ 100000.000000	0	      0.000000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	7
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.000008	0	      0.000000
++      0.000059	0	      0.000000
++      0.000416	0	      0.000000
++      0.002915	0	      0.000000
++      0.020408	0	      0.000000
++      0.142857	3	      0.300000
++      1.000000	11	      4.050000
++      7.000000	11	     25.700000
++     49.000000	0	      0.000000
++    343.000000	0	      0.000000
++   2401.000000	0	      0.000000
++  16807.000000	0	      0.000000
++ 117649.000000	0	      0.000000
++ 823543.000000	0	      0.000000
++ 5764801.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.000008	0	      0.000000
++      0.000059	0	      0.000000
++      0.000416	0	      0.000000
++      0.002915	0	      0.000000
++      0.020408	0	      0.000000
++      0.142857	4	      0.400000
++      1.000000	11	      4.050000
++      7.000000	11	     25.700000
++     49.000000	0	      0.000000
++    343.000000	0	      0.000000
++   2401.000000	0	      0.000000
++  16807.000000	0	      0.000000
++ 117649.000000	0	      0.000000
++ 823543.000000	0	      0.000000
++ 5764801.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	156
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000041	2	      0.000000
++      0.006410	0	      0.000000
++      1.000000	14	      4.350000
++    156.000000	11	     25.700000
++  24336.000000	0	      0.000000
++ 3796416.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000041	2	      0.000000
++      0.006410	0	      0.000000
++      1.000000	15	      4.450000
++    156.000000	11	     25.700000
++  24336.000000	0	      0.000000
++ 3796416.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	1000
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.001000	0	      0.000000
++      1.000000	14	      4.350000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.001000	0	      0.000000
++      1.000000	15	      4.450000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++CREATE TABLE t(id INT);
++SET GLOBAL query_exec_time=0.1;
++include/restart_slave.inc
++SET SESSION query_exec_time=0.1;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001;
++Warnings:
++Warning	1292	Truncated incorrect query_response_time_range_base value: '1001'
++FLUSH QUERY_RESPONSE_TIME;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1;
++SET SESSION query_exec_time = 0.31;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.32;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.33;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.34;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.35;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.36;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.37;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.38;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.39;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.2;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 1.4;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 0.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.3;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 2.5;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 3.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 4.1;
++INSERT INTO t VALUES(1);
++SET SESSION query_exec_time = 5.1;
++INSERT INTO t VALUES(1);
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0;
++SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
++Variable_name	Value
++query_response_time_range_base	1000
++SHOW QUERY_RESPONSE_TIME;
++		
++      0.000001	2	      0.000000
++      0.001000	0	      0.000000
++      1.000000	14	      4.350000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
++time	count	total
++      0.000001	2	      0.000000
++      0.001000	0	      0.000000
++      1.000000	15	      4.450000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++include/rpl_end.inc
++SET GLOBAL query_exec_time=default;
++SET GLOBAL query_exec_time=default;
+diff -ruN /dev/null b/mysql-test/r/percona_query_response_time.result
+--- /dev/null
++++ b/mysql-test/r/percona_query_response_time.result
+@@ -0,0 +1,1003 @@
++SET SESSION query_exec_time=0.1;