Merge lp:~tsarev/percona-server/5.1_query_response_time_fix_bug_803867 into lp:percona-server/5.1

[Oleg Tsarev]

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

Fixes for bugs #712393 #803867
1) I move query_response_time_collect call from intermediate of log_slow_statement to begin.
Reason of bug #712393 - log_slow_statement exit before call query_response_time_collect
2) I move all DBUG_EXECUTE_IF (what used in percona_query_response_time.test) from response_time_distribution.patch to slow_extended.patch
This functionality requires in the slow_extended sporadic fails
3) If we set "debug" variable:
    SET [SESSION|GLOBAL] debug="+d,query_exec_time_debug"
we can setup exact query_exec_time through set "debug" variable:
    SET [SESSION|GLOBAL] debug="+d,query_exec_time_TIMES";
where TIMES is [0.31|0.32|0.33|0.34|0.35|0.36|0.37|0.38|0.39|0.4|0.5|1.1|1.2|1.3|1.4|1.5|2.1|2.3|2.5]
After this commit we can also add special comment to the begin of query:
    /* query_exec_time="TIMES" */ QUERY;
This changes requires for test SQL_Slave_Thread query execution.
4) I replace logic:
/*----------------------------------------*/
    DBUG_EXECUTE_IF("query_exec_time_debug",
                    if (query_execution_time == 0)
                      opt_query_response_time_stats= 0;
                    else
                      opt_query_response_time_stats= 1;);
/*----------------------------------------*/
By following:
/*----------------------------------------*/
void query_response_time_collect_with_check(ulonglong query_exec_time)
{
  DBUG_ENTER("query_response_time_collect_with_check");
  bool collect= opt_query_response_time_stats;
  DBUG_EXECUTE_IF("query_exec_time_debug",
                  {
                    if (0 == query_exec_time)
                    {
                      collect= false;
                    }
                  });
  if(collect)
  {
    query_response_time_collect(query_exec_time);
  }
  DBUG_VOID_RETURN;
}
/*----------------------------------------*/
Otherwise debug-code has bad side-effect - set QUERY_RESPONSE_TIME_STATS to OFF if query shouldn't collect
5) I rewrite tests for response_time_distribution.patch, now all test unified and wouldn't have sporadic fails in the feature.
This change fixes the bug #803867.
6) I also remove mysql-test/response_time_distribution.patch and move to patch.
Now this is the suite "percona" and tests "query_response_time[-[stored|replication]]"
7) I also move have_response_time_distribution.[require|inc] to patch
8) I also add "percona_suite.patch" for include "percona" test suite to default suites list

[Alexey Kopytov (akopytov)]

* the patch adds a new file named response_time_distribution.patch.update. what is that for?

* we are going to move tests to the corresponding patches. so please change it so that all tests code to response_time_distribution.patch rather than a separate directory

* percona_query_response_time_show.inc: "\ No newline at end of file"

* percona_query_response_time_flush.inc: "\ No newline at end of file"

* too much conditional code in .inc files. It would actually be more simple and readable to move the _common_ code into .inc file(s) and let replication- and SP-related tests contain the rest.

* since most of the actual code changes occur in the response_time_distribution.patch.update which was apparently a mistake, I would like the above issues to be addressed before proceeding with review.

review: Needs Fixing

[Stewart Smith (stewart)]

minor style point:

0 == query_exec_time and similar, should be other way around, not having value first.

but am okay to merge this and see subsequent merge req fixing style.

[Stewart Smith (stewart)]

can approve merge req after Alexey okays it

review: Approve

=== modified file 'fix-bug671764.patch'
--- fix-bug671764.patch	2011-03-13 21:40:40 +0000
+++ fix-bug671764.patch	2011-07-11 01:39:24 +0000
@@ -8,7 +8,7 @@
 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 @@
+@@ -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

=== 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

=== 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);

=== added file 'percona_suite.patch'
--- percona_suite.patch	1970-01-01 00:00:00 +0000
+++ percona_suite.patch	2011-07-11 01:39:24 +0000
@@ -0,0 +1,12 @@
+diff -ruN a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
+--- a/mysql-test/mysql-test-run.pl	2011-04-12 15:11:40.000000000 +0300
++++ b/mysql-test/mysql-test-run.pl	2011-07-06 14:23:15.367219807 +0300
+@@ -157,7 +157,7 @@
+ # executables will be used by the test suite.
+ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+ 
+-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
++my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin,percona";
+ my $opt_suites;
+ 
+ our $opt_verbose= 0;  # Verbose output, enable with --verbose

=== renamed file 'response-time-distribution.patch' => 'response_time_distribution.patch'
--- response-time-distribution.patch	2011-06-07 06:24:26 +0000
+++ response_time_distribution.patch	2011-07-11 01:39:24 +0000
@@ -1,13 +1,988 @@
-# name       : response-time-distribution.patch
-# introduced : 12
-# maintainer : Oleg
-#
-#!!! 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	2011-07-11 04:31:52.859364018 +0300
++++ b/configure.in	2011-07-11 04:32:14.866520204 +0300
+@@ -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 a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h
+--- a/include/atomic/gcc_builtins.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/gcc_builtins.h	2011-07-11 04:32:14.867520211 +0300
+@@ -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 a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h
+--- a/include/atomic/generic-msvc.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/generic-msvc.h	2011-07-11 04:32:14.868520219 +0300
+@@ -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 a/include/atomic/nolock.h b/include/atomic/nolock.h
+--- a/include/atomic/nolock.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/nolock.h	2011-07-11 04:32:14.868520219 +0300
+@@ -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 a/include/atomic/rwlock.h b/include/atomic/rwlock.h
+--- a/include/atomic/rwlock.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/rwlock.h	2011-07-11 04:32:14.869520227 +0300
+@@ -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 a/include/atomic/solaris.h b/include/atomic/solaris.h
+--- a/include/atomic/solaris.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/solaris.h	2011-07-11 04:32:14.869520227 +0300
+@@ -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 a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h
+--- a/include/atomic/x86-gcc.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/atomic/x86-gcc.h	2011-07-11 04:32:14.870520235 +0300
+@@ -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	2011-04-12 15:11:35.000000000 +0300
++++ b/include/Makefile.am	2011-07-11 04:32:14.870520235 +0300
+@@ -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 a/include/my_atomic.h b/include/my_atomic.h
+--- a/include/my_atomic.h	1970-01-01 03:00:00.000000000 +0300
++++ b/include/my_atomic.h	2011-07-11 04:32:14.872520248 +0300
+@@ -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
+--- a/include/mysql_com.h	2011-07-11 04:31:52.068358403 +0300
++++ b/include/mysql_com.h	2011-07-11 04:32:14.873520255 +0300
 @@ -128,10 +128,11 @@
  #define REFRESH_FAST		32768	/* Intern flag */
  
@@ -24,9 +999,2161 @@
  
  #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
  #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
+diff -ruN a/mysql-test/include/have_response_time_distribution.inc b/mysql-test/include/have_response_time_distribution.inc
+--- a/mysql-test/include/have_response_time_distribution.inc	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/include/have_response_time_distribution.inc	2011-07-11 04:32:55.637809581 +0300
+@@ -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 a/mysql-test/r/have_response_time_distribution.require b/mysql-test/r/have_response_time_distribution.require
+--- a/mysql-test/r/have_response_time_distribution.require	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/r/have_response_time_distribution.require	2011-07-11 04:32:38.718689494 +0300
+@@ -0,0 +1,2 @@
++Variable_name	Value
++have_response_time_distribution	YES
+diff -ruN a/mysql-test/suite/percona/include/query_response_time.inc b/mysql-test/suite/percona/include/query_response_time.inc
+--- a/mysql-test/suite/percona/include/query_response_time.inc	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/include/query_response_time.inc	2011-07-11 04:32:14.873520256 +0300
+@@ -0,0 +1,33 @@
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_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;
+diff -ruN a/mysql-test/suite/percona/include/query_response_time-replication.inc b/mysql-test/suite/percona/include/query_response_time-replication.inc
+--- a/mysql-test/suite/percona/include/query_response_time-replication.inc	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/include/query_response_time-replication.inc	2011-07-11 04:32:14.873520256 +0300
+@@ -0,0 +1,41 @@
++connection slave;
++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;
++--let i=0
++EVAL /* query_exec_time= "0.31" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.32" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.33" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.34" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.35" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.36" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.37" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.38" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.39" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.4" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "1.1" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "1.2" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "1.3" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "1.5" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "1.4" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "0.5" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "2.1" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "2.3" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "2.5" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "3.1" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "4.1" */ INSERT INTO t VALUES($i); inc $i;
++EVAL /* query_exec_time= "5.1" */ INSERT INTO t VALUES($i); inc $i;
++sync_slave_with_master;
++
++connection master;
++DELETE FROM t;
++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;
+diff -ruN a/mysql-test/suite/percona/include/query_response_time-stored.inc b/mysql-test/suite/percona/include/query_response_time-stored.inc
+--- a/mysql-test/suite/percona/include/query_response_time-stored.inc	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/include/query_response_time-stored.inc	2011-07-11 04:32:14.875520269 +0300
+@@ -0,0 +1,33 @@
++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;
+diff -ruN a/mysql-test/suite/percona/r/query_response_time-replication.result b/mysql-test/suite/percona/r/query_response_time-replication.result
+--- a/mysql-test/suite/percona/r/query_response_time-replication.result	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/r/query_response_time-replication.result	2011-07-11 04:32:14.875520270 +0300
+@@ -0,0 +1,528 @@
++include/master-slave.inc
++[connection master]
++DROP TABLE IF EXISTS t;
++CREATE TABLE t(id INT);
++SET GLOBAL debug="+d,query_exec_time_debug";
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	11	      4.050000
++     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	0	      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	11	      4.050000
++     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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    156.000000	11	     25.700000
++  24336.000000	0	      0.000000
++ 3796416.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL debug="";
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP TABLE t;
++include/rpl_end.inc
+diff -ruN a/mysql-test/suite/percona/r/query_response_time.result b/mysql-test/suite/percona/r/query_response_time.result
+--- a/mysql-test/suite/percona/r/query_response_time.result	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/r/query_response_time.result	2011-07-11 04:32:14.875520270 +0300
+@@ -0,0 +1,522 @@
++SET GLOBAL debug="+d,query_exec_time_debug";
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	11	      4.050000
++     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	0	      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	11	      4.050000
++     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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    156.000000	11	     25.700000
++  24336.000000	0	      0.000000
++ 3796416.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL debug="";
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
+diff -ruN a/mysql-test/suite/percona/r/query_response_time-stored.result b/mysql-test/suite/percona/r/query_response_time-stored.result
+--- a/mysql-test/suite/percona/r/query_response_time-stored.result	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/r/query_response_time-stored.result	2011-07-11 04:32:14.877520284 +0300
+@@ -0,0 +1,529 @@
++CREATE PROCEDURE test_f(time VARCHAR(5),i INT)
++BEGIN
++SET SESSION debug=CONCAT("+d,query_exec_time_", time);
++/* query_exec_time= time */ INSERT INTO t VALUES(i);
++DELETE FROM t;
++END^
++SET GLOBAL debug="+d,query_exec_time_debug";
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	11	      4.050000
++     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	0	      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	11	      4.050000
++     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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      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	0	      0.000000
++      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	0	      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	0	      0.000000
++      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 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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    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	0	      0.000000
++      0.006410	0	      0.000000
++      1.000000	11	      4.050000
++    156.000000	11	     25.700000
++  24336.000000	0	      0.000000
++ 3796416.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++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 debug="+d,query_exec_time_0.31";
++SET SESSION debug="+d,query_exec_time_0.32";
++SET SESSION debug="+d,query_exec_time_0.33";
++SET SESSION debug="+d,query_exec_time_0.34";
++SET SESSION debug="+d,query_exec_time_0.35";
++SET SESSION debug="+d,query_exec_time_0.36";
++SET SESSION debug="+d,query_exec_time_0.37";
++SET SESSION debug="+d,query_exec_time_0.38";
++SET SESSION debug="+d,query_exec_time_0.39";
++SET SESSION debug="+d,query_exec_time_0.4";
++SET SESSION debug="+d,query_exec_time_1.1";
++SET SESSION debug="+d,query_exec_time_1.2";
++SET SESSION debug="+d,query_exec_time_1.3";
++SET SESSION debug="+d,query_exec_time_1.5";
++SET SESSION debug="+d,query_exec_time_1.4";
++SET SESSION debug="+d,query_exec_time_0.5";
++SET SESSION debug="+d,query_exec_time_2.1";
++SET SESSION debug="+d,query_exec_time_2.3";
++SET SESSION debug="+d,query_exec_time_2.5";
++SET SESSION debug="+d,query_exec_time_3.1";
++SET SESSION debug="+d,query_exec_time_4.1";
++SET SESSION debug="+d,query_exec_time_5.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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   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	0	      0.000000
++      0.001000	0	      0.000000
++      1.000000	11	      4.050000
++   1000.000000	11	     25.700000
++ 1000000.00000	0	      0.000000
++TOO LONG	0	TOO LONG
++SET GLOBAL debug="";
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++DROP PROCEDURE test_f;
+diff -ruN a/mysql-test/suite/percona/t/query_response_time-replication.test b/mysql-test/suite/percona/t/query_response_time-replication.test
+--- a/mysql-test/suite/percona/t/query_response_time-replication.test	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/t/query_response_time-replication.test	2011-07-11 04:32:14.877520284 +0300
+@@ -0,0 +1,40 @@
++--source include/have_response_time_distribution.inc
++--source include/have_debug.inc
++--source include/have_binlog_format_statement.inc
++--source include/master-slave.inc
++
++connection master;
++--disable_warnings
++DROP TABLE IF EXISTS t;
++--enable_warnings
++CREATE TABLE t(id INT);
++sync_slave_with_master;
++
++connection slave;
++SET GLOBAL debug="+d,query_exec_time_debug";
++
++--let base=1
++--source suite/percona/include/query_response_time.inc
++--let base=2
++--source suite/percona/include/query_response_time.inc
++--let base=10
++--source suite/percona/include/query_response_time.inc
++--let base=7
++--source suite/percona/include/query_response_time.inc
++--let base=156
++--source suite/percona/include/query_response_time.inc
++--let base=1000
++--source suite/percona/include/query_response_time.inc
++--let base=1001
++--source suite/percona/include/query_response_time.inc
++
++connection slave;
++SET GLOBAL debug="";
++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;
++
++--source include/rpl_end.inc
+diff -ruN a/mysql-test/suite/percona/t/query_response_time-stored.test b/mysql-test/suite/percona/t/query_response_time-stored.test
+--- a/mysql-test/suite/percona/t/query_response_time-stored.test	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/t/query_response_time-stored.test	2011-07-11 04:32:14.877520284 +0300
+@@ -0,0 +1,34 @@
++--source include/have_response_time_distribution.inc
++--source include/have_debug.inc
++
++delimiter ^;
++CREATE PROCEDURE test_f(time VARCHAR(5),i INT)
++BEGIN
++  SET SESSION debug=CONCAT("+d,query_exec_time_", time);
++  /* query_exec_time= time */ INSERT INTO t VALUES(i);
++  DELETE FROM t;
++END^
++delimiter ;^	
++
++SET GLOBAL debug="+d,query_exec_time_debug";
++
++--let base=1
++--source suite/percona/include/query_response_time.inc
++--let base=2
++--source suite/percona/include/query_response_time.inc
++--let base=10
++--source suite/percona/include/query_response_time.inc
++--let base=7
++--source suite/percona/include/query_response_time.inc
++--let base=156
++--source suite/percona/include/query_response_time.inc
++--let base=1000
++--source suite/percona/include/query_response_time.inc
++--let base=1001
++--source suite/percona/include/query_response_time.inc
++
++SET GLOBAL debug="";
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
++
++DROP PROCEDURE test_f;
+diff -ruN a/mysql-test/suite/percona/t/query_response_time.test b/mysql-test/suite/percona/t/query_response_time.test
+--- a/mysql-test/suite/percona/t/query_response_time.test	1970-01-01 03:00:00.000000000 +0300
++++ b/mysql-test/suite/percona/t/query_response_time.test	2011-07-11 04:32:14.879520299 +0300
+@@ -0,0 +1,23 @@
++--source include/have_response_time_distribution.inc
++--source include/have_debug.inc
++
++SET GLOBAL debug="+d,query_exec_time_debug";
++
++--let base=1
++--source suite/percona/include/query_response_time.inc
++--let base=2
++--source suite/percona/include/query_response_time.inc
++--let base=10
++--source suite/percona/include/query_response_time.inc
++--let base=7
++--source suite/percona/include/query_response_time.inc
++--let base=156
++--source suite/percona/include/query_response_time.inc
++--let base=1000
++--source suite/percona/include/query_response_time.inc
++--let base=1001
++--source suite/percona/include/query_response_time.inc
++
++SET GLOBAL debug="";
++SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
++SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=default;
+diff -ruN a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
+--- a/mysys/CMakeLists.txt	2011-04-12 15:11:35.000000000 +0300
++++ b/mysys/CMakeLists.txt	2011-07-11 04:32:14.879520299 +0300
+@@ -41,7 +41,8 @@
+ 				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c my_wincond.c
+ 				my_windac.c my_winthread.c my_write.c ptr_cmp.c queues.c stacktrace.c
+ 				rijndael.c safemalloc.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c
+-				thr_rwlock.c tree.c typelib.c my_vle.c base64.c my_memmem.c my_getpagesize.c)
++				thr_rwlock.c tree.c typelib.c my_vle.c base64.c my_memmem.c my_getpagesize.c
++                                my_atomic.c)
+ 
+ IF(NOT SOURCE_SUBLIBS)
+   ADD_LIBRARY(mysys ${MYSYS_SOURCES})
+diff -ruN a/mysys/Makefile.am b/mysys/Makefile.am
+--- a/mysys/Makefile.am	2011-04-12 15:11:35.000000000 +0300
++++ b/mysys/Makefile.am	2011-07-11 04:32:14.879520300 +0300
+@@ -51,7 +51,8 @@
+ 			rijndael.c my_aes.c sha1.c \
+ 			my_compare.c my_netware.c my_largepage.c \
+ 			my_memmem.c stacktrace.c \
+-			my_windac.c my_access.c base64.c my_libwrap.c
++			my_windac.c my_access.c base64.c my_libwrap.c \
++			my_atomic.c
+ 
+ if NEED_THREAD
+ # mf_keycache is used only in the server, so it is safe to leave the file
+diff -ruN a/mysys/my_atomic.c b/mysys/my_atomic.c
+--- a/mysys/my_atomic.c	1970-01-01 03:00:00.000000000 +0300
++++ b/mysys/my_atomic.c	2011-07-11 04:32:14.879520300 +0300
+@@ -0,0 +1,289 @@
++#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. 
++*/
++
++#include "my_global.h"
++
++#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/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
+--- a/patch_info/response-time-distribution.info	1970-01-01 03:00:00.000000000 +0300
++++ b/patch_info/response-time-distribution.info	2011-07-11 04:32:14.881520312 +0300
 @@ -0,0 +1,9 @@
 +File=response-time-distribution.patch
 +Name=Response time distribution
@@ -37,9 +3164,20 @@
 +Changelog
 [phone] first version avaliable
 [phone] add column 'total'
+diff -ruN a/sql/lex.h b/sql/lex.h
+--- a/sql/lex.h	2011-07-11 04:31:52.073358439 +0300
++++ b/sql/lex.h	2011-07-11 04:32:14.881520312 +0300
+@@ -415,6 +415,7 @@
+   { "PURGE",		SYM(PURGE)},
+   { "QUARTER",          SYM(QUARTER_SYM)},
+   { "QUERY",		SYM(QUERY_SYM)},
++  { "QUERY_RESPONSE_TIME", SYM(QUERY_RESPONSE_TIME_SYM)},
+   { "QUICK",	        SYM(QUICK)},
+   { "RANGE",            SYM(RANGE_SYM)},
+   { "READ",		SYM(READ_SYM)},
 diff -ruN a/sql/Makefile.am b/sql/Makefile.am
---- a/sql/Makefile.am	2010-11-01 08:43:52.000000000 +0000
-+++ b/sql/Makefile.am	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/Makefile.am	2011-07-11 04:31:51.907357261 +0300
++++ b/sql/Makefile.am	2011-07-11 04:32:14.881520313 +0300
 @@ -66,7 +66,7 @@
  			sql_repl.h slave.h rpl_filter.h rpl_injector.h \
  			log_event.h rpl_record.h \
@@ -59,8 +3197,8 @@
  			sql_profile.cc \
  			sql_prepare.cc sql_error.cc sql_locale.cc \
 diff -ruN a/sql/Makefile.in b/sql/Makefile.in
---- a/sql/Makefile.in	2010-11-01 08:43:52.000000000 +0000
-+++ b/sql/Makefile.in	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/Makefile.in	2011-07-11 04:31:51.909357275 +0300
++++ b/sql/Makefile.in	2011-07-11 04:32:14.883520326 +0300
 @@ -122,7 +122,7 @@
  	sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \
  	mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \
@@ -96,35 +3234,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/records.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@
-diff -ruN a/sql/lex.h b/sql/lex.h
---- a/sql/lex.h	2010-11-01 08:43:53.000000000 +0000
-+++ b/sql/lex.h	2010-11-01 08:52:40.000000000 +0000
-@@ -415,6 +415,7 @@
-   { "PURGE",		SYM(PURGE)},
-   { "QUARTER",          SYM(QUARTER_SYM)},
-   { "QUERY",		SYM(QUERY_SYM)},
-+  { "QUERY_RESPONSE_TIME", SYM(QUERY_RESPONSE_TIME_SYM)},
-   { "QUICK",	        SYM(QUICK)},
-   { "RANGE",            SYM(RANGE_SYM)},
-   { "READ",		SYM(READ_SYM)},
-diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
---- a/sql/mysql_priv.h	2010-11-01 08:43:57.000000000 +0000
-+++ b/sql/mysql_priv.h	2010-11-01 08:52:40.000000000 +0000
-@@ -2121,6 +2121,11 @@
- extern my_bool opt_query_cache_strip_comments;
- extern my_bool opt_use_global_long_query_time;
- extern my_bool opt_slow_query_log_microseconds_timestamp;
-+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
-+extern ulong   opt_query_response_time_range_base;
-+extern my_bool opt_enable_query_response_time_stats;
-+#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
-+extern SHOW_COMP_OPTION have_response_time_distribution;
- extern my_bool sp_automatic_privileges, opt_noacl;
- extern my_bool opt_old_style_user_limits, trust_function_creators;
- extern uint opt_crash_binlog_innodb;
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-11-01 08:43:57.000000000 +0000
-+++ b/sql/mysqld.cc	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/mysqld.cc	2011-07-11 04:31:52.948364649 +0300
++++ b/sql/mysqld.cc	2011-07-11 04:32:14.886520348 +0300
 @@ -32,6 +32,7 @@
  
  #include "rpl_injector.h"
@@ -219,9 +3331,24 @@
  #ifdef HAVE_SPATIAL
    have_geometry=SHOW_OPTION_YES;
  #else
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
+--- a/sql/mysql_priv.h	2011-07-11 04:31:52.901364315 +0300
++++ b/sql/mysql_priv.h	2011-07-11 04:32:14.891520383 +0300
+@@ -2121,6 +2121,11 @@
+ extern my_bool opt_query_cache_strip_comments;
+ extern my_bool opt_use_global_long_query_time;
+ extern my_bool opt_slow_query_log_microseconds_timestamp;
++#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
++extern ulong   opt_query_response_time_range_base;
++extern my_bool opt_enable_query_response_time_stats;
++#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
++extern SHOW_COMP_OPTION have_response_time_distribution;
+ extern my_bool sp_automatic_privileges, opt_noacl;
+ extern my_bool opt_old_style_user_limits, trust_function_creators;
+ extern uint opt_crash_binlog_innodb;
 diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc
---- a/sql/query_response_time.cc	1970-01-01 00:00:00.000000000 +0000
-+++ b/sql/query_response_time.cc	2010-11-02 15:34:52.000000000 +0000
+--- a/sql/query_response_time.cc	1970-01-01 03:00:00.000000000 +0300
++++ b/sql/query_response_time.cc	2011-07-11 04:32:14.891520384 +0300
 @@ -0,0 +1,313 @@
 +#include "my_global.h"
 +#include "my_atomic.h"
@@ -537,8 +3664,8 @@
 +}
 +#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
 diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h
---- a/sql/query_response_time.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/sql/query_response_time.h	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/query_response_time.h	1970-01-01 03:00:00.000000000 +0300
++++ b/sql/query_response_time.h	2011-07-11 04:32:14.891520384 +0300
 @@ -0,0 +1,71 @@
 +#ifndef QUERY_RESPONSE_TIME_H
 +#define QUERY_RESPONSE_TIME_H
@@ -612,8 +3739,8 @@
 +
 +#endif // QUERY_RESPONSE_TIME_H
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc	2010-11-01 08:43:57.000000000 +0000
-+++ b/sql/set_var.cc	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/set_var.cc	2011-07-11 04:31:52.930364522 +0300
++++ b/sql/set_var.cc	2011-07-11 04:32:14.894520404 +0300
 @@ -1017,6 +1017,14 @@
  static sys_var_use_global_long_query_time sys_use_global_long_query_time;
  static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
@@ -630,8 +3757,8 @@
  static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
                                            &opt_slow_log, QUERY_LOG_SLOW);
 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc	2010-11-01 08:43:57.000000000 +0000
-+++ b/sql/sql_parse.cc	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/sql_parse.cc	2011-07-11 04:31:52.853363975 +0300
++++ b/sql/sql_parse.cc	2011-07-11 04:32:14.897520426 +0300
 @@ -28,6 +28,7 @@
  #include "events.h"
  #include "sql_trigger.h"
@@ -640,58 +3767,39 @@
  
  /**
    @defgroup Runtime_Environment Runtime Environment
-@@ -1764,23 +1765,37 @@
-     Do not log administrative statements unless the appropriate option is
-     set.
-   */
-+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
-+  if (opt_enable_query_response_time_stats || thd->enable_slow_log)
-+#else /* HAVE_RESPONSE_TIME_DISTRIBUTION */
-   if (thd->enable_slow_log)
-+#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
-   {
--    ulonglong end_utime_of_query= thd->current_utime();
--    thd_proc_info(thd, "logging slow query");
--
--    if (((end_utime_of_query - thd->utime_after_lock) >
--         thd->variables.long_query_time ||
--         ((thd->server_status &
--           (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
--          opt_log_queries_not_using_indexes &&
--           !(sql_command_flags[thd->lex->sql_command] & CF_STATUS_COMMAND))) &&
--        thd->examined_row_count >= thd->variables.min_examined_row_limit)
-+    ulonglong end_utime_of_query   = thd->current_utime();
-+    ulonglong query_execution_time = end_utime_of_query - thd->utime_after_lock;
-+    #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
-+    if(opt_enable_query_response_time_stats)
-+    {
-+      query_response_time_collect(query_execution_time);
-+    }
-+    #endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
-+    if (thd->enable_slow_log)
-     {
-       thd_proc_info(thd, "logging slow query");
--      thd->status_var.long_query_count++;
--      slow_log_print(thd, thd->query(), thd->query_length(), 
--                     end_utime_of_query);
+@@ -1773,12 +1774,31 @@
+   DBUG_RETURN(query_exec_time);
+ }
+ 
++void query_response_time_collect_with_check(ulonglong query_exec_time)
++{
++  DBUG_ENTER("query_response_time_collect_with_check");
++  bool collect= opt_enable_query_response_time_stats;
++  DBUG_EXECUTE_IF("query_exec_time_debug",
++                  {
++                    if (0 == query_exec_time)
++                    {
++                      collect= false;
++                    }
++                  });
++  if(collect)
++  {
++    query_response_time_collect(query_exec_time);
++  }
++  DBUG_VOID_RETURN;
++}
 +
-+      if ((query_execution_time >
-+           thd->variables.long_query_time ||
-+           ((thd->server_status &
-+             (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
-+            opt_log_queries_not_using_indexes &&
-+             !(sql_command_flags[thd->lex->sql_command] & CF_STATUS_COMMAND))) &&
-+          thd->examined_row_count >= thd->variables.min_examined_row_limit)
-+      {
-+        thd_proc_info(thd, "logging slow query");
-+        thd->status_var.long_query_count++;
-+        slow_log_print(thd, thd->query(), thd->query_length(), 
-+                       end_utime_of_query);
-+      }
-     }
-   }
-   DBUG_VOID_RETURN;
-@@ -1905,6 +1920,7 @@
+ void log_slow_statement(THD *thd)
+ {
+   DBUG_ENTER("log_slow_statement");
+ 
+   ulonglong end_utime_of_query= thd->current_utime();
+   ulonglong query_exec_time=    ::query_exec_time(thd, end_utime_of_query);
++  query_response_time_collect_with_check(query_exec_time);
+ 
+   /*
+     The following should never be true with our current code base,
+@@ -1971,6 +1991,7 @@
    case SCH_CHARSETS:
    case SCH_ENGINES:
    case SCH_COLLATIONS:
@@ -699,7 +3807,7 @@
    case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
    case SCH_USER_PRIVILEGES:
    case SCH_SCHEMA_PRIVILEGES:
-@@ -7265,6 +7281,12 @@
+@@ -7331,6 +7352,12 @@
      init_global_index_stats();
      pthread_mutex_unlock(&LOCK_global_index_stats);
    }
@@ -713,8 +3821,8 @@
    {
      pthread_mutex_lock(&LOCK_global_user_client_stats);
 diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc	2010-11-01 08:43:53.000000000 +0000
-+++ b/sql/sql_show.cc	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/sql_show.cc	2011-07-11 04:31:52.197359319 +0300
++++ b/sql/sql_show.cc	2011-07-11 04:32:14.903520469 +0300
 @@ -31,6 +31,7 @@
  #include "event_data_objects.h"
  #endif
@@ -752,8 +3860,8 @@
     fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0},
    {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table,
 diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
---- a/sql/sql_yacc.yy	2010-11-01 08:43:53.000000000 +0000
-+++ b/sql/sql_yacc.yy	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/sql_yacc.yy	2011-07-11 04:31:52.203359362 +0300
++++ b/sql/sql_yacc.yy	2011-07-11 04:32:14.907520495 +0300
 @@ -1079,6 +1079,7 @@
  %token  PURGE
  %token  QUARTER_SYM
@@ -800,8 +3908,8 @@
          | READ_ONLY_SYM            {}
          | REBUILD_SYM              {}
 diff -ruN a/sql/table.h b/sql/table.h
---- a/sql/table.h	2010-11-01 08:43:53.000000000 +0000
-+++ b/sql/table.h	2010-11-01 08:52:40.000000000 +0000
+--- a/sql/table.h	2011-07-11 04:31:52.207359390 +0300
++++ b/sql/table.h	2011-07-11 04:32:14.913520540 +0300
 @@ -964,6 +964,7 @@
    SCH_PROFILES,
    SCH_REFERENTIAL_CONSTRAINTS,
@@ -810,1304 +3918,3 @@
    SCH_SCHEMATA,
    SCH_SCHEMA_PRIVILEGES,
    SCH_SESSION_STATUS,
-diff -ruN a/configure.in b/configure.in
---- a/configure.in	2010-12-07 19:19:42.000000000 +0300
-+++ b/configure.in	2010-12-07 19:21:39.000000000 +0300
-@@ -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/my_atomic.h
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/include/my_atomic.h	2011-06-07 08:59:00.000000000 +0300
-@@ -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);                                      \