Merge lp:~laurynas-biveinis/percona-server/bug1183625-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge percona_userstat testcase from 5.1, partially addressing bug
1179534, and containing the testcase for bug 1183625.

http://jenkins.percona.com/job/percona-server-5.5-param/746/

[Laurynas Biveinis (laurynas-biveinis)]

The conflicts will be addressed at the merge time.

[Stewart Smith (stewart)]

I used "bzr merge" and "bzr diff" locally to review, as LP seems to have gotten it really wrong with the diff.

review: Approve

=== removed file 'COPYING.show_temp_51'
--- COPYING.show_temp_51	2013-05-28 06:50:44 +0000
+++ COPYING.show_temp_51	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Portions of this software contain modifications contributed by Venu Anuganti.
-These contributions are used with the following license:
-
-Copyright (c) 2010, Venu Anuganti, http://venublog.com/
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== added file 'Percona-Server/mysql-test/include/have_response_time_distribution.inc'
--- Percona-Server/mysql-test/include/have_response_time_distribution.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_response_time_distribution.inc	2013-05-28 06:50:46 +0000
@@ -0,0 +1,4 @@
+-- require r/have_response_time_distribution.require
+disable_query_log;
+show variables like 'have_response_time_distribution';
+enable_query_log;
 
=== added file 'Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc'
--- Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc	2013-05-28 06:50:46 +0000
@@ -0,0 +1,3 @@
+DROP TABLE t1;
+SET GLOBAL query_cache_size=default;
+set global query_cache_strip_comments=OFF;
 
=== removed file 'Percona-Server/mysql-test/include/query_response_time.inc'
--- Percona-Server/mysql-test/include/query_response_time.inc	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/include/query_response_time.inc	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-SET SESSION query_exec_time=0.1;
-
-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
-EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base;
-FLUSH QUERY_RESPONSE_TIME;
-# Following two queries check works of FLUSH and 
-# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312)
-SHOW QUERY_RESPONSE_TIME;
-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
-
-SET SESSION query_exec_time=0.31; SELECT 1;
-SET SESSION query_exec_time=0.32; SELECT 1;
-SET SESSION query_exec_time=0.33; SELECT 1;
-SET SESSION query_exec_time=0.34; SELECT 1;
-SET SESSION query_exec_time=0.35; SELECT 1;
-SET SESSION query_exec_time=0.36; SELECT 1;
-SET SESSION query_exec_time=0.37; SELECT 1;
-SET SESSION query_exec_time=0.38; SELECT 1;
-SET SESSION query_exec_time=0.39; SELECT 1;
-SET SESSION query_exec_time=0.4; SELECT 1;
-SET SESSION query_exec_time=1.1; SELECT 1;
-SET SESSION query_exec_time=1.2; SELECT 1;
-SET SESSION query_exec_time=1.3; SELECT 1;
-SET SESSION query_exec_time=1.5; SELECT 1;
-SET SESSION query_exec_time=1.4; SELECT 1;
-SET SESSION query_exec_time=0.5; SELECT 1;
-SET SESSION query_exec_time=2.1; SELECT 1;
-SET SESSION query_exec_time=2.3; SELECT 1;
-SET SESSION query_exec_time=2.5; SELECT 1;
-SET SESSION query_exec_time=3.1; SELECT 1;
-SET SESSION query_exec_time=4.1; SELECT 1;
-SET SESSION query_exec_time=5.1; SELECT 1;
-
-SET SESSION query_exec_time=0.1;
-
-SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
-
-SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE';
-SHOW QUERY_RESPONSE_TIME;
-SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
-
-SET SESSION query_exec_time=default;
 
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result'
--- Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# Establish connection con1 (user=root)
-# Establish connection con2 (user=root)
-# Establish connection con3 (user=root)
-# Drop test table
-drop table if exists t;
-# Create test table
-create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
-# Insert two rows to test table
-insert into t values(2,1);
-insert into t values(1,2);
-# Switch to connection con1
-BEGIN;
-SELECT b FROM t WHERE a=1 FOR UPDATE;
-# Switch to connection con2
-BEGIN;
-SELECT b FROM t WHERE a=2 FOR UPDATE;
-# Switch to connection con1
-SELECT b FROM t WHERE a=2 FOR UPDATE;
-# Switch to connection con2
-SELECT b FROM t WHERE a=1 FOR UPDATE;
-# Switch to connection con1
-ROLLBACK;
-# Switch to connection con2
-ROLLBACK;
-# Switch to connection con3
-Deadlocks: 1
-# Drop test table
-drop table t;
 
=== removed file 'Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result'
--- Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-show variables like 'innodb_use_sys_stats%';
-Variable_name	Value
-innodb_use_sys_stats_table	ON
 
=== added file 'Percona-Server/mysql-test/r/percona_log_connection_error.result'
--- Percona-Server/mysql-test/r/percona_log_connection_error.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_log_connection_error.result	2013-05-28 06:50:46 +0000
@@ -0,0 +1,16 @@
+SET @old_max_connections = @@max_connections;
+SET @old_log_warnings = @@log_warnings;
+SET GLOBAL max_connections=2;
+SET GLOBAL LOG_WARNINGS = 0;
+connect(localhost,root,,test,port,socket);
+ERROR HY000: Too many connections
+SET GLOBAL LOG_WARNINGS = 1;
+connect(localhost,root,,test,port,socket);
+ERROR HY000: Too many connections
+SET GLOBAL LOG_WARNINGS = 0;
+connect(localhost,root,,test,port,socket);
+ERROR HY000: Too many connections
+SET GLOBAL max_connections = @old_max_connections;
+SET GLOBAL log_warnings = @old_log_warnings;
+[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
+[log_grep.inc] lines:   1
 
=== removed file 'Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result'
--- Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-call mtr.add_suppression("option 'log_slow_admin_statements': boolean value 'foo' wasn't recognized. Set to OFF.");
-SHOW GLOBAL VARIABLES like 'log_slow_admin_statements';
-Variable_name	Value
-log_slow_admin_statements	OFF
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_admin_statements';
-VARIABLE_NAME	VARIABLE_VALUE
-LOG_SLOW_ADMIN_STATEMENTS	OFF
 
=== removed file 'Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result'
--- Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-set GLOBAL query_cache_size=1355776;
-drop table if exists t1;
-create table t1 (a int not null);
-insert into t1 values (1),(2),(3);
-flush query cache;
-flush query cache;
-reset query cache;
-flush status;
-( select * from t1 );
-a
-1
-2
-3
-/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, @@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), @OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, @@SQL_QUOTE_SHOW_CREATE := 1 */;
-/* only comment */;
-# only comment
-;
--- only comment
-;
-DROP TABLE t1;
-SET GLOBAL query_cache_size= default;
 
=== added file 'Percona-Server/mysql-test/r/percona_query_response_time.result'
--- Percona-Server/mysql-test/r/percona_query_response_time.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_query_response_time.result	2013-05-28 06:50:46 +0000
@@ -0,0 +1,1307 @@
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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;
+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	0	      0.000000
+      1.000000	0	      0.000000
+      2.000000	0	      0.000000
+      4.000000	0	      0.000000
+      8.000000	0	      0.000000
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	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	0	      0.000000
+      1.000000	0	      0.000000
+      2.000000	0	      0.000000
+      4.000000	0	      0.000000
+      8.000000	0	      0.000000
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      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.199999
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      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.199999
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2;
+FLUSH QUERY_RESPONSE_TIME;
+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	0	      0.000000
+      1.000000	0	      0.000000
+      2.000000	0	      0.000000
+      4.000000	0	      0.000000
+      8.000000	0	      0.000000
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	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	0	      0.000000
+      1.000000	0	      0.000000
+      2.000000	0	      0.000000
+      4.000000	0	      0.000000
+      8.000000	0	      0.000000
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      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.199999
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      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.199999
+     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.000000	0	      0.000000
+2097152.000000	0	      0.000000
+4194304.000000	0	      0.000000
+8388608.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10;
+FLUSH QUERY_RESPONSE_TIME;
+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	0	      0.000000
+     10.000000	0	      0.000000
+    100.000000	0	      0.000000
+   1000.000000	0	      0.000000
+  10000.000000	0	      0.000000
+ 100000.000000	0	      0.000000
+1000000.000000	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	0	      0.000000
+     10.000000	0	      0.000000
+    100.000000	0	      0.000000
+   1000.000000	0	      0.000000
+  10000.000000	0	      0.000000
+ 100000.000000	0	      0.000000
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      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.699999
+    100.000000	0	      0.000000
+   1000.000000	0	      0.000000
+  10000.000000	0	      0.000000
+ 100000.000000	0	      0.000000
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      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.699999
+    100.000000	0	      0.000000
+   1000.000000	0	      0.000000
+  10000.000000	0	      0.000000
+ 100000.000000	0	      0.000000
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7;
+FLUSH QUERY_RESPONSE_TIME;
+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	0	      0.000000
+      7.000000	0	      0.000000
+     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.000000	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	0	      0.000000
+      7.000000	0	      0.000000
+     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.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      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.699999
+     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.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      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.699999
+     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.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156;
+FLUSH QUERY_RESPONSE_TIME;
+SHOW QUERY_RESPONSE_TIME;
+		
+      0.000041	0	      0.000000
+      0.006410	0	      0.000000
+      1.000000	0	      0.000000
+    156.000000	0	      0.000000
+  24336.000000	0	      0.000000
+3796416.000000	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	0	      0.000000
+    156.000000	0	      0.000000
+  24336.000000	0	      0.000000
+3796416.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      0.000000
+      0.006410	0	      0.000000
+      1.000000	11	      4.050000
+    156.000000	11	     25.699999
+  24336.000000	0	      0.000000
+3796416.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000041	24	      0.000000
+      0.006410	0	      0.000000
+      1.000000	11	      4.050000
+    156.000000	11	     25.699999
+  24336.000000	0	      0.000000
+3796416.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=0;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000;
+FLUSH QUERY_RESPONSE_TIME;
+SHOW QUERY_RESPONSE_TIME;
+		
+      0.000001	0	      0.000000
+      0.001000	0	      0.000000
+      1.000000	0	      0.000000
+   1000.000000	0	      0.000000
+1000000.000000	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	0	      0.000000
+   1000.000000	0	      0.000000
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      0.000000
+      0.001000	0	      0.000000
+      1.000000	11	      4.050000
+   1000.000000	11	     25.699999
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      0.000000
+      0.001000	0	      0.000000
+      1.000000	11	      4.050000
+   1000.000000	11	     25.699999
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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;
+SHOW QUERY_RESPONSE_TIME;
+		
+      0.000001	0	      0.000000
+      0.001000	0	      0.000000
+      1.000000	0	      0.000000
+   1000.000000	0	      0.000000
+1000000.000000	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	0	      0.000000
+   1000.000000	0	      0.000000
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=1;
+SET SESSION query_exec_time=0.31;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.32;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.33;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.34;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.35;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.36;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.37;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.38;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.39;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.2;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=1.4;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.3;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=2.5;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=3.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=4.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=5.1;
+SELECT 1;
+1
+1
+SET SESSION query_exec_time=0.1;
+SET GLOBAL 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	24	      0.000000
+      0.001000	0	      0.000000
+      1.000000	11	      4.050000
+   1000.000000	11	     25.699999
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
+time	count	total
+      0.000001	24	      0.000000
+      0.001000	0	      0.000000
+      1.000000	11	      4.050000
+   1000.000000	11	     25.699999
+1000000.000000	0	      0.000000
+TOO LONG	0	TOO LONG
+SET SESSION query_exec_time=default;
+SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default;
+SET GLOBAL QUERY_RESPONSE_TIME_STATS=default;
 
=== renamed file 'Percona-Server/mysql-test/r/userstat_bug602047.result' => 'Percona-Server/mysql-test/r/percona_userstat.result'
--- Percona-Server/mysql-test/r/userstat_bug602047.result	2012-12-19 09:23:15 +0000
+++ Percona-Server/mysql-test/r/percona_userstat.result	2013-05-28 06:50:46 +0000
@@ -1,19 +1,89 @@
 DROP TABLE IF EXISTS t1;
+SET GLOBAL userstat=OFF;
+FLUSH CLIENT_STATISTICS;
+FLUSH INDEX_STATISTICS;
+FLUSH TABLE_STATISTICS;
+FLUSH THREAD_STATISTICS;
 FLUSH USER_STATISTICS;
-FLUSH TABLE_STATISTICS;
-FLUSH INDEX_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.CLIENT_STATISTICS;
+CLIENT	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS;
+TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
+SELECT * FROM INFORMATION_SCHEMA.THREAD_STATISTICS;
+THREAD_ID	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+SELECT * FROM INFORMATION_SCHEMA.USER_STATISTICS;
+USER	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+SHOW CLIENT_STATISTICS;
+Client	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
+SHOW INDEX_STATISTICS;
+Table_schema	Table_name	Index_name	Rows_read
+SHOW TABLE_STATISTICS;
+Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes
+SHOW THREAD_STATISTICS;
+Thread_id	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
+SHOW USER_STATISTICS;
+User	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
 SET @userstat_old= @@userstat;
 SET GLOBAL userstat=ON;
-CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
+SELECT * FROM INFORMATION_SCHEMA.CLIENT_STATISTICS;
+CLIENT	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+localhost	1	CONNECTED_TIME	BUSY_TIME	CPU_TIME	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS;
+TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS;
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
+SELECT * FROM INFORMATION_SCHEMA.THREAD_STATISTICS;
+THREAD_ID	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+SELECT * FROM INFORMATION_SCHEMA.USER_STATISTICS;
+USER	TOTAL_CONNECTIONS	CONCURRENT_CONNECTIONS	CONNECTED_TIME	BUSY_TIME	CPU_TIME	BYTES_RECEIVED	BYTES_SENT	BINLOG_BYTES_WRITTEN	ROWS_FETCHED	ROWS_UPDATED	TABLE_ROWS_READ	SELECT_COMMANDS	UPDATE_COMMANDS	OTHER_COMMANDS	COMMIT_TRANSACTIONS	ROLLBACK_TRANSACTIONS	DENIED_CONNECTIONS	LOST_CONNECTIONS	ACCESS_DENIED	EMPTY_QUERIES	TOTAL_SSL_CONNECTIONS
+root	1	CONNECTED_TIME	BUSY_TIME	CPU_TIME	0	218	0	0	1	0	0	4	0	0	0	0	0	0	0	3	0
+SHOW CLIENT_STATISTICS;
+Client	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
+localhost	1	CONNECTED_TIME	BUSY_TIME	CPU_TIME	0	271	0	0	2	0	0	5	0	0	0	0	0	0	0	3	0
+SHOW INDEX_STATISTICS;
+Table_schema	Table_name	Index_name	Rows_read
+SHOW TABLE_STATISTICS;
+Table_schema	Table_name	Rows_read	Rows_changed	Rows_changed_x_#indexes
+SHOW THREAD_STATISTICS;
+Thread_id	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
+SHOW USER_STATISTICS;
+User	Total_connections	Concurrent_connections	Connected_time	Busy_time	Cpu_time	Bytes_received	Bytes_sent	Binlog_bytes_written	Rows_fetched	Rows_updated	Table_rows_read	Select_commands	Update_commands	Other_commands	Commit_transactions	Rollback_transactions	Denied_connections	Lost_connections	Access_denied	Empty_queries	Total_ssl_connections
+root	1	CONNECTED_TIME	BUSY_TIME	CPU_TIME	0	377	0	0	3	0	0	9	0	0	0	0	0	0	0	6	0
+CREATE TABLE t1 (id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 10
-SELECT ROWS_READ FROM information_schema.table_statistics WHERE TABLE_NAME='t1';
-ROWS_READ
-10
-SELECT ROWS_READ FROM information_schema.index_statistics WHERE TABLE_NAME='t1';
-ROWS_READ
-10
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+10
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+10
+FLUSH TABLE_STATISTICS;
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+10
+FLUSH INDEX_STATISTICS;
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+10
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+10
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+ROWS_READ
+10
+DROP TABLE t1;
+CREATE TABLE t2 (c1 INT UNSIGNED) ENGINE=InnoDB;
+ALTER TABLE t2 MODIFY c1 FLOAT;
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t2';
+TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
+DROP TABLE t2;
 SET GLOBAL userstat= @userstat_old;
-DROP TABLE t1;
 
=== removed file 'Percona-Server/mysql-test/r/percona_xtradb_admin_command.result'
--- Percona-Server/mysql-test/r/percona_xtradb_admin_command.result	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/r/percona_xtradb_admin_command.result	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-select * from information_schema.XTRADB_ADMIN_COMMAND;
-result_message
-No XTRA_* command in the SQL statement. Please add /*!XTRA_xxxx*/ to the SQL.
-select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;
-result_message
-Hello!
 
=== added file 'Percona-Server/mysql-test/r/percona_xtradb_bug317074.result'
--- Percona-Server/mysql-test/r/percona_xtradb_bug317074.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_xtradb_bug317074.result	2013-05-28 06:50:46 +0000
@@ -0,0 +1,5 @@
+SET @old_innodb_file_format=@@innodb_file_format;
+SET @old_innodb_file_format_max=@@innodb_file_format_max;
+SET @old_innodb_file_per_table=@@innodb_file_per_table;
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=ON;
 
=== added file 'Percona-Server/mysql-test/t/percona_bug643149.test'
--- Percona-Server/mysql-test/t/percona_bug643149.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug643149.test	2013-05-28 06:50:46 +0000
@@ -0,0 +1,49 @@
+#
+# This test suffers from server
+# Bug#38124 "general_log_file" variable silently unset when using expression
+# In short:
+#    SET GLOBAL general_log_file = @<whatever>
+#    SET GLOBAL slow_query_log = @<whatever>
+# cause that the value of these server system variables is set to default
+# instead of the assigned values. There comes no error message or warning.
+# If this bug is fixed please
+# 1. try this test with "let $fixed_bug38124 = 0;"
+# 2. remove all workarounds if 1. was successful.
+--source include/have_profiling.inc
+let $fixed_bug38124 = 0;
+
+SET @old_slow_query_log_file=@@global.slow_query_log_file;
+SET GLOBAL slow_query_log=on;
+SET LOCAL log_slow_verbosity='profiling';
+SET LOCAL long_query_time=0;
+
+let slogfile=$MYSQLTEST_VARDIR/percona_bug643149_slow.log;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--eval SET GLOBAL slow_query_log_file='$slogfile';
+
+SELECT 1;
+
+perl;
+  $slogfile= $ENV{'slogfile'};
+
+  open(FILE, "$slogfile") or
+    die("Unable to read slow query log file $slogfile: $!\n");
+  while(<FILE>) {
+    next if (!/^#/);
+    next if (/^# Time:/);
+    s/[0-9]+/X/g;
+    print;
+  }
+
+  close(FILE);
+EOF
+
+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
+
+if(!$fixed_bug38124)
+{
+  --disable_query_log
+  let $my_var = `SELECT @old_slow_query_log_file`;
+  eval SET @@global.slow_query_log_file = '$my_var';
+  --enable_query_log
+}
 
=== removed file 'Percona-Server/mysql-test/t/percona_bug933969.test'
--- Percona-Server/mysql-test/t/percona_bug933969.test	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/t/percona_bug933969.test	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-###################### percona_bug933969.test ########################
-# Bug #933969: mysqlbinlog doesn't accept stdin                      #
-#                                                                    #
-# The goal of this testcase is to test that mysqlbinlog handle       #
-# stdin correctly when stdin is pipe.                                #
-# i.e. "cat log | mysqlbinlog -" don't cause mysqlbinlog failure     #
-######################################################################
--- source include/have_log_bin.inc
--- source include/not_windows.inc
--- source include/not_embedded.inc
-
-# deletes all the binary logs
-RESET MASTER;
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-# produce some statements for binlog
-
-CREATE TABLE t1 (word VARCHAR(20));
-
-INSERT INTO t1 VALUES ("hamite");
-INSERT INTO t1 VALUES ("hoho");
-INSERT INTO t1 VALUES ("znamenito");
-INSERT INTO t1 VALUES ("mrachny");
-INSERT INTO t1 VALUES ("mrak");
-INSERT INTO t1 VALUES ("zhut");
-INSERT INTO t1 VALUES ("parnisha");
-INSERT INTO t1 VALUES ("krrasota!");
-INSERT INTO t1 VALUES ("podumayesh");
-INSERT INTO t1 VALUES ("ogo!");
-
-FLUSH LOGS;
-
-# run mysqlbinlog and make sure it ends normally
-
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
---system cat $MYSQLD_DATADIR/master-bin.000001 | $MYSQL_BINLOG - >/dev/null
-
-DROP TABLE t1;
-RESET MASTER;
 
=== added file 'Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test'
--- Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test	2013-05-28 06:50:46 +0000
@@ -0,0 +1,2 @@
+SHOW VARIABLES LIKE 'log_slow_verbosity';
+SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
 
=== added file 'Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test'
--- Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test	2013-05-28 06:50:46 +0000
@@ -0,0 +1,208 @@
+-- source include/have_query_cache.inc
+
+set GLOBAL query_cache_size=1355776;
+
+# Reset query cache variables.
+flush query cache; # This crashed in some versions
+flush query cache; # This crashed in some versions
+reset query cache;
+flush status;
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+#
+# First simple test
+#
+
+create table t1 (a int not null);
+insert into t1 values (1),(2),(3);
+
+set global query_cache_strip_comments=ON;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from '/* with comment */ select * from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+execute stmt;
+execute stmt;
+execute stmt;
+execute stmt;
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * /*internal comment*/from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * /*internal comment*/ from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 /* at the end */';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 /* with "quote" */';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 /* with \'quote\' */';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 # 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 # 123 with "quote"
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 # 123 with \'quote\'
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1
+# 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from '#456
+select * from t1
+# 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1 -- 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select * from t1
+-- 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from '-- comment in first
+select * from t1
+# 123
+';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from '(#456(
+select * from t1
+# 123(
+)';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from '/*test*/(-- comment in first(
+select * from t1
+-- 123 asdasd
+/* test */)';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select "test",a from t1';
+execute stmt;
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select "test /* internal \'comment\' */",a from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select "test #internal comment" ,a from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+prepare stmt from 'select "test #internal comment" #external comment
+,a from t1';
+execute stmt;
+
+show status like "Qcache_queries_in_cache";
+show status like "Qcache_inserts";
+show status like "Qcache_hits";
+
+DROP TABLE t1;
+SET GLOBAL query_cache_size= default;
+set global query_cache_strip_comments=OFF;
 
=== removed file 'Percona-Server/mysql-test/t/percona_server_variables_debug.test'
--- Percona-Server/mysql-test/t/percona_server_variables_debug.test	2013-05-28 06:50:44 +0000
+++ Percona-Server/mysql-test/t/percona_server_variables_debug.test	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
---source include/have_debug.inc
---source include/percona_server_variables.inc
 
=== added file 'Percona-Server/mysql-test/t/percona_server_variables_release.test'
--- Percona-Server/mysql-test/t/percona_server_variables_release.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_server_variables_release.test	2013-05-28 06:50:46 +0000
@@ -0,0 +1,2 @@
+--source include/have_nodebug.inc
+--source include/percona_server_variables.inc
 
=== added file 'Percona-Server/mysql-test/t/percona_sql_no_fcache.test'
--- Percona-Server/mysql-test/t/percona_sql_no_fcache.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_sql_no_fcache.test	2013-05-28 06:50:46 +0000
@@ -0,0 +1,11 @@
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t (a int not null);
+insert into t values (1),(2),(3);
+
+SELECT SQL_NO_FCACHE SLEEP(0);
+SELECT /*!40001 SQL_NO_CACHE */ /*!50084 SQL_NO_FCACHE */ * FROM t;
+
+DROP TABLE t;
 
=== renamed file 'Percona-Server/mysql-test/t/userstat_bug602047.test' => 'Percona-Server/mysql-test/t/percona_userstat.test'
--- Percona-Server/mysql-test/t/userstat_bug602047.test	2012-12-19 09:23:15 +0000
+++ Percona-Server/mysql-test/t/percona_userstat.test	2013-05-28 06:50:46 +0000
@@ -1,16 +1,91 @@
 --source include/have_innodb.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1; 
 --enable_warnings
+
+# Test that FLUSH works with userstat disabled
+SET GLOBAL userstat=OFF;
+
+FLUSH CLIENT_STATISTICS;
+FLUSH INDEX_STATISTICS;
+FLUSH TABLE_STATISTICS;
+FLUSH THREAD_STATISTICS;
 FLUSH USER_STATISTICS;
-FLUSH TABLE_STATISTICS;
-FLUSH INDEX_STATISTICS;
+
+# Test that I_S and SHOW queries work with userstat disabled
+SELECT * FROM INFORMATION_SCHEMA.CLIENT_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.THREAD_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.USER_STATISTICS;
+
+SHOW CLIENT_STATISTICS;
+SHOW INDEX_STATISTICS;
+SHOW TABLE_STATISTICS;
+SHOW THREAD_STATISTICS;
+SHOW USER_STATISTICS;
+
 SET @userstat_old= @@userstat;
 SET GLOBAL userstat=ON;
-CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
+
+# Test that statistics start at empty state
+
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SELECT * FROM INFORMATION_SCHEMA.CLIENT_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS;
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS;
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SELECT * FROM INFORMATION_SCHEMA.THREAD_STATISTICS;
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SELECT * FROM INFORMATION_SCHEMA.USER_STATISTICS;
+
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SHOW CLIENT_STATISTICS;
+SHOW INDEX_STATISTICS;
+SHOW TABLE_STATISTICS;
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SHOW THREAD_STATISTICS;
+--replace_column 3 CONNECTED_TIME 4 BUSY_TIME 5 CPU_TIME
+SHOW USER_STATISTICS;
+
+# Bug 602047 (wrong rows_read value)
+
+CREATE TABLE t1 (id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 SELECT COUNT(*) FROM t1; 
-SELECT ROWS_READ FROM information_schema.table_statistics WHERE TABLE_NAME='t1';
-SELECT ROWS_READ FROM information_schema.index_statistics WHERE TABLE_NAME='t1';
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+
+# Test that FLUSH clears one table but not another
+
+FLUSH TABLE_STATISTICS;
+
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+
+# Test that FLUSH clears both tables now
+
+FLUSH INDEX_STATISTICS;
+
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+
+# Test that stats are collected after the FLUSH again
+
+SELECT COUNT(*) FROM t1; 
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t1';
+SELECT ROWS_READ FROM INFORMATION_SCHEMA.INDEX_STATISTICS WHERE TABLE_NAME='t1';
+
+DROP TABLE t1;
+
+# Bug 1183625 (handler::update_global_table_stats crash).
+
+CREATE TABLE t2 (c1 INT UNSIGNED) ENGINE=InnoDB;
+
+ALTER TABLE t2 MODIFY c1 FLOAT;
+
+SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_NAME='t2';
+
+DROP TABLE t2;
+
 SET GLOBAL userstat= @userstat_old;
-DROP TABLE t1;
 
=== removed file 'build/debian/copyright'
--- build/debian/copyright	2013-05-28 06:50:44 +0000
+++ build/debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-This work was packaged for Debian by:
-
-    Aleksandr Kuzminsky <[e-mail]> on Tue, 11 Jan 2011 07:17:08 -0800
-
-It was downloaded from:
-
-    http://www.percona.com/downloads/
-
-Upstream Author(s):
-
-    [e-mail]
-
-Copyright:
-
-    Copyright (C) 2006-2011 Percona Inc.
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-    This package 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, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-The Debian packaging is:
-
-    Copyright (C) 2011 Aleksandr Kuzminsky <[e-mail]>
-
-you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-Other copyrights:
-
-Patch innodb-deadlock-count-patch
-
-Copyright:
-
-	COPYING.innodb-deadlock-count-patch
-
-Patch show_temp
-
-Copyright:
-	
-	COPYING.show_temp_51
-
-== innotop ==
-
-Author: Baron Schwartz <[e-mail]>
-URL:    http://innotop.sourceforge.net
-
-License:
-> This software is dual licensed, either GPL version 2 or Artistic License.
->
-> This package 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; either version 2 of the License, or
-> (at your option) any later version.
->
-> This package 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 package; if not, write to the Free Software
-> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License and the
-Artistic License can be found in `/usr/share/common-licenses/'.
-
-The upstream author explained here: http://bugs.gentoo.org/show_bug.cgi?id=14760
-that these licenses also apply to the following files:
-- innotop.html
-- InnoDBParser.pm
-
 
=== added directory 'doc/source/_static'
=== added file 'doc/source/compatibility.rst'
--- doc/source/compatibility.rst	1970-01-01 00:00:00 +0000
+++ doc/source/compatibility.rst	2013-05-28 06:50:46 +0000
@@ -0,0 +1,27 @@
+.. _compatibility: 
+
+==============================================================
+Options that make XtraDB tablespaces not compatible with MySQL
+==============================================================
+
+Fast checksums
+==============
+
+Enabling :variable:`innodb_fast_checksum` will use more CPU-efficient algorithm, based on 4-byte words which can be beneficial for some workloads. Once enabled, turning it off will require table to be dump/imported again, since |Percona Server| will fail to start on data files created when :variable:`innodb_fast_checksums` was enabled.
+
+In case you've migrated from |Percona Server| to |MySQL| you could get the "corrupted checksum" error message. In order to recover that table you'll need to:
+
+  1) Reinstall Percona Server to read your tables that were created with fast checksums. 
+  2) Dump the tables (or temporarily convert them to MyISAM). 
+  3) Install stock MySQL (or at least disable fast checksums). 
+  4) Restore the InnoDB tables (or convert back from MyISAM). 
+
+Page sizes other than 16KiB
+===========================
+
+This is controlled by variable :variable:`innodb_page_size`. Changing the page size for an existing database is not supported. Table will need to be dumped/imported again if compatibility with |MySQL| is required.
+
+Relocation of the doublewrite buffer
+====================================
+
+Variable :variable:`innodb_doublewrite_file` provides an option to put the buffer on a dedicated disk in order to parallelize I/O activity on the buffer and on the tablespace. Only in case of crash recovery this variable cannot be changed, in all other cases it can be turned on/off without breaking the compatibility. 
 
=== added file 'doc/source/diagnostics/innodb_stats.rst'
--- doc/source/diagnostics/innodb_stats.rst	1970-01-01 00:00:00 +0000
+++ doc/source/diagnostics/innodb_stats.rst	2013-05-28 06:50:46 +0000
@@ -0,0 +1,234 @@
+.. _innodb_stats:
+
+=====================
+ |InnoDB| Statistics
+=====================
+
+This feature provides new startup options (control method and collection of index statistics estimation) and information schema views to confirm the statistics.
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.8-20.0`:
+    Renamed three fields in :table:`INNODB_INDEX_STATS` table.
+
+
+System Variables
+================
+
+Four new system variables were introduced by this feature.
+
+.. variable:: innodb_stats_method
+
+   :cli: YES
+   :configfile: YES
+   :scope: GLOBAL
+   :dyn: YES
+   :type: STRING
+   :default: ``nulls_equal``
+   :allowed: ``nulls_equal``, ``nulls_unequal``, ``nulls_ignored``
+
+The values and meanings are almost same to ``myisam_stats_method`` option of native |MySQL| (``nulls_equal``, ``nulls_unequal``, ``nulls_ignored``). But |InnoDB| doesn't have several patterns of statistics currently. Even though this option can be changed dynamically, statistics needs to be re-calculated to change the method for the table.
+
+(reference: `MyISAM Index Statistics Collection <http://dev.mysql.com/doc/refman/5.5/en/myisam-index-statistics.html>`_)
+
+.. variable:: innodb_stats_auto_update
+
+   :type: BOOLEAN
+   :default: 1
+
+|InnoDB| updates the each index statistics automatically (many updates were done, some information_schema is accessed, table monitor, etc.). Setting this option 0 can stop these automatic recalculation of the statistics except for "first open" and "ANALYZE TABLE command".
+
+
+.. variable:: innodb_stats_update_need_lock
+
+   :type: BOOLEAN
+   :default: 1
+
+If you meet contention of ``&dict_operation_lock``, setting 0 reduces the contention. But 0 disables to update ``Data_free:`` of ``SHOW TABLE STATUS``.
+
+
+.. variable:: innodb_use_sys_stats_table
+
+   :type: BOOLEAN
+   :default: 0
+
+
+If this option is enabled, |XtraDB| uses the ``SYS_STATS`` system table to store statistics of table indexes. Also, when |InnoDB| opens a table for the first time, it loads the statistics from ``SYS_STATS`` instead of sampling index pages. If you use a high ``stats_sample_pages`` value, the first open of a table is expensive. In such a case, this option will help. Intended behavior is to never update statistics unless an explicit ``ANALYZE TABLE`` is issued.
+
+INFORMATION_SCHEMA Tables
+=========================
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_STATS
+
+   Shows statistics of table indexes.
+   
+   :column INDEX_ID: Index ID
+   :column KEY_COLS: Number of key columns
+   :column DIFF_VALS: Number of Different Values
+   :column NON_NULL_VALS: Number of Non ``NULL`` Values
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_TABLES
+
+   Shows the information about |InnoDB| tables
+
+   :column TABLE_ID: Table ID
+   :column SCHEMA: Database (schema) name
+   :column NAME: Table name
+   :column FLAG: Contains `0` if it is a InnoDB system table or `1` it is a user table
+   :column N_COLS: Number of columns in the table
+   :column SPACE: Tablespace ID
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+
+   Shows the information about the performance statistics of |InnoDB| tables.
+
+   :column TABLE_ID: Table ID
+   :column SCHEMA: Database (schema) Name
+   :column NAME: Table Name
+   :column STATS_INITIALIZED: Contains ``Initialized`` value if the statistics are collected or ``Uninitialized`` if they are not collected.
+   :column NUM_ROWS: Estimated number of rows in the table.
+   :column CLUST_INDEX_SIZE: Number of pages on disk that store the clustered index. 
+   :column OTHER_INDEX_SIZE: Number of pages on disk that store all secondary indexes. 
+   :column MODIFIED_COUNTER: Number of rows modified by DML operations.
+   :column AUTOINC: 
+   :column MYSQL_HANDLES_OPENED:
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_INDEXES
+
+   Shows the information about |InnoDB| indexes
+
+   :column INDEX_ID: Index ID
+   :column NAME: Index Name
+   :column TABLE_ID: Table ID
+   :column TYPE: Numeric identifier signifying the index type
+   :column N_FIELDS: Number of columns in the index
+   :column PAGE_NO: Page offset within its tablespace
+   :column SPACE: Tablespace ID
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_COLUMNS
+
+   Shows the information about the |InnoDB| table columns
+
+   :column TABLE_ID: Table ID
+   :column NAME: Column Name
+   :column POS: Position of the column inside the table. 
+   :column MTYPE: Numeric identifier for the column type.
+   :column PRTYPE: Binary value with bits representing data type, character set code and nullability.
+   :column LEN: Column length.
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_FIELDS
+
+   Shows the information about the |InnoDB| index key fields.
+
+   :column INDEX_ID: Index ID
+   :column NAME: Index Name
+   :column POS: Position of the field inside the index.
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_FOREIGN
+ 
+   Shows the information about the |InnoDB| foreign keys.
+
+   :column ID: Foreign Key ID
+   :column FOR_NAME: Database/Table which contains the Foreign Key 
+   :column FOR_REF: Database/Table being referenced by the Foreign Key
+   :column N_COLS: Number of columns in the foreign key.
+   :column TYPE: Type of foreign key, represented by the bit flags.
+
+.. table:: INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS
+
+   Shows the information about the columns of the |InnoDB| foreign keys.
+
+   :column ID: Foreign Key ID
+   :column FOR_COL_NAME: Foreign Key Column Name
+   :column FOR_REF: Referenced Column Name
+   :column POS: Position of the field inside the index.
+
+.. table:: INFORMATION_SCHEMA.INNODB_TABLE_STATS
+
+   Shows table statistics information of dictionary cached.
+
+   :column table_schema: Database name of the table.
+   :column table_name: Table name.
+   :column rows: estimated number of all rows.
+   :column clust_size: cluster index (table/primary key) size in number of pages.
+   :column other_size: Other index (non primary key) size in number of pages.
+   :column modified: Internal counter to judge whether statistics recalculation should be done.
+
+If the value of modified column exceeds "rows / 16" or 2000000000, the statistics recalculation is done when ``innodb_stats_auto_update == 1``. We can estimate the oldness of the statistics by this value.
+
+.. table:: INFORMATION_SCHEMA.INNODB_INDEX_STATS
+
+   Shows index statistics information of dictionary cached.
+
+   :column table_schema: Database name of the table.
+   :column table_name: Table name.
+   :column index_name: Index name.
+   :column fields: How many fields the index key has. (it is internal structure of |InnoDB|, it may be larger than the ``CREATE TABLE``).
+   :column rows_per_key: Estimate rows per 1 key value. ([1 column value], [2 columns value], [3 columns value], ...).
+   :column index_total_pages: Number of index pages.
+   :column index_leaf_pages: Number of leaf pages.
+
+In releases before 5.5.8-20.0, these fields had different names:
+
+  * ``rows_per_key`` was ``row_per_keys``
+
+  * ``index_total_pages`` was ``index_size``
+
+  * ``index_leaf_pages`` was ``leaf_pages``
+
+Example
+=======
+
+``[innodb_stats_method = nulls_equal (default behavior of InnoDB)]`` ::
+
+  mysql> explain SELECT COUNT(*), 0 FROM orgs2 orgs LEFT JOIN sa_opportunities2 sa_opportunities ON orgs.org_id=sa_opportunities.org_id LEFT JOIN contacts2 contacts ON orgs.org_id=contacts.org_id;
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
+  | id | select_type | table            | type  | possible_keys   | key             | key_len | ref               | rows  | Extra       |
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
+  |  1 | SIMPLE      | orgs             | index | NULL            | orgs$org_id     | 4       | NULL              |   128 | Using index |
+  |  1 | SIMPLE      | sa_opportunities | ref   | sa_opp$org_id   | sa_opp$org_id   | 5       | test2.orgs.org_id |  5751 | Using index |
+  |  1 | SIMPLE      | contacts         | ref   | contacts$org_id | contacts$org_id | 5       | test2.orgs.org_id | 23756 | Using index |
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+-------+-------------+
+  3 rows in set (0.00 sec)
+
+``[innodb_stats_method = nulls_unequal or nulls_ignored]`` ::
+
+  mysql> explain SELECT COUNT(*), 0 FROM orgs2 orgs LEFT JOIN sa_opportunities2 sa_opportunities ON orgs.org_id=sa_opportunities.org_id LEFT JOIN contacts2 contacts ON orgs.org_id=contacts.org_id;
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
+  | id | select_type | table            | type  | possible_keys   | key             | key_len | ref               | rows | Extra       |
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
+  |  1 | SIMPLE      | orgs             | index | NULL            | orgs$org_id     | 4       | NULL              |  128 | Using index |
+  |  1 | SIMPLE      | sa_opportunities | ref   | sa_opp$org_id   | sa_opp$org_id   | 5       | test2.orgs.org_id |    1 | Using index |
+  |  1 | SIMPLE      | contacts         | ref   | contacts$org_id | contacts$org_id | 5       | test2.orgs.org_id |    1 | Using index |
+  +----+-------------+------------------+-------+-----------------+-----------------+---------+-------------------+------+-------------+
+  3 rows in set (0.00 sec)
+  <example of information_schema>
+
+  mysql> select * from information_schema.innodb_table_stats;
+  +------------------------+-------+------------+------------+----------+
+  | table_name             | rows  | clust_size | other_size | modified |
+  +------------------------+-------+------------+------------+----------+
+  | test/sa_opportunities2 | 11175 |         21 |         11 |        0 |
+  | test/orgs2             |   128 |          1 |          0 |        0 |
+  | test/contacts2         | 47021 |         97 |         97 |        0 |
+  +------------------------+-------+------------+------------+----------+
+  3 rows in set (0.00 sec)
+
+  mysql> select * from information_schema.innodb_index_stats;
+  +------------------------+-----------------+--------+--------------+------------+------------+
+  | table_name             | index_name      | fields | row_per_keys | index_size | leaf_pages |
+  +------------------------+-----------------+--------+--------------+------------+------------+
+  | test/sa_opportunities2 | GEN_CLUST_INDEX |      1 | 1            |         21 |         20 |
+  | test/sa_opportunities2 | sa_opp$org_id   |      2 | 338, 1       |          11|         10 |
+  | test/orgs2             | orgs$org_id     |      1 | 1            |          1 |          1 |
+  | test/contacts2         | GEN_CLUST_INDEX |      1 | 1            |       97   |         80 |
+  | test/contacts2         | contacts$org_id |      2 | 516, 0       |       97   |         37 |
+  +------------------------+-----------------+--------+--------------+------------+------------+
+  5 rows in set (0.00 sec)
+
+Other reading
+=============
+
+  * `InnoDB Table/Index stats <http://www.mysqlperformanceblog.com/2010/03/20/InnoDB-tableindex-stats/>`_
+
 
=== removed file 'doc/source/flexibility/innodb_fast_shutdown.rst'
--- doc/source/flexibility/innodb_fast_shutdown.rst	2013-05-28 06:50:44 +0000
+++ doc/source/flexibility/innodb_fast_shutdown.rst	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-.. _innodb_fast_shutdown:
-
-===============
- Fast Shutdown
-===============
-
-Some |InnoDB| / |XtraDB| threads which perform various background activities are in the sleep state most of the time. They only wake up every few seconds to perform their tasks. They also check whether the server is in the shutdown phase, and if not, they go to the sleep state again. That means there could be a noticeable delay (up to 10 seconds) after a shutdown command and before all |InnoDB| / |XtraDB| threads actually notice this and terminate. This is not a big problem for most production servers, because a shutdown of a heavily loaded server normally takes much longer than 10 seconds.
-
-The problem, however, had a significant impact on running the regression test suite, because it performs a lot of server restarts during its execution and also because there is not so much to do when shutting a test server. So it makes even less sense to wait up to 10 seconds.
-
-This change modifies that behavior to make the sleep waiting interruptible, so that when the server is told to shutdown, threads no longer wait until the end of their sleep interval. This results in a measurably faster test suite execution (~40% in some cases).
-
-The change was contributed by Kristian Nielsen.
-
-Version Specific Information
-============================
-
-  * :rn:`5.5.8-20.0`
-    Full functionality available.
-
-Other Information
-=================
-
-  * Author / Origin:
-    Kristian Nielsen
-
-  * Bugs fixed:
-    :bug:`643463`
-
-Other reading
-=============
-
-  * `How to decrease InnoDB shutdown times <http://www.mysqlperformanceblog.com/2009/04/15/how-to-decrease-innodb-shutdown-times/>`_
-
-  * `How long InnoDB shutdown may take <http://www.mysqlperformanceblog.com/2010/09/02/how-long-innodb-shutdown-may-take/>`_
-
 
=== removed file 'doc/source/management/innodb_expand_import.rst'
--- doc/source/management/innodb_expand_import.rst	2013-05-28 06:50:44 +0000
+++ doc/source/management/innodb_expand_import.rst	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-.. _innodb_expand_import_page:
-
-===================
-Expand Table Import
-===================
-
-Unlike MyISAM, |InnoDB| does not allow users to copy datafiles for a single table between servers. If exported with XtraBackup, a table can now be imported on another server running |XtraDB|.
-
-This feature implements the abililty to import arbitrary .ibd files exported using the XtraBackup ``--export`` option. The :variable:`innodb_expand_import` variable makes to convert ``.ibd`` file during import process.
-
-The normal version can import only the backed-up .ibd file at the same place.
-
-.. note::
-
-  This feature is unsupported with InnoDB data files created with MySQL 5.0 and MySQL 5.1 prior to version 5.1.7 due to InnoDB file format limitation. It may work in some cases, but may result in crashes on import as well, see bug :bug:`1000221` and bug :bug:`727704` for examples and details.  
-
-|Percona Server| :rn:`5.5.28-29.2` extended the ``innochecksum``  with an option :option:`-f` to read the file format information from a given |InnoDB| data file. As only the first page needs to be read to detect the format/version information, it can also be used on a running server. Example of the output should look like this: :: 
-
-  $ innochecksum -f ibdata1 
-  Detected file format: Antelope (5.1.7 or newer).
-
-Example
-=======
-
-Assuming that:
-
-  * :variable:`innodb_expand_import` is set to ``1``.
-
-  * the files (``.ibd`` and ``.exp``) are prepared by the ``xtrabackup --prepare --export`` command.
-
-First create “exactly same” structured tables to the target database.
-
-Then discard the tables as preparation of import, for example, ::
-
-  mysql> set FOREIGN_KEY_CHECKS=0;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql> alter table customer discard tablespace;
-  Query OK, 0 rows affected (0.01 sec)
-
-  mysql> alter table district discard tablespace;
-  Query OK, 0 rows affected (0.01 sec)
-
-  mysql> alter table history discard tablespace;
-  Query OK, 0 rows affected (0.00 sec)
-
-  ...
-  put the .ibd and .exp files at the same place to .frm file.
-  import the tables
-  (command example)
-  mysql> set FOREIGN_KEY_CHECKS=0;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql> set global innodb_expand_import=1;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql> alter table customer import tablespace;
-  Query OK, 0 rows affected (0.17 sec)
-
-  mysql> alter table district import tablespace;
-  Query OK, 0 rows affected (0.00 sec)
-
-  mysql> alter table history import tablespace;
-  Query OK, 0 rows affected (0.04 sec)
-
-  ...
-  (.err file example)
-  InnoDB: import: extended import of tpcc2/customer is started.
-  InnoDB: import: 2 indexes are detected.
-  InnoDB: Progress in %: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 done.
-  InnoDB: import: extended import of tpcc2/district is started.
-  InnoDB: import: 1 indexes are detected.
-  InnoDB: Progress in %: 16 33 50 66 83 100 done.
-  InnoDB: import: extended import of tpcc2/history is started.
-  InnoDB: import: 3 indexes are detected.
-  InnoDB: Progress in %: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 done.
-  ...
-
-Version Specific Information
-============================
-
-  * 5.5.10-20.1:
-    Renamed variable :variable:`innodb_expand_import` to :variable:`innodb_import_table_from_xtrabackup`.
-
-System Variables
-================
-
-.. variable:: innodb_expand_import
-
-     :version 5.5.10-20.1: Renamed.
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: ULONG
-     :default: 0
-     :range: 0-1
-
-If set to 1, ``.ibd`` file is converted (``space id``, ``index id``, etc.) with index information in ``.exp`` file during the import process (``ALTER TABLE ... IMPORT TABLESPACE`` command).
-
- This variable was renamed to :variable:`innodb_import_table_from_xtrabackup`, beginning in release 5.5.10-20.1. It still exists as :variable:`innodb_expand_import` in versions prior to that.
-
-
-.. variable:: innodb_import_table_from_xtrabackup
-
-     :version 5.5.10-20.1: Introduced.
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: ULONG
-     :default: 0
-     :range: 0-1
-
-If set to 1, ``.ibd`` file is converted (``space id``, ``index id``, etc.) with index information in .exp file during the import process (``ALTER TABLE ... IMPORT TABLESPACE`` command).
-
- This variable was added in release 5.5.10-20.1. Prior to that, it was named :variable:`innodb_expand_import`, which still exists in earlier versions.
-
-
-.. Other Information
-
-
-.. TODO
-
-.. Make |XtraDB| to be enable to export .exp file by itself.
-
-.. Suggestion 2 (expand "alter table ... discard tablespace")
-.. New variable “innodb_export_at_discard = [0|1]”. When 1, |XtraDB| close the tablespace cleanly (no data in insertbuffer or to purge) and output .exp file at the same place to the .ibd file instead of deleting .ibd file only (default behavior), when “ALTER TABLE … DISCARD TABLESPACE”.
-
-.. I think The default value should be 1 for safety, because 0 deletes the table data… LOCK TABLE also may be needed before the operation (error when doesn``t have LOCK?).
-
-.. (example: move database named ``example``)
-
-.. Source: (innodb_export_at_discard should be 1)
-
-.. lock all tables in the database ``example``
-.. "ALTER TABLE ... DISCARD TABLESPACE" for all tables in ``exmple``
-.. unlock all tables in the database ``example``
-..  (and we need to get all create table clause (e.g. "mysqldump --no-data"))
-.. obtain *.ibd *.exp as exported files
-.. Target: (innodb_expand_import should be 1)
-
-.. create all tables in ``example``
-.. "ALTER TABLE ... DISCARD TABLESPACE" for all tables in ``exmple``
-.. overwrite *.ibd and put *.exp from the Target
-.. "ALTER TABLE ... IMPORT TABLESPACE" for all tables in ``exmple``
-.. I think making the shell to do the above operations automatically is much easier than implement the new SQLs to do them…
-
-.. Suggestion 1 (at shutdown [too simple... **rejected**...])
-.. New variable “innodb_export_exp_at_shutdown = [0|1]”. When 1, |XtraDB| outputs .exp files for all |InnoDB| tables at clean shutdown. (works file_per_table mode inly)
-
-.. XtraDB must treat also .exp files along with .ibd files. (e.g. delete files when delete table)
-
-
-Other reading
-=============
-
-  * `Moving InnoDB tables between servers <http://www.mysqlperformanceblog.com/2009/06/08/impossible-possible-moving-innodb-tables-between-servers/>`_
-
-  * `Copying InnoDB tables between servers <http://www.mysqlperformanceblog.com/2009/07/31/copying-innodb-tables-between-servers/>`_
 
=== removed file 'doc/source/percona-xtradb.png'
 Binary files doc/source/percona-xtradb.png	2013-05-28 06:50:44 +0000 and doc/source/percona-xtradb.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'python-for-subunit2junitxml'
=== added file 'python-for-subunit2junitxml/BytesIO.py'
--- python-for-subunit2junitxml/BytesIO.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/BytesIO.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,136 @@
+
+# http://wiki.python.org/moin/BytesIO
+#
+# A skeleton one used for systems that don't have BytesIO.
+#
+# It's enough for subunit at least....
+
+class BytesIO(object):
+    """ A file-like API for reading and writing bytes objects.
+
+    Mostly like StringIO, but write() calls modify the underlying
+    bytes object.
+
+    >>> b = bytes()
+    >>> f = BytesIO(b, 'w')
+    >>> f.write(bytes.fromhex('ca fe ba be'))
+    >>> f.write(bytes.fromhex('57 41 56 45'))
+    >>> b
+    bytes([202, 254, 186, 190, 87, 65, 86, 69])
+    """
+
+    def __init__(self, buf, mode='r'):
+        """ Create a new BytesIO for reading or writing the given buffer.
+
+        buf - Back-end buffer for this BytesIO.  A bytes object.
+            Actually, anything that supports len(), slice-assignment,
+            and += will work.
+        mode - One of 'r', 'w', 'a'.
+            An optional 'b' is also allowed, but it doesn't do anything.
+        """
+        # XXX many 'mode' possibilities aren't allowed yet: 'rw+Ut'
+        if len(mode) == 2 and mode[-1] == 'b':
+            mode = mode[:-1]  # binary mode goes without saying
+        if mode not in ('r', 'w', 'a'):
+            raise ValueError("mode must be 'r', 'w', or 'a'")
+
+        self._buf = buf
+        self.mode = mode
+        self.closed = False
+        if self.mode == 'w':
+            del buf[:]
+            self._point = 0
+        elif self.mode == 'r':
+            self._point = 0
+        else: # 'a'
+            self._point = len(buf)
+
+    def close(self):
+        self.closed = True
+
+    def _check_closed(self):
+        if self.closed:
+            raise ValueError("file is closed")
+
+    def flush(self):
+        self._check_closed()
+
+    def next(self):
+        line = self.readline()
+        if len(line) == 0:
+            raise StopIteration
+        return line
+
+    def read(self, size=None):
+        self._check_closed()
+        if size is None:
+            e = len(self._buf)
+        else:
+            e = min(self._point + size, len(self._buf))
+        r = self._buf[self._point:e]
+        self._point = e
+        return r
+
+    def readline(self, size=None):
+        self._check_closed()
+        die  # XXX TODO - assume ascii and read a line
+
+    def readlines(self, sizehint=None):
+        # XXX TODO handle sizehint
+        return list(self)
+
+    def seek(self, offset, whence=0):
+        self._check_closed()
+
+        if whence == 0:
+            self._point = offset
+        elif whence == 1:
+            self._point += offset
+        elif whence == 2:
+            self._point = len(self._buf) + offset
+        else:
+            raise ValueError("whence must be 0, 1, or 2")
+
+        if self._point < 0:
+            self._point = 0  # XXX is this right?
+
+    def tell(self):
+        self._check_closed()
+        return self._point
+
+    def truncate(self, size=None):
+        self._check_closed()
+        if size is None:
+            size = self.tell()
+        del self._buf[size:]
+
+    def write(self, data):
+        self._check_closed()
+        amt = len(data)
+        size = len(self._buf)
+        if self.mode == 'a':
+            self._point = size
+
+        if self._point > size:
+            if isinstance(b, bytes):
+                blank = bytes([0])
+            else:
+                # Don't know what default value to insert, unfortunately
+                raise ValueError("can't write past the end of this object")
+            self._buf += blank * (self._point - size) + data
+            self._point = len(self._buf)
+        else:
+            p = self._point
+            self._buf[p:p + amt] = data
+            self._point = min(p + amt, len(self._buf))
+
+    def writelines(self, seq):
+        for line in seq:
+            self.write(line)
+
+    def __iter__(self):
+        return self
+
+    @property
+    def name(self):
+        return repr(self)
 
=== added directory 'python-for-subunit2junitxml/iso8601'
=== added file 'python-for-subunit2junitxml/iso8601/LICENSE'
--- python-for-subunit2junitxml/iso8601/LICENSE	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/iso8601/LICENSE	2013-05-28 06:50:46 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2007 Michael Twomey
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
=== added file 'python-for-subunit2junitxml/iso8601/README'
--- python-for-subunit2junitxml/iso8601/README	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/iso8601/README	2013-05-28 06:50:46 +0000
@@ -0,0 +1,26 @@
+A simple package to deal with ISO 8601 date time formats.
+
+ISO 8601 defines a neutral, unambiguous date string format, which also
+has the property of sorting naturally.
+
+e.g. YYYY-MM-DDTHH:MM:SSZ or 2007-01-25T12:00:00Z
+
+Currently this covers only the most common date formats encountered, not
+all of ISO 8601 is handled.
+
+Currently the following formats are handled:
+
+* 2006-01-01T00:00:00Z
+* 2006-01-01T00:00:00[+-]00:00
+
+I'll add more as I encounter them in my day to day life. Patches with 
+new formats and tests will be gratefully accepted of course :)
+
+References:
+
+* http://www.cl.cam.ac.uk/~mgk25/iso-time.html - simple overview
+
+* http://hydracen.com/dx/iso8601.htm - more detailed enumeration of
+  valid formats.
+
+See the LICENSE file for the license this package is released under.
 
=== added file 'python-for-subunit2junitxml/iso8601/README.subunit'
--- python-for-subunit2junitxml/iso8601/README.subunit	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/iso8601/README.subunit	2013-05-28 06:50:46 +0000
@@ -0,0 +1,5 @@
+This is a [slightly rearranged] import of http://pypi.python.org/pypi/iso8601/
+version 0.1.4. The OS X hidden files have been stripped, and the package
+turned into a single module, to simplify installation. The remainder of the
+source distribution is included in the subunit source tree at python/iso8601
+for reference.
 
=== added file 'python-for-subunit2junitxml/iso8601/setup.py'
--- python-for-subunit2junitxml/iso8601/setup.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/iso8601/setup.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,58 @@
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils import setup
+
+long_description="""Simple module to parse ISO 8601 dates
+
+This module parses the most common forms of ISO 8601 date strings (e.g.
[phone]T20:34:22+00:00) into datetime objects.
+
+>>> import iso8601
+>>> iso8601.parse_date("2007-01-25T12:00:00Z")
+datetime.datetime(2007, 1, 25, 12, 0, tzinfo=<iso8601.iso8601.Utc ...>)
+>>>
+
+Changes
+=======
+
+0.1.4
+-----
+
+* The default_timezone argument wasn't being passed through correctly,
+  UTC was being used in every case. Fixes issue 10.
+
+0.1.3
+-----
+
+* Fixed the microsecond handling, the generated microsecond values were 
+  way too small. Fixes issue 9.
+
+0.1.2
+-----
+
+* Adding ParseError to __all__ in iso8601 module, allows people to import it.
+  Addresses issue 7.
+* Be a little more flexible when dealing with dates without leading zeroes.
+  This violates the spec a little, but handles more dates as seen in the 
+  field. Addresses issue 6.
+* Allow date/time separators other than T.
+
+0.1.1
+-----
+
+* When parsing dates without a timezone the specified default is used. If no
+  default is specified then UTC is used. Addresses issue 4.
+"""
+
+setup(
+    name="iso8601",
+    version="0.1.4",
+    description=long_description.split("\n")[0],
+    long_description=long_description,
+    author="Michael Twomey",
+    author_email="[e-mail]",
+    url="http://code.google.com/p/pyiso8601/",
+    packages=["iso8601"],
+    license="MIT",
+)
 
=== added file 'python-for-subunit2junitxml/iso8601/test_iso8601.py'
--- python-for-subunit2junitxml/iso8601/test_iso8601.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/iso8601/test_iso8601.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,111 @@
+import iso8601
+
+def test_iso8601_regex():
+    assert iso8601.ISO8601_REGEX.match("2006-10-11T00:14:33Z")
+
+def test_timezone_regex():
+    assert iso8601.TIMEZONE_REGEX.match("+01:00")
+    assert iso8601.TIMEZONE_REGEX.match("+00:00")
+    assert iso8601.TIMEZONE_REGEX.match("+01:20")
+    assert iso8601.TIMEZONE_REGEX.match("-01:00")
+
+def test_parse_date():
+    d = iso8601.parse_date("2006-10-20T15:34:56Z")
+    assert d.year == 2006
+    assert d.month == 10
+    assert d.day == 20
+    assert d.hour == 15
+    assert d.minute == 34
+    assert d.second == 56
+    assert d.tzinfo == iso8601.UTC
+
+def test_parse_date_fraction():
+    d = iso8601.parse_date("2006-10-20T15:34:56.123Z")
+    assert d.year == 2006
+    assert d.month == 10
+    assert d.day == 20
+    assert d.hour == 15
+    assert d.minute == 34
+    assert d.second == 56
+    assert d.microsecond == 123000
+    assert d.tzinfo == iso8601.UTC
+
+def test_parse_date_fraction_2():
+    """From bug 6
+    
+    """
+    d = iso8601.parse_date("2007-5-7T11:43:55.328Z'")
+    assert d.year == 2007
+    assert d.month == 5
+    assert d.day == 7
+    assert d.hour == 11
+    assert d.minute == 43
+    assert d.second == 55
+    assert d.microsecond == 328000
+    assert d.tzinfo == iso8601.UTC
+
+def test_parse_date_tz():
+    d = iso8601.parse_date("2006-10-20T15:34:56.123+02:30")
+    assert d.year == 2006
+    assert d.month == 10
+    assert d.day == 20
+    assert d.hour == 15
+    assert d.minute == 34
+    assert d.second == 56
+    assert d.microsecond == 123000
+    assert d.tzinfo.tzname(None) == "+02:30"
+    offset = d.tzinfo.utcoffset(None)
+    assert offset.days == 0
+    assert offset.seconds == 60 * 60 * 2.5
+
+def test_parse_invalid_date():
+    try:
+        iso8601.parse_date(None)
+    except iso8601.ParseError:
+        pass
+    else:
+        assert 1 == 2
+
+def test_parse_invalid_date2():
+    try:
+        iso8601.parse_date("23")
+    except iso8601.ParseError:
+        pass
+    else:
+        assert 1 == 2
+
+def test_parse_no_timezone():
+    """issue 4 - Handle datetime string without timezone
+    
+    This tests what happens when you parse a date with no timezone. While not
+    strictly correct this is quite common. I'll assume UTC for the time zone
+    in this case.
+    """
+    d = iso8601.parse_date("2007-01-01T08:00:00")
+    assert d.year == 2007
+    assert d.month == 1
+    assert d.day == 1
+    assert d.hour == 8
+    assert d.minute == 0
+    assert d.second == 0
+    assert d.microsecond == 0
+    assert d.tzinfo == iso8601.UTC
+
+def test_parse_no_timezone_different_default():
+    tz = iso8601.FixedOffset(2, 0, "test offset")
+    d = iso8601.parse_date("2007-01-01T08:00:00", default_timezone=tz)
+    assert d.tzinfo == tz
+
+def test_space_separator():
+    """Handle a separator other than T
+    
+    """
+    d = iso8601.parse_date("2007-06-23 06:40:34.00Z")
+    assert d.year == 2007
+    assert d.month == 6
+    assert d.day == 23
+    assert d.hour == 6
+    assert d.minute == 40
+    assert d.second == 34
+    assert d.microsecond == 0
+    assert d.tzinfo == iso8601.UTC
 
=== added directory 'python-for-subunit2junitxml/junitxml'
=== added file 'python-for-subunit2junitxml/junitxml/__init__.py'
--- python-for-subunit2junitxml/junitxml/__init__.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/junitxml/__init__.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,221 @@
+#
+#  junitxml: extensions to Python unittest to get output junitxml
+#  Copyright (C) 2009 Robert Collins <[e-mail]>
+#
+#  Copying permitted under the LGPL-3 licence, included with this library.
+
+"""unittest compatible JUnit XML output."""
+
+
+import datetime
+import re
+import time
+import unittest
+
+# same format as sys.version_info: "A tuple containing the five components of
+# the version number: major, minor, micro, releaselevel, and serial. All
+# values except releaselevel are integers; the release level is 'alpha',
+# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
+# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
+# releaselevel of 'dev' for unreleased under-development code.
+#
+# If the releaselevel is 'alpha' then the major/minor/micro components are not
+# established at this point, and setup.py will use a version of next-$(revno).
+# If the releaselevel is 'final', then the tarball will be major.minor.micro.
+# Otherwise it is major.minor.micro~$(revno).
+__version__ = (0, 7, 0, 'alpha', 0)
+
+
+def test_suite():
+    import junitxml.tests
+    return junitxml.tests.test_suite()
+
+
+class LocalTimezone(datetime.tzinfo):
+
+    def __init__(self):
+        self._offset = None
+
+    # It seems that the minimal possible implementation is to just return all
+    # None for every function, but then it breaks...
+    def utcoffset(self, dt):
+        if self._offset is None:
+            t = 1260423030 # arbitrary, but doesn't handle dst very well
+            dt = datetime.datetime
+            self._offset = (dt.fromtimestamp(t) - dt.utcfromtimestamp(t))
+        return self._offset
+
+    def dst(self, dt):
+        return datetime.timedelta(0)
+
+    def tzname(self, dt):
+        return None
+
+
+def _error_name(eclass):
+    module = eclass.__module__
+    if module not in ("__main__", "builtins", "exceptions"):
+        return ".".join([module, eclass.__name__])
+    return eclass.__name__
+
+
+_non_cdata = "[\0-\b\x0B-\x1F\uD800-\uDFFF\uFFFE\uFFFF]+"
+if "\\u" in _non_cdata:
+    _non_cdata = _non_cdata.decode("unicode-escape")
+    def _strip_invalid_chars(s, _sub=re.compile(_non_cdata, re.UNICODE).sub):
+        if not isinstance(s, unicode):
+            try:
+                s = s.decode("utf-8")
+            except UnicodeDecodeError:
+                s = s.decode("ascii", "replace")
+        return _sub("", s).encode("utf-8")
+else:
+    def _strip_invalid_chars(s, _sub=re.compile(_non_cdata, re.UNICODE).sub):
+        return _sub("", s)
+def _escape_content(s):
+    return (_strip_invalid_chars(s)
+        .replace("&", "&amp;")
+        .replace("<", "&lt;")
+        .replace("]]>", "]]&gt;"))
+def _escape_attr(s):
+    return (_strip_invalid_chars(s)
+        .replace("&", "&amp;")
+        .replace("<", "&lt;")
+        .replace("]]>", "]]&gt;")
+        .replace('"', "&quot;")
+        .replace("\t", "&#x9;")
+        .replace("\n", "&#xA;"))
+
+
+class JUnitXmlResult(unittest.TestResult):
+    """A TestResult which outputs JUnit compatible XML."""
+    
+    def __init__(self, stream):
+        """Create a JUnitXmlResult.
+
+        :param stream: A stream to write results to. Note that due to the
+            nature of JUnit XML output, nnothing will be written to the stream
+            until stopTestRun() is called.
+        """
+        self.__super = super(JUnitXmlResult, self)
+        self.__super.__init__()
+        # GZ 2010-09-03: We have a problem if passed a text stream in Python 3
+        #                as really we want to write raw UTF-8 to ensure that
+        #                the encoding is not mangled later
+        self._stream = stream
+        self._results = []
+        self._set_time = None
+        self._test_start = None
+        self._run_start = None
+        self._tz_info = None
+
+    def startTestRun(self):
+        """Start a test run."""
+        self._run_start = self._now()
+
+    def _get_tzinfo(self):
+        if self._tz_info is None:
+            self._tz_info = LocalTimezone()
+        return self._tz_info
+
+    def _now(self):
+        if self._set_time is not None:
+            return self._set_time
+        else:
+            return datetime.datetime.now(self._get_tzinfo())
+
+    def time(self, a_datetime):
+        self._set_time = a_datetime
+        if (self._run_start is not None and
+            self._run_start > a_datetime):
+            self._run_start = a_datetime
+
+    def startTest(self, test):
+        self.__super.startTest(test)
+        self._test_start = self._now()
+
+    def _duration(self, from_datetime):
+        try:
+            delta = self._now() - from_datetime
+        except TypeError:
+            n = self._now()
+            delta = datetime.timedelta(-1)
+        seconds = delta.days * 3600*24 + delta.seconds
+        return seconds + 0.000001 * delta.microseconds
+
+    def _test_case_string(self, test):
+        duration = self._duration(self._test_start)
+        test_id = test.id()
+        # Split on the last dot not inside a parameter
+        class_end = test_id.rfind(".", 0, test_id.find("("))
+        if class_end == -1:
+            classname, name = "", test_id
+        else:
+            classname, name = test_id[:class_end], test_id[class_end+1:]
+        self._results.append('<testcase classname="%s" name="%s" '
+            'time="%0.3f"' % (_escape_attr(classname), _escape_attr(name), duration))
+
+    def stopTestRun(self):
+        """Stop a test run.
+
+        This allows JUnitXmlResult to output the XML representation of the test
+        run.
+        """
+        duration = self._duration(self._run_start)
+        self._stream.write('<testsuite errors="%d" failures="%d" name="" '
+            'tests="%d" time="%0.3f">\n' % (len(self.errors),
+            len(self.failures) + len(getattr(self, "unexpectedSuccesses", ())),
+            self.testsRun, duration))
+        self._stream.write(''.join(self._results))
+        self._stream.write('</testsuite>\n')
+
+    def addError(self, test, error):
+        self.__super.addError(test, error)
+        self._test_case_string(test)
+        self._results.append('>\n')
+        self._results.append('<error type="%s">%s</error>\n</testcase>\n' % (
+            _escape_attr(_error_name(error[0])),
+            _escape_content(self._exc_info_to_string(error, test))))
+
+    def addFailure(self, test, error):
+        self.__super.addFailure(test, error)
+        self._test_case_string(test)
+        self._results.append('>\n')
+        self._results.append('<failure type="%s">%s</failure>\n</testcase>\n' %
+            (_escape_attr(_error_name(error[0])),
+            _escape_content(self._exc_info_to_string(error, test))))
+
+    def addSuccess(self, test):
+        self.__super.addSuccess(test)
+        self._test_case_string(test)
+        self._results.append('/>\n')
+
+    def addSkip(self, test, reason):
+        try:
+            self.__super.addSkip(test, reason)
+        except AttributeError:
+            # Python < 2.7|3.1
+            pass
+        self._test_case_string(test)
+        self._results.append('>\n')
+        self._results.append('<skip>%s</skip>\n</testcase>\n'% _escape_attr(reason))
+
+    def addUnexpectedSuccess(self, test):
+        try:
+            self.__super.addUnexpectedSuccess(test)
+        except AttributeError:
+            # Python < 2.7|3.1
+            pass
+        self._test_case_string(test)
+        self._results.append('>\n')
+        self._results.append('<failure type="unittest.case._UnexpectedSuccess"/>\n</testcase>\n')
+
+    def addExpectedFailure(self, test, error):
+        try:
+            self.__super.addExpectedFailure(test, error)
+        except AttributeError:
+            # Python < 2.7|3.1
+            pass
+        self._test_case_string(test)
+        self._results.append('/>\n')
+
 
=== added directory 'python-for-subunit2junitxml/junitxml/tests'
=== added file 'python-for-subunit2junitxml/junitxml/tests/__init__.py'
--- python-for-subunit2junitxml/junitxml/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/junitxml/tests/__init__.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,16 @@
+#
+#  junitxml: extensions to Python unittest to get output junitxml
+#  Copyright (C) 2009 Robert Collins <[e-mail]>
+#
+#  Copying permitted under the LGPL-3 licence, included with this library.
+
+import unittest
+
+from junitxml.tests import (
+    test_junitxml,
+    )
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromNames([
+        'junitxml.tests.test_junitxml',
+        ])
 
=== added file 'python-for-subunit2junitxml/junitxml/tests/test_junitxml.py'
--- python-for-subunit2junitxml/junitxml/tests/test_junitxml.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/junitxml/tests/test_junitxml.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,327 @@
+#
+#  junitxml: extensions to Python unittest to get output junitxml
+#  Copyright (C) 2009 Robert Collins <[e-mail]>
+#
+#  Copying permitted under the LGPL-3 licence, included with this library.
+
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+import datetime
+import re
+import sys
+import unittest
+import xml.dom.minidom
+
+import junitxml
+
+class TestImports(unittest.TestCase):
+
+    def test_result(self):
+        from junitxml import JUnitXmlResult
+
+
+class TestJUnitXmlResult__init__(unittest.TestCase):
+
+    def test_with_stream(self):
+        result = junitxml.JUnitXmlResult(StringIO())
+
+
+class TestJUnitXmlResult(unittest.TestCase):
+
+    def setUp(self):
+        self.output = StringIO()
+        self.result = junitxml.JUnitXmlResult(self.output)
+
+    def get_output(self):
+        output = self.output.getvalue()
+        # Collapse detailed regions into specific strings we can match on
+        return re.sub(r'(?s)<failure (.*?)>.*?</failure>',
+            r'<failure \1>failure</failure>', re.sub(
+            r'(?s)<error (.*?)>.*?</error>', r'<error \1>error</error>',
+            re.sub(r'time="\d+\.\d+"', 'time="0.000"', output)))
+
+    def run_test_or_simulate(self, test, method_name, manual_method,
+        *manual_args):
+        if getattr(test, method_name, None):
+            test.run(self.result)
+        else:
+            # older python - manually execute
+            self.result.startTest(test)
+            manual_method(test, *manual_args)
+            self.result.stopTest(test)
+
+    def test_run_duration_handles_datestamping_in_the_past(self):
+        # When used via subunit2junitxml, startTestRun is called before
+        # any tz info in the test stream has been seen.
+        # So, we use the earliest reported timestamp as the start time,
+        # replacing _test_start if needed.
+        self.result.startTestRun() # the time is now.
+        # Lose an hour (peeks inside, a little naughty but not very).
+        self.result.time(self.result._run_start - datetime.timedelta(0, 3600))
+        self.result.stopTestRun()
+        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="0" time="0.000">
+</testsuite>
+""", self.get_output())
+
+    def test_startTestRun_no_output(self):
+        # startTestRun doesn't output anything, because JUnit wants an up-front
+        # summary.
+        self.result.startTestRun()
+        self.assertEqual('', self.get_output())
+
+    def test_stopTestRun_outputs(self):
+        # When stopTestRun is called, everything is output.
+        self.result.startTestRun()
+        self.result.stopTestRun()
+        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="0" time="0.000">
+</testsuite>
+""", self.get_output())
+
+    def test_test_count(self):
+        class Passes(unittest.TestCase):
+            def test_me(self):
+                pass
+        self.result.startTestRun()
+        Passes("test_me").run(self.result)
+        Passes("test_me").run(self.result)
+        self.result.stopTestRun()
+        # When tests are run, the number of tests is counted.
+        output = self.get_output()
+        self.assertTrue('tests="2"' in output)
+
+    def test_test_id_with_parameter(self):
+        class Passes(unittest.TestCase):
+            def id(self):
+                return unittest.TestCase.id(self) + '(version_1.6)'
+            def test_me(self):
+                pass
+        self.result.startTestRun()
+        Passes("test_me").run(self.result)
+        self.result.stopTestRun()
+        output = self.get_output()
+        self.assertTrue('Passes" name="test_me(version_1.6)"' in output)
+
+    def test_erroring_test(self):
+        class Errors(unittest.TestCase):
+            def test_me(self):
+                1/0
+        self.result.startTestRun()
+        Errors("test_me").run(self.result)
+        self.result.stopTestRun()
+        self.assertEqual("""<testsuite errors="1" failures="0" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Errors" name="test_me" time="0.000">
+<error type="ZeroDivisionError">error</error>
+</testcase>
+</testsuite>
+""", self.get_output())
+
+    def test_failing_test(self):
+        class Fails(unittest.TestCase):
+            def test_me(self):
+                self.fail()
+        self.result.startTestRun()
+        Fails("test_me").run(self.result)
+        self.result.stopTestRun()
+        self.assertEqual("""<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Fails" name="test_me" time="0.000">
+<failure type="AssertionError">failure</failure>
+</testcase>
+</testsuite>
+""", self.get_output())
+
+    def test_successful_test(self):
+        class Passes(unittest.TestCase):
+            def test_me(self):
+                pass
+        self.result.startTestRun()
+        Passes("test_me").run(self.result)
+        self.result.stopTestRun()
+        self.assertEqual("""<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Passes" name="test_me" time="0.000"/>
+</testsuite>
+""", self.get_output())
+
+    def test_skip_test(self):
+        class Skips(unittest.TestCase):
+            def test_me(self):
+                self.skipTest("yo")
+        self.result.startTestRun()
+        test = Skips("test_me")
+        self.run_test_or_simulate(test, 'skipTest', self.result.addSkip, 'yo')
+        self.result.stopTestRun()
+        output = self.get_output()
+        expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Skips" name="test_me" time="0.000">
+<skip>yo</skip>
+</testcase>
+</testsuite>
+"""
+        self.assertEqual(expected, output)
+
+    def test_unexpected_success_test(self):
+        class Succeeds(unittest.TestCase):
+            def test_me(self):
+                pass
+            try:
+                test_me = unittest.expectedFailure(test_me)
+            except AttributeError:
+                pass # Older python - just let the test pass
+        self.result.startTestRun()
+        Succeeds("test_me").run(self.result)
+        self.result.stopTestRun()
+        output = self.get_output()
+        expected = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000">
+<failure type="unittest.case._UnexpectedSuccess"/>
+</testcase>
+</testsuite>
+"""
+        expected_old = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.Succeeds" name="test_me" time="0.000"/>
+</testsuite>
+"""
+        if output != expected_old:
+            self.assertEqual(expected, output)
+
+    def test_expected_failure_test(self):
+        expected_failure_support = [True]
+        class ExpectedFail(unittest.TestCase):
+            def test_me(self):
+                self.fail("fail")
+            try:
+                test_me = unittest.expectedFailure(test_me)
+            except AttributeError:
+                # Older python - just let the test fail
+                expected_failure_support[0] = False
+        self.result.startTestRun()
+        ExpectedFail("test_me").run(self.result)
+        self.result.stopTestRun()
+        output = self.get_output()
+        expected = """<testsuite errors="0" failures="0" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000"/>
+</testsuite>
+"""
+        expected_old = """<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
+<testcase classname="junitxml.tests.test_junitxml.ExpectedFail" name="test_me" time="0.000">
+<failure type="AssertionError">failure</failure>
+</testcase>
+</testsuite>
+"""
+        if expected_failure_support[0]:
+            self.assertEqual(expected, output)
+        else:
+            self.assertEqual(expected_old, output)
+
+
+class TestWellFormedXml(unittest.TestCase):
+    """XML created should always be well formed even with odd test cases"""
+
+    def _run_and_parse_test(self, case):
+        output = StringIO()
+        result = junitxml.JUnitXmlResult(output)
+        result.startTestRun()
+        case.run(result)
+        result.stopTestRun()
+        return xml.dom.minidom.parseString(output.getvalue())
+
+    def test_failure_with_amp(self):
+        """Check the failure element content is escaped"""
+        class FailWithAmp(unittest.TestCase):
+            def runTest(self):
+                self.fail("& should be escaped as &amp;")
+        doc = self._run_and_parse_test(FailWithAmp())
+        self.assertTrue(
+            doc.getElementsByTagName("failure")[0].firstChild.nodeValue
+                .endswith("AssertionError: & should be escaped as &amp;\n"))
+
+    def test_quotes_in_test_case_id(self):
+        """Check that quotes in an attribute are escaped"""
+        class QuoteId(unittest.TestCase):
+            def id(self):
+                return unittest.TestCase.id(self) + '("quotes")'
+            def runTest(self):
+                pass
+        doc = self._run_and_parse_test(QuoteId())
+        self.assertEqual('runTest("quotes")',
+            doc.getElementsByTagName("testcase")[0].getAttribute("name"))
+
+    def test_skip_reason(self):
+        """Check the skip element content is escaped"""
+        class SkipWithLt(unittest.TestCase):
+            def runTest(self):
+                self.fail("version < 2.7")
+            try:
+                runTest = unittest.skip("2.7 <= version")(runTest)
+            except AttributeError:
+                self.has_skip = False
+            else:
+                self.has_skip = True
+        doc = self._run_and_parse_test(SkipWithLt())
+        if self.has_skip:
+            self.assertEqual('2.7 <= version',
+                doc.getElementsByTagName("skip")[0].firstChild.nodeValue)
+        else:
+            self.assertTrue(
+                doc.getElementsByTagName("failure")[0].firstChild.nodeValue
+                    .endswith("AssertionError: version < 2.7\n"))
+
+    def test_error_with_control_characters(self):
+        """Check C0 control characters are stripped rather than output"""
+        class ErrorWithC0(unittest.TestCase):
+            def runTest(self):
+                raise ValueError("\x1F\x0E\x0C\x0B\x08\x01\x00lost control")
+        doc = self._run_and_parse_test(ErrorWithC0())
+        self.assertTrue(
+            doc.getElementsByTagName("error")[0].firstChild.nodeValue
+                .endswith("ValueError: lost control\n"))
+
+    def test_error_with_invalid_cdata(self):
+        """Check unicode outside the valid cdata range is stripped"""
+        if len("\uffff") == 1:
+            # Basic str type supports unicode
+            exception = ValueError("\ufffe\uffffEOF")
+        else:
+            class UTF8_Error(Exception):
+                def __unicode__(self):
+                    return str(self).decode("UTF-8")
+            exception = UTF8_Error("\xef\xbf\xbe\xef\xbf\xbfEOF")
+        class ErrorWithBadUnicode(unittest.TestCase):
+            def runTest(self):
+                raise exception
+        doc = self._run_and_parse_test(ErrorWithBadUnicode())
+        self.assertTrue(
+            doc.getElementsByTagName("error")[0].firstChild.nodeValue
+                .endswith("Error: EOF\n"))
+
+    def test_error_with_surrogates(self):
+        """Check unicode surrogates are handled properly, paired or otherwise
+
+        This is a pain due to suboptimal unicode support in Python and the
+        various changes in Python 3. On UCS-2 builds there is no easy way of
+        getting rid of unpaired surrogates while leaving valid pairs alone, so
+        this test doesn't require astral characters are kept there.
+        """
+        if len("\uffff") == 1:
+            exception = ValueError("paired: \U000201a2"
+                " unpaired: "+chr(0xD800)+"-"+chr(0xDFFF))
+            astral_char = "\U000201a2"
+        else:
+            class UTF8_Error(Exception):
+                def __unicode__(self):
+                    return str(self).decode("UTF-8")
+            exception = UTF8_Error("paired: \xf0\xa0\x86\xa2"
+                " unpaired: \xed\xa0\x80-\xed\xbf\xbf")
+            astral_char = "\U000201a2".decode("unicode-escape")
+        class ErrorWithSurrogates(unittest.TestCase):
+            def runTest(self):
+                raise exception
+        doc = self._run_and_parse_test(ErrorWithSurrogates())
+        traceback = doc.getElementsByTagName("error")[0].firstChild.nodeValue
+        if sys.maxunicode == 0xFFFF:
+            pass # would be nice to handle astral characters properly even so
+        else:
+            self.assertTrue(astral_char in traceback)
+        self.assertTrue(traceback.endswith(" unpaired: -\n"))
 
=== added directory 'python-for-subunit2junitxml/subunit'
=== added file 'python-for-subunit2junitxml/subunit/__init__.py'
--- python-for-subunit2junitxml/subunit/__init__.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/subunit/__init__.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,1250 @@
+#
+#  subunit: extensions to Python unittest to get test results from subprocesses.
+#  Copyright (C) 2005  Robert Collins <[e-mail]>
+#
+#  Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+#  license at the users choice. A copy of both licenses are available in the
+#  project source as Apache-2.0 and BSD. You may not use this file except in
+#  compliance with one of these two licences.
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+#  license you chose for the specific language governing permissions and
+#  limitations under that license.
+#
+
+"""Subunit - a streaming test protocol
+
+Overview
+++++++++
+
+The ``subunit`` Python package provides a number of ``unittest`` extensions
+which can be used to cause tests to output Subunit, to parse Subunit streams
+into test activity, perform seamless test isolation within a regular test
+case and variously sort, filter and report on test runs.
+
+
+Key Classes
+-----------
+
+The ``subunit.TestProtocolClient`` class is a ``unittest.TestResult``
+extension which will translate a test run into a Subunit stream.
+
+The ``subunit.ProtocolTestCase`` class is an adapter between the Subunit wire
+protocol and the ``unittest.TestCase`` object protocol. It is used to translate
+a stream into a test run, which regular ``unittest.TestResult`` objects can
+process and report/inspect.
+
+Subunit has support for non-blocking usage too, for use with asyncore or
+Twisted. See the ``TestProtocolServer`` parser class for more details.
+
+Subunit includes extensions to the Python ``TestResult`` protocol. These are
+all done in a compatible manner: ``TestResult`` objects that do not implement
+the extension methods will not cause errors to be raised, instead the extension
+will either lose fidelity (for instance, folding expected failures to success
+in Python versions < 2.7 or 3.1), or discard the extended data (for extra
+details, tags, timestamping and progress markers).
+
+The test outcome methods ``addSuccess``, ``addError``, ``addExpectedFailure``,
+``addFailure``, ``addSkip`` take an optional keyword parameter ``details``
+which can be used instead of the usual python unittest parameter.
+When used the value of details should be a dict from ``string`` to
+``testtools.content.Content`` objects. This is a draft API being worked on with
+the Python Testing In Python mail list, with the goal of permitting a common
+way to provide additional data beyond a traceback, such as captured data from
+disk, logging messages etc. The reference for this API is in testtools (0.9.0
+and newer).
+
+The ``tags(new_tags, gone_tags)`` method is called (if present) to add or
+remove tags in the test run that is currently executing. If called when no
+test is in progress (that is, if called outside of the ``startTest``,
+``stopTest`` pair), the the tags apply to all sebsequent tests. If called
+when a test is in progress, then the tags only apply to that test.
+
+The ``time(a_datetime)`` method is called (if present) when a ``time:``
+directive is encountered in a Subunit stream. This is used to tell a TestResult
+about the time that events in the stream occured at, to allow reconstructing
+test timing from a stream.
+
+The ``progress(offset, whence)`` method controls progress data for a stream.
+The offset parameter is an int, and whence is one of subunit.PROGRESS_CUR,
+subunit.PROGRESS_SET, PROGRESS_PUSH, PROGRESS_POP. Push and pop operations
+ignore the offset parameter.
+
+
+Python test support
+-------------------
+
+``subunit.run`` is a convenience wrapper to run a Python test suite via
+the command line, reporting via Subunit::
+
+  $ python -m subunit.run mylib.tests.test_suite
+
+The ``IsolatedTestSuite`` class is a TestSuite that forks before running its
+tests, allowing isolation between the test runner and some tests.
+
+Similarly, ``IsolatedTestCase`` is a base class which can be subclassed to get
+tests that will fork() before that individual test is run.
+
+`ExecTestCase`` is a convenience wrapper for running an external
+program to get a Subunit stream and then report that back to an arbitrary
+result object::
+
+ class AggregateTests(subunit.ExecTestCase):
+
+     def test_script_one(self):
+         './bin/script_one'
+
+     def test_script_two(self):
+         './bin/script_two'
+
+ # Normally your normal test loading would take of this automatically,
+ # It is only spelt out in detail here for clarity.
+ suite = unittest.TestSuite([AggregateTests("test_script_one"),
+     AggregateTests("test_script_two")])
+ # Create any TestResult class you like.
+ result = unittest._TextTestResult(sys.stdout)
+ # And run your suite as normal, Subunit will exec each external script as
+ # needed and report to your result object.
+ suite.run(result)
+
+Utility modules
+---------------
+
+* subunit.chunked contains HTTP chunked encoding/decoding logic.
+* subunit.test_results contains TestResult helper classes.
+"""
+
+import os
+import re
+import subprocess
+import sys
+import unittest
+
+from testtools import content, content_type, ExtendedToOriginalDecorator
+from testtools.compat import _b, _u, BytesIO, StringIO
+try:
+    from testtools.testresult.real import _StringException
+    RemoteException = _StringException
+    # For testing: different pythons have different str() implementations.
+    if sys.version_info > (3, 0):
+        _remote_exception_str = "testtools.testresult.real._StringException"
+        _remote_exception_str_chunked = "34\r\n" + _remote_exception_str
+    else:
+        _remote_exception_str = "_StringException" 
+        _remote_exception_str_chunked = "1A\r\n" + _remote_exception_str
+except ImportError:
+    raise ImportError ("testtools.testresult.real does not contain "
+        "_StringException, check your version.")
+from testtools import testresult
+
+from subunit import chunked, details, iso8601, test_results
+
+
+PROGRESS_SET = 0
+PROGRESS_CUR = 1
+PROGRESS_PUSH = 2
+PROGRESS_POP = 3
+
+
+def test_suite():
+    import subunit.tests
+    return subunit.tests.test_suite()
+
+
+def join_dir(base_path, path):
+    """
+    Returns an absolute path to C{path}, calculated relative to the parent
+    of C{base_path}.
+
+    @param base_path: A path to a file or directory.
+    @param path: An absolute path, or a path relative to the containing
+    directory of C{base_path}.
+
+    @return: An absolute path to C{path}.
+    """
+    return os.path.join(os.path.dirname(os.path.abspath(base_path)), path)
+
+
+def tags_to_new_gone(tags):
+    """Split a list of tags into a new_set and a gone_set."""
+    new_tags = set()
+    gone_tags = set()
+    for tag in tags:
+        if tag[0] == '-':
+            gone_tags.add(tag[1:])
+        else:
+            new_tags.add(tag)
+    return new_tags, gone_tags
+
+
+class DiscardStream(object):
+    """A filelike object which discards what is written to it."""
+
+    def write(self, bytes):
+        pass
+
+
+class _ParserState(object):
+    """State for the subunit parser."""
+
+    def __init__(self, parser):
+        self.parser = parser
+        self._test_sym = (_b('test'), _b('testing'))
+        self._colon_sym = _b(':')
+        self._error_sym = (_b('error'),)
+        self._failure_sym = (_b('failure'),)
+        self._progress_sym = (_b('progress'),)
+        self._skip_sym = _b('skip')
+        self._success_sym = (_b('success'), _b('successful'))
+        self._tags_sym = (_b('tags'),)
+        self._time_sym = (_b('time'),)
+        self._xfail_sym = (_b('xfail'),)
+        self._uxsuccess_sym = (_b('uxsuccess'),)
+        self._start_simple = _u(" [")
+        self._start_multipart = _u(" [ multipart")
+
+    def addError(self, offset, line):
+        """An 'error:' directive has been read."""
+        self.parser.stdOutLineReceived(line)
+
+    def addExpectedFail(self, offset, line):
+        """An 'xfail:' directive has been read."""
+        self.parser.stdOutLineReceived(line)
+
+    def addFailure(self, offset, line):
+        """A 'failure:' directive has been read."""
+        self.parser.stdOutLineReceived(line)
+
+    def addSkip(self, offset, line):
+        """A 'skip:' directive has been read."""
+        self.parser.stdOutLineReceived(line)
+
+    def addSuccess(self, offset, line):
+        """A 'success:' directive has been read."""
+        self.parser.stdOutLineReceived(line)
+
+    def lineReceived(self, line):
+        """a line has been received."""
+        parts = line.split(None, 1)
+        if len(parts) == 2 and line.startswith(parts[0]):
+            cmd, rest = parts
+            offset = len(cmd) + 1
+            cmd = cmd.rstrip(self._colon_sym)
+            if cmd in self._test_sym:
+                self.startTest(offset, line)
+            elif cmd in self._error_sym:
+                self.addError(offset, line)
+            elif cmd in self._failure_sym:
+                self.addFailure(offset, line)
+            elif cmd in self._progress_sym:
+                self.parser._handleProgress(offset, line)
+            elif cmd in self._skip_sym:
+                self.addSkip(offset, line)
+            elif cmd in self._success_sym:
+                self.addSuccess(offset, line)
+            elif cmd in self._tags_sym:
+                self.parser._handleTags(offset, line)
+                self.parser.subunitLineReceived(line)
+            elif cmd in self._time_sym:
+                self.parser._handleTime(offset, line)
+                self.parser.subunitLineReceived(line)
+            elif cmd in self._xfail_sym:
+                self.addExpectedFail(offset, line)
+            elif cmd in self._uxsuccess_sym:
+                self.addUnexpectedSuccess(offset, line)
+            else:
+                self.parser.stdOutLineReceived(line)
+        else:
+            self.parser.stdOutLineReceived(line)
+
+    def lostConnection(self):
+        """Connection lost."""
+        self.parser._lostConnectionInTest(_u('unknown state of '))
+
+    def startTest(self, offset, line):
+        """A test start command received."""
+        self.parser.stdOutLineReceived(line)
+
+
+class _InTest(_ParserState):
+    """State for the subunit parser after reading a test: directive."""
+
+    def _outcome(self, offset, line, no_details, details_state):
+        """An outcome directive has been read.
+
+        :param no_details: Callable to call when no details are presented.
+        :param details_state: The state to switch to for details
+            processing of this outcome.
+        """
+        test_name = line[offset:-1].decode('utf8')
+        if self.parser.current_test_description == test_name:
+            self.parser._state = self.parser._outside_test
+            self.parser.current_test_description = None
+            no_details()
+            self.parser.client.stopTest(self.parser._current_test)
+            self.parser._current_test = None
+            self.parser.subunitLineReceived(line)
+        elif self.parser.current_test_description + self._start_simple == \
+            test_name:
+            self.parser._state = details_state
+            details_state.set_simple()
+            self.parser.subunitLineReceived(line)
+        elif self.parser.current_test_description + self._start_multipart == \
+            test_name:
+            self.parser._state = details_state
+            details_state.set_multipart()
+            self.parser.subunitLineReceived(line)
+        else:
+            self.parser.stdOutLineReceived(line)
+
+    def _error(self):
+        self.parser.client.addError(self.parser._current_test,
+            details={})
+
+    def addError(self, offset, line):
+        """An 'error:' directive has been read."""
+        self._outcome(offset, line, self._error,
+            self.parser._reading_error_details)
+
+    def _xfail(self):
+        self.parser.client.addExpectedFailure(self.parser._current_test,
+            details={})
+
+    def addExpectedFail(self, offset, line):
+        """An 'xfail:' directive has been read."""
+        self._outcome(offset, line, self._xfail,
+            self.parser._reading_xfail_details)
+
+    def _uxsuccess(self):
+        self.parser.client.addUnexpectedSuccess(self.parser._current_test)
+
+    def addUnexpectedSuccess(self, offset, line):
+        """A 'uxsuccess:' directive has been read."""
+        self._outcome(offset, line, self._uxsuccess,
+            self.parser._reading_uxsuccess_details)
+
+    def _failure(self):
+        self.parser.client.addFailure(self.parser._current_test, details={})
+
+    def addFailure(self, offset, line):
+        """A 'failure:' directive has been read."""
+        self._outcome(offset, line, self._failure,
+            self.parser._reading_failure_details)
+
+    def _skip(self):
+        self.parser.client.addSkip(self.parser._current_test, details={})
+
+    def addSkip(self, offset, line):
+        """A 'skip:' directive has been read."""
+        self._outcome(offset, line, self._skip,
+            self.parser._reading_skip_details)
+
+    def _succeed(self):
+        self.parser.client.addSuccess(self.parser._current_test, details={})
+
+    def addSuccess(self, offset, line):
+        """A 'success:' directive has been read."""
+        self._outcome(offset, line, self._succeed,
+            self.parser._reading_success_details)
+
+    def lostConnection(self):
+        """Connection lost."""
+        self.parser._lostConnectionInTest(_u(''))
+
+
+class _OutSideTest(_ParserState):
+    """State for the subunit parser outside of a test context."""
+
+    def lostConnection(self):
+        """Connection lost."""
+
+    def startTest(self, offset, line):
+        """A test start command received."""
+        self.parser._state = self.parser._in_test
+        test_name = line[offset:-1].decode('utf8')
+        self.parser._current_test = RemotedTestCase(test_name)
+        self.parser.current_test_description = test_name
+        self.parser.client.startTest(self.parser._current_test)
+        self.parser.subunitLineReceived(line)
+
+
+class _ReadingDetails(_ParserState):
+    """Common logic for readin state details."""
+
+    def endDetails(self):
+        """The end of a details section has been reached."""
+        self.parser._state = self.parser._outside_test
+        self.parser.current_test_description = None
+        self._report_outcome()
+        self.parser.client.stopTest(self.parser._current_test)
+
+    def lineReceived(self, line):
+        """a line has been received."""
+        self.details_parser.lineReceived(line)
+        self.parser.subunitLineReceived(line)
+
+    def lostConnection(self):
+        """Connection lost."""
+        self.parser._lostConnectionInTest(_u('%s report of ') %
+            self._outcome_label())
+
+    def _outcome_label(self):
+        """The label to describe this outcome."""
+        raise NotImplementedError(self._outcome_label)
+
+    def set_simple(self):
+        """Start a simple details parser."""
+        self.details_parser = details.SimpleDetailsParser(self)
+
+    def set_multipart(self):
+        """Start a multipart details parser."""
+        self.details_parser = details.MultipartDetailsParser(self)
+
+
+class _ReadingFailureDetails(_ReadingDetails):
+    """State for the subunit parser when reading failure details."""
+
+    def _report_outcome(self):
+        self.parser.client.addFailure(self.parser._current_test,
+            details=self.details_parser.get_details())
+
+    def _outcome_label(self):
+        return "failure"
+
+
+class _ReadingErrorDetails(_ReadingDetails):
+    """State for the subunit parser when reading error details."""
+
+    def _report_outcome(self):
+        self.parser.client.addError(self.parser._current_test,
+            details=self.details_parser.get_details())
+
+    def _outcome_label(self):
+        return "error"
+
+
+class _ReadingExpectedFailureDetails(_ReadingDetails):
+    """State for the subunit parser when reading xfail details."""
+
+    def _report_outcome(self):
+        self.parser.client.addExpectedFailure(self.parser._current_test,
+            details=self.details_parser.get_details())
+
+    def _outcome_label(self):
+        return "xfail"
+
+
+class _ReadingUnexpectedSuccessDetails(_ReadingDetails):
+    """State for the subunit parser when reading uxsuccess details."""
+
+    def _report_outcome(self):
+        self.parser.client.addUnexpectedSuccess(self.parser._current_test,
+            details=self.details_parser.get_details())
+
+    def _outcome_label(self):
+        return "uxsuccess"
+
+
+class _ReadingSkipDetails(_ReadingDetails):
+    """State for the subunit parser when reading skip details."""
+
+    def _report_outcome(self):
+        self.parser.client.addSkip(self.parser._current_test,
+            details=self.details_parser.get_details("skip"))
+
+    def _outcome_label(self):
+        return "skip"
+
+
+class _ReadingSuccessDetails(_ReadingDetails):
+    """State for the subunit parser when reading success details."""
+
+    def _report_outcome(self):
+        self.parser.client.addSuccess(self.parser._current_test,
+            details=self.details_parser.get_details("success"))
+
+    def _outcome_label(self):
+        return "success"
+
+
+class TestProtocolServer(object):
+    """A parser for subunit.
+
+    :ivar tags: The current tags associated with the protocol stream.
+    """
+
+    def __init__(self, client, stream=None, forward_stream=None):
+        """Create a TestProtocolServer instance.
+
+        :param client: An object meeting the unittest.TestResult protocol.
+        :param stream: The stream that lines received which are not part of the
+            subunit protocol should be written to. This allows custom handling
+            of mixed protocols. By default, sys.stdout will be used for
+            convenience. It should accept bytes to its write() method.
+        :param forward_stream: A stream to forward subunit lines to. This
+            allows a filter to forward the entire stream while still parsing
+            and acting on it. By default forward_stream is set to
+            DiscardStream() and no forwarding happens.
+        """
+        self.client = ExtendedToOriginalDecorator(client)
+        if stream is None:
+            stream = sys.stdout
+            if sys.version_info > (3, 0):
+                stream = stream.buffer
+        self._stream = stream
+        self._forward_stream = forward_stream or DiscardStream()
+        # state objects we can switch too
+        self._in_test = _InTest(self)
+        self._outside_test = _OutSideTest(self)
+        self._reading_error_details = _ReadingErrorDetails(self)
+        self._reading_failure_details = _ReadingFailureDetails(self)
+        self._reading_skip_details = _ReadingSkipDetails(self)
+        self._reading_success_details = _ReadingSuccessDetails(self)
+        self._reading_xfail_details = _ReadingExpectedFailureDetails(self)
+        self._reading_uxsuccess_details = _ReadingUnexpectedSuccessDetails(self)
+        # start with outside test.
+        self._state = self._outside_test
+        # Avoid casts on every call
+        self._plusminus = _b('+-')
+        self._push_sym = _b('push')
+        self._pop_sym = _b('pop')
+
+    def _handleProgress(self, offset, line):
+        """Process a progress directive."""
+        line = line[offset:].strip()
+        if line[0] in self._plusminus:
+            whence = PROGRESS_CUR
+            delta = int(line)
+        elif line == self._push_sym:
+            whence = PROGRESS_PUSH
+            delta = None
+        elif line == self._pop_sym:
+            whence = PROGRESS_POP
+            delta = None
+        else:
+            whence = PROGRESS_SET
+            delta = int(line)
+        self.client.progress(delta, whence)
+
+    def _handleTags(self, offset, line):
+        """Process a tags command."""
+        tags = line[offset:].decode('utf8').split()
+        new_tags, gone_tags = tags_to_new_gone(tags)
+        self.client.tags(new_tags, gone_tags)
+
+    def _handleTime(self, offset, line):
+        # Accept it, but do not do anything with it yet.
+        try:
+            event_time = iso8601.parse_date(line[offset:-1])
+        except TypeError:
+            raise TypeError(_u("Failed to parse %r, got %r")
+                % (line, sys.exec_info[1]))
+        self.client.time(event_time)
+
+    def lineReceived(self, line):
+        """Call the appropriate local method for the received line."""
+        self._state.lineReceived(line)
+
+    def _lostConnectionInTest(self, state_string):
+        error_string = _u("lost connection during %stest '%s'") % (
+            state_string, self.current_test_description)
+        self.client.addError(self._current_test, RemoteError(error_string))
+        self.client.stopTest(self._current_test)
+
+    def lostConnection(self):
+        """The input connection has finished."""
+        self._state.lostConnection()
+
+    def readFrom(self, pipe):
+        """Blocking convenience API to parse an entire stream.
+
+        :param pipe: A file-like object supporting readlines().
+        :return: None.
+        """
+        for line in pipe.readlines():
+            self.lineReceived(line)
+        self.lostConnection()
+
+    def _startTest(self, offset, line):
+        """Internal call to change state machine. Override startTest()."""
+        self._state.startTest(offset, line)
+
+    def subunitLineReceived(self, line):
+        self._forward_stream.write(line)
+
+    def stdOutLineReceived(self, line):
+        self._stream.write(line)
+
+
+class TestProtocolClient(testresult.TestResult):
+    """A TestResult which generates a subunit stream for a test run.
+
+    # Get a TestSuite or TestCase to run
+    suite = make_suite()
+    # Create a stream (any object with a 'write' method). This should accept
+    # bytes not strings: subunit is a byte orientated protocol.
+    stream = file('tests.log', 'wb')
+    # Create a subunit result object which will output to the stream
+    result = subunit.TestProtocolClient(stream)
+    # Optionally, to get timing data for performance analysis, wrap the
+    # serialiser with a timing decorator
+    result = subunit.test_results.AutoTimingTestResultDecorator(result)
+    # Run the test suite reporting to the subunit result object
+    suite.run(result)
+    # Close the stream.
+    stream.close()
+    """
+
+    def __init__(self, stream):
+        testresult.TestResult.__init__(self)
+        self._stream = stream
+        _make_stream_binary(stream)
+        self._progress_fmt = _b("progress: ")
+        self._bytes_eol = _b("\n")
+        self._progress_plus = _b("+")
+        self._progress_push = _b("push")
+        self._progress_pop = _b("pop")
+        self._empty_bytes = _b("")
+        self._start_simple = _b(" [\n")
+        self._end_simple = _b("]\n")
+
+    def addError(self, test, error=None, details=None):
+        """Report an error in test test.
+
+        Only one of error and details should be provided: conceptually there
+        are two separate methods:
+            addError(self, test, error)
+            addError(self, test, details)
+
+        :param error: Standard unittest positional argument form - an
+            exc_info tuple.
+        :param details: New Testing-in-python drafted API; a dict from string
+            to subunit.Content objects.
+        """
+        self._addOutcome("error", test, error=error, details=details)
+
+    def addExpectedFailure(self, test, error=None, details=None):
+        """Report an expected failure in test test.
+
+        Only one of error and details should be provided: conceptually there
+        are two separate methods:
+            addError(self, test, error)
+            addError(self, test, details)
+
+        :param error: Standard unittest positional argument form - an
+            exc_info tuple.
+        :param details: New Testing-in-python drafted API; a dict from string
+            to subunit.Content objects.
+        """
+        self._addOutcome("xfail", test, error=error, details=details)
+
+    def addFailure(self, test, error=None, details=None):
+        """Report a failure in test test.
+
+        Only one of error and details should be provided: conceptually there
+        are two separate methods:
+            addFailure(self, test, error)
+            addFailure(self, test, details)
+
+        :param error: Standard unittest positional argument form - an
+            exc_info tuple.
+        :param details: New Testing-in-python drafted API; a dict from string
+            to subunit.Content objects.
+        """
+        self._addOutcome("failure", test, error=error, details=details)
+
+    def _addOutcome(self, outcome, test, error=None, details=None,
+        error_permitted=True):
+        """Report a failure in test test.
+
+        Only one of error and details should be provided: conceptually there
+        are two separate methods:
+            addOutcome(self, test, error)
+            addOutcome(self, test, details)
+
+        :param outcome: A string describing the outcome - used as the
+            event name in the subunit stream.
+        :param error: Standard unittest positional argument form - an
+            exc_info tuple.
+        :param details: New Testing-in-python drafted API; a dict from string
+            to subunit.Content objects.
+        :param error_permitted: If True then one and only one of error or
+            details must be supplied. If False then error must not be supplied
+            and details is still optional.  """
+        self._stream.write(_b("%s: %s" % (outcome, test.id())))
+        if error_permitted:
+            if error is None and details is None:
+                raise ValueError
+        else:
+            if error is not None:
+                raise ValueError
+        if error is not None:
+            self._stream.write(self._start_simple)
+            # XXX: this needs to be made much stricter, along the lines of
+            # Martin[gz]'s work in testtools. Perhaps subunit can use that?
+            for line in self._exc_info_to_unicode(error, test).splitlines():
+                self._stream.write(("%s\n" % line).encode('utf8'))
+        elif details is not None:
+            self._write_details(details)
+        else:
+            self._stream.write(_b("\n"))
+        if details is not None or error is not None:
+            self._stream.write(self._end_simple)
+
+    def addSkip(self, test, reason=None, details=None):
+        """Report a skipped test."""
+        if reason is None:
+            self._addOutcome("skip", test, error=None, details=details)
+        else:
+            self._stream.write(_b("skip: %s [\n" % test.id()))
+            self._stream.write(_b("%s\n" % reason))
+            self._stream.write(self._end_simple)
+
+    def addSuccess(self, test, details=None):
+        """Report a success in a test."""
+        self._addOutcome("successful", test, details=details, error_permitted=False)
+
+    def addUnexpectedSuccess(self, test, details=None):
+        """Report an unexpected success in test test.
+
+        Details can optionally be provided: conceptually there
+        are two separate methods:
+            addError(self, test)
+            addError(self, test, details)
+
+        :param details: New Testing-in-python drafted API; a dict from string
+            to subunit.Content objects.
+        """
+        self._addOutcome("uxsuccess", test, details=details,
+            error_permitted=False)
+
+    def startTest(self, test):
+        """Mark a test as starting its test run."""
+        super(TestProtocolClient, self).startTest(test)
+        self._stream.write(_b("test: %s\n" % test.id()))
+        self._stream.flush()
+
+    def stopTest(self, test):
+        super(TestProtocolClient, self).stopTest(test)
+        self._stream.flush()
+
+    def progress(self, offset, whence):
+        """Provide indication about the progress/length of the test run.
+
+        :param offset: Information about the number of tests remaining. If
+            whence is PROGRESS_CUR, then offset increases/decreases the
+            remaining test count. If whence is PROGRESS_SET, then offset
+            specifies exactly the remaining test count.
+        :param whence: One of PROGRESS_CUR, PROGRESS_SET, PROGRESS_PUSH,
+            PROGRESS_POP.
+        """
+        if whence == PROGRESS_CUR and offset > -1:
+            prefix = self._progress_plus
+            offset = _b(str(offset))
+        elif whence == PROGRESS_PUSH:
+            prefix = self._empty_bytes
+            offset = self._progress_push
+        elif whence == PROGRESS_POP:
+            prefix = self._empty_bytes
+            offset = self._progress_pop
+        else:
+            prefix = self._empty_bytes
+            offset = _b(str(offset))
+        self._stream.write(self._progress_fmt + prefix + offset +
+            self._bytes_eol)
+
+    def time(self, a_datetime):
+        """Inform the client of the time.
+
+        ":param datetime: A datetime.datetime object.
+        """
+        time = a_datetime.astimezone(iso8601.Utc())
+        self._stream.write(_b("time: %04d-%02d-%02d %02d:%02d:%02d.%06dZ\n" % (
+            time.year, time.month, time.day, time.hour, time.minute,
+            time.second, time.microsecond)))
+
+    def _write_details(self, details):
+        """Output details to the stream.
+
+        :param details: An extended details dict for a test outcome.
+        """
+        self._stream.write(_b(" [ multipart\n"))
+        for name, content in sorted(details.items()):
+            self._stream.write(_b("Content-Type: %s/%s" %
+                (content.content_type.type, content.content_type.subtype)))
+            parameters = content.content_type.parameters
+            if parameters:
+                self._stream.write(_b(";"))
+                param_strs = []
+                for param, value in parameters.items():
+                    param_strs.append("%s=%s" % (param, value))
+                self._stream.write(_b(",".join(param_strs)))
+            self._stream.write(_b("\n%s\n" % name))
+            encoder = chunked.Encoder(self._stream)
+            list(map(encoder.write, content.iter_bytes()))
+            encoder.close()
+
+    def done(self):
+        """Obey the testtools result.done() interface."""
+
+
+def RemoteError(description=_u("")):
+    return (_StringException, _StringException(description), None)
+
+
+class RemotedTestCase(unittest.TestCase):
+    """A class to represent test cases run in child processes.
+
+    Instances of this class are used to provide the Python test API a TestCase
+    that can be printed to the screen, introspected for metadata and so on.
+    However, as they are a simply a memoisation of a test that was actually
+    run in the past by a separate process, they cannot perform any interactive
+    actions.
+    """
+
+    def __eq__ (self, other):
+        try:
+            return self.__description == other.__description
+        except AttributeError:
+            return False
+
+    def __init__(self, description):
+        """Create a psuedo test case with description description."""
+        self.__description = description
+
+    def error(self, label):
+        raise NotImplementedError("%s on RemotedTestCases is not permitted." %
+            label)
+
+    def setUp(self):
+        self.error("setUp")
+
+    def tearDown(self):
+        self.error("tearDown")
+
+    def shortDescription(self):
+        return self.__description
+
+    def id(self):
+        return "%s" % (self.__description,)
+
+    def __str__(self):
+        return "%s (%s)" % (self.__description, self._strclass())
+
+    def __repr__(self):
+        return "<%s description='%s'>" % \
+               (self._strclass(), self.__description)
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        result.startTest(self)
+        result.addError(self, RemoteError(_u("Cannot run RemotedTestCases.\n")))
+        result.stopTest(self)
+
+    def _strclass(self):
+        cls = self.__class__
+        return "%s.%s" % (cls.__module__, cls.__name__)
+
+
+class ExecTestCase(unittest.TestCase):
+    """A test case which runs external scripts for test fixtures."""
+
+    def __init__(self, methodName='runTest'):
+        """Create an instance of the class that will use the named test
+           method when executed. Raises a ValueError if the instance does
+           not have a method with the specified name.
+        """
+        unittest.TestCase.__init__(self, methodName)
+        testMethod = getattr(self, methodName)
+        self.script = join_dir(sys.modules[self.__class__.__module__].__file__,
+                               testMethod.__doc__)
+
+    def countTestCases(self):
+        return 1
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        self._run(result)
+
+    def debug(self):
+        """Run the test without collecting errors in a TestResult"""
+        self._run(testresult.TestResult())
+
+    def _run(self, result):
+        protocol = TestProtocolServer(result)
+        process = subprocess.Popen(self.script, shell=True,
+            stdout=subprocess.PIPE)
+        _make_stream_binary(process.stdout)
+        output = process.communicate()[0]
+        protocol.readFrom(BytesIO(output))
+
+
+class IsolatedTestCase(unittest.TestCase):
+    """A TestCase which executes in a forked process.
+
+    Each test gets its own process, which has a performance overhead but will
+    provide excellent isolation from global state (such as django configs,
+    zope utilities and so on).
+    """
+
+    def run(self, result=None):
+        if result is None: result = self.defaultTestResult()
+        run_isolated(unittest.TestCase, self, result)
+
+
+class IsolatedTestSuite(unittest.TestSuite):
+    """A TestSuite which runs its tests in a forked process.
+
+    This decorator that will fork() before running the tests and report the
+    results from the child process using a Subunit stream.  This is useful for
+    handling tests that mutate global state, or are testing C extensions that
+    could crash the VM.
+    """
+
+    def run(self, result=None):
+        if result is None: result = testresult.TestResult()
+        run_isolated(unittest.TestSuite, self, result)
+
+
+def run_isolated(klass, self, result):
+    """Run a test suite or case in a subprocess, using the run method on klass.
+    """
+    c2pread, c2pwrite = os.pipe()
+    # fixme - error -> result
+    # now fork
+    pid = os.fork()
+    if pid == 0:
+        # Child
+        # Close parent's pipe ends
+        os.close(c2pread)
+        # Dup fds for child
+        os.dup2(c2pwrite, 1)
+        # Close pipe fds.
+        os.close(c2pwrite)
+
+        # at this point, sys.stdin is redirected, now we want
+        # to filter it to escape ]'s.
+        ### XXX: test and write that bit.
+        stream = os.fdopen(1, 'wb')
+        result = TestProtocolClient(stream)
+        klass.run(self, result)
+        stream.flush()
+        sys.stderr.flush()
+        # exit HARD, exit NOW.
+        os._exit(0)
+    else:
+        # Parent
+        # Close child pipe ends
+        os.close(c2pwrite)
+        # hookup a protocol engine
+        protocol = TestProtocolServer(result)
+        fileobj = os.fdopen(c2pread, 'rb')
+        protocol.readFrom(fileobj)
+        os.waitpid(pid, 0)
+        # TODO return code evaluation.
+    return result
+
+
+def TAP2SubUnit(tap, subunit):
+    """Filter a TAP pipe into a subunit pipe.
+
+    :param tap: A tap pipe/stream/file object.
+    :param subunit: A pipe/stream/file object to write subunit results to.
+    :return: The exit code to exit with.
+    """
+    BEFORE_PLAN = 0
+    AFTER_PLAN = 1
+    SKIP_STREAM = 2
+    state = BEFORE_PLAN
+    plan_start = 1
+    plan_stop = 0
+    def _skipped_test(subunit, plan_start):
+        # Some tests were skipped.
+        subunit.write('test test %d\n' % plan_start)
+        subunit.write('error test %d [\n' % plan_start)
+        subunit.write('test missing from TAP output\n')
+        subunit.write(']\n')
+        return plan_start + 1
+    # Test data for the next test to emit
+    test_name = None
+    log = []
+    result = None
+    def _emit_test():
+        "write out a test"
+        if test_name is None:
+            return
+        subunit.write("test %s\n" % test_name)
+        if not log:
+            subunit.write("%s %s\n" % (result, test_name))
+        else:
+            subunit.write("%s %s [\n" % (result, test_name))
+        if log:
+            for line in log:
+                subunit.write("%s\n" % line)
+            subunit.write("]\n")
+        del log[:]
+    for line in tap:
+        if state == BEFORE_PLAN:
+            match = re.match("(\d+)\.\.(\d+)\s*(?:\#\s+(.*))?\n", line)
+            if match:
+                state = AFTER_PLAN
+                _, plan_stop, comment = match.groups()
+                plan_stop = int(plan_stop)
+                if plan_start > plan_stop and plan_stop == 0:
+                    # skipped file
+                    state = SKIP_STREAM
+                    subunit.write("test file skip\n")
+                    subunit.write("skip file skip [\n")
+                    subunit.write("%s\n" % comment)
+                    subunit.write("]\n")
+                continue
+        # not a plan line, or have seen one before
+        match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP|skip|todo)(?:\s+(.*))?)?\n", line)
+        if match:
+            # new test, emit current one.
+            _emit_test()
+            status, number, description, directive, directive_comment = match.groups()
+            if status == 'ok':
+                result = 'success'
+            else:
+                result = "failure"
+            if description is None:
+                description = ''
+            else:
+                description = ' ' + description
+            if directive is not None:
+                if directive.upper() == 'TODO':
+                    result = 'xfail'
+                elif directive.upper() == 'SKIP':
+                    result = 'skip'
+                if directive_comment is not None:
+                    log.append(directive_comment)
+            if number is not None:
+                number = int(number)
+                while plan_start < number:
+                    plan_start = _skipped_test(subunit, plan_start)
+            test_name = "test %d%s" % (plan_start, description)
+            plan_start += 1
+            continue
+        match = re.match("Bail out\!(?:\s*(.*))?\n", line)
+        if match:
+            reason, = match.groups()
+            if reason is None:
+                extra = ''
+            else:
+                extra = ' %s' % reason
+            _emit_test()
+            test_name = "Bail out!%s" % extra
+            result = "error"
+            state = SKIP_STREAM
+            continue
+        match = re.match("\#.*\n", line)
+        if match:
+            log.append(line[:-1])
+            continue
+        subunit.write(line)
+    _emit_test()
+    while plan_start <= plan_stop:
+        # record missed tests
+        plan_start = _skipped_test(subunit, plan_start)
+    return 0
+
+
+def tag_stream(original, filtered, tags):
+    """Alter tags on a stream.
+
+    :param original: The input stream.
+    :param filtered: The output stream.
+    :param tags: The tags to apply. As in a normal stream - a list of 'TAG' or
+        '-TAG' commands.
+
+        A 'TAG' command will add the tag to the output stream,
+        and override any existing '-TAG' command in that stream.
+        Specifically:
+         * A global 'tags: TAG' will be added to the start of the stream.
+         * Any tags commands with -TAG will have the -TAG removed.
+
+        A '-TAG' command will remove the TAG command from the stream.
+        Specifically:
+         * A 'tags: -TAG' command will be added to the start of the stream.
+         * Any 'tags: TAG' command will have 'TAG' removed from it.
+        Additionally, any redundant tagging commands (adding a tag globally
+        present, or removing a tag globally removed) are stripped as a
+        by-product of the filtering.
+    :return: 0
+    """
+    new_tags, gone_tags = tags_to_new_gone(tags)
+    def write_tags(new_tags, gone_tags):
+        if new_tags or gone_tags:
+            filtered.write("tags: " + ' '.join(new_tags))
+            if gone_tags:
+                for tag in gone_tags:
+                    filtered.write("-" + tag)
+            filtered.write("\n")
+    write_tags(new_tags, gone_tags)
+    # TODO: use the protocol parser and thus don't mangle test comments.
+    for line in original:
+        if line.startswith("tags:"):
+            line_tags = line[5:].split()
+            line_new, line_gone = tags_to_new_gone(line_tags)
+            line_new = line_new - gone_tags
+            line_gone = line_gone - new_tags
+            write_tags(line_new, line_gone)
+        else:
+            filtered.write(line)
+    return 0
+
+
+class ProtocolTestCase(object):
+    """Subunit wire protocol to unittest.TestCase adapter.
+
+    ProtocolTestCase honours the core of ``unittest.TestCase`` protocol -
+    calling a ProtocolTestCase or invoking the run() method will make a 'test
+    run' happen. The 'test run' will simply be a replay of the test activity
+    that has been encoded into the stream. The ``unittest.TestCase`` ``debug``
+    and ``countTestCases`` methods are not supported because there isn't a
+    sensible mapping for those methods.
+
+    # Get a stream (any object with a readline() method), in this case the
+    # stream output by the example from ``subunit.TestProtocolClient``.
+    stream = file('tests.log', 'rb')
+    # Create a parser which will read from the stream and emit
+    # activity to a unittest.TestResult when run() is called.
+    suite = subunit.ProtocolTestCase(stream)
+    # Create a result object to accept the contents of that stream.
+    result = unittest._TextTestResult(sys.stdout)
+    # 'run' the tests - process the stream and feed its contents to result.
+    suite.run(result)
+    stream.close()
+
+    :seealso: TestProtocolServer (the subunit wire protocol parser).
+    """
+
+    def __init__(self, stream, passthrough=None, forward=False):
+        """Create a ProtocolTestCase reading from stream.
+
+        :param stream: A filelike object which a subunit stream can be read
+            from.
+        :param passthrough: A stream pass non subunit input on to. If not
+            supplied, the TestProtocolServer default is used.
+        :param forward: A stream to pass subunit input on to. If not supplied
+            subunit input is not forwarded.
+        """
+        self._stream = stream
+        _make_stream_binary(stream)
+        self._passthrough = passthrough
+        self._forward = forward
+
+    def __call__(self, result=None):
+        return self.run(result)
+
+    def run(self, result=None):
+        if result is None:
+            result = self.defaultTestResult()
+        protocol = TestProtocolServer(result, self._passthrough, self._forward)
+        line = self._stream.readline()
+        while line:
+            protocol.lineReceived(line)
+            line = self._stream.readline()
+        protocol.lostConnection()
+
+
+class TestResultStats(testresult.TestResult):
+    """A pyunit TestResult interface implementation for making statistics.
+
+    :ivar total_tests: The total tests seen.
+    :ivar passed_tests: The tests that passed.
+    :ivar failed_tests: The tests that failed.
+    :ivar seen_tags: The tags seen across all tests.
+    """
+
+    def __init__(self, stream):
+        """Create a TestResultStats which outputs to stream."""
+        testresult.TestResult.__init__(self)
+        self._stream = stream
+        self.failed_tests = 0
+        self.skipped_tests = 0
+        self.seen_tags = set()
+
+    @property
+    def total_tests(self):
+        return self.testsRun
+
+    def addError(self, test, err, details=None):
+        self.failed_tests += 1
+
+    def addFailure(self, test, err, details=None):
+        self.failed_tests += 1
+
+    def addSkip(self, test, reason, details=None):
+        self.skipped_tests += 1
+
+    def formatStats(self):
+        self._stream.write("Total tests:   %5d\n" % self.total_tests)
+        self._stream.write("Passed tests:  %5d\n" % self.passed_tests)
+        self._stream.write("Failed tests:  %5d\n" % self.failed_tests)
+        self._stream.write("Skipped tests: %5d\n" % self.skipped_tests)
+        tags = sorted(self.seen_tags)
+        self._stream.write("Seen tags: %s\n" % (", ".join(tags)))
+
+    @property
+    def passed_tests(self):
+        return self.total_tests - self.failed_tests - self.skipped_tests
+
+    def tags(self, new_tags, gone_tags):
+        """Accumulate the seen tags."""
+        self.seen_tags.update(new_tags)
+
+    def wasSuccessful(self):
+        """Tells whether or not this result was a success"""
+        return self.failed_tests == 0
+
+
+def get_default_formatter():
+    """Obtain the default formatter to write to.
+
+    :return: A file-like object.
+    """
+    formatter = os.getenv("SUBUNIT_FORMATTER")
+    if formatter:
+        return os.popen(formatter, "w")
+    else:
+        stream = sys.stdout
+        if sys.version_info > (3, 0):
+            stream = stream.buffer
+        return stream
+
+
+if sys.version_info > (3, 0):
+    from io import UnsupportedOperation as _NoFilenoError
+else:
+    _NoFilenoError = AttributeError
+
+def read_test_list(path):
+    """Read a list of test ids from a file on disk.
+
+    :param path: Path to the file
+    :return: Sequence of test ids
+    """
+    f = open(path, 'rb')
+    try:
+        return [l.rstrip("\n") for l in f.readlines()]
+    finally:
+        f.close()
+
+
+def _make_stream_binary(stream):
+    """Ensure that a stream will be binary safe. See _make_binary_on_windows."""
+    try:
+        fileno = stream.fileno()
+    except _NoFilenoError:
+        return
+    _make_binary_on_windows(fileno)
+
+def _make_binary_on_windows(fileno):
+    """Win32 mangles \r\n to \n and that breaks streams. See bug lp:505078."""
+    if sys.platform == "win32":
+        import msvcrt
+        msvcrt.setmode(fileno, os.O_BINARY)
 
=== added file 'python-for-subunit2junitxml/subunit/chunked.py'
--- python-for-subunit2junitxml/subunit/chunked.py	1970-01-01 00:00:00 +0000
+++ python-for-subunit2junitxml/subunit/chunked.py	2013-05-28 06:50:46 +0000
@@ -0,0 +1,185 @@
+#
+#  subunit: extensions to python unittest to get test results from subprocesses.
+#  Copyright (C) 2005  Robert Collins <[e-mail]>
+#  Copyright (C) 2011  Martin Pool <[e-mail]>
+#
+#  Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+#  license at the users choice. A copy of both licenses are available in the
+#  project source as Apache-2.0 and BSD. You may not use this file except in
+#  compliance with one of these two licences.
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+#  license you chose for the specific language governing permissions and
+#  limitations under that license.
+#
+
+"""Encoder/decoder for http style chunked encoding."""
+
+from testtools.compat import _b
+
+empty = _b('')
+
+class Decoder(object):
+    """Decode chunked content to a byte stream."""
+
+    def __init__(self, output, strict=True):
+        """Create a decoder decoding to output.
+
+        :param output: A file-like object. Bytes written to the Decoder are
+            decoded to strip off the chunking and written to the output.
+            Up to a full write worth of data or a single control line may be
+            buffered (whichever is larger). The close method should be called
+            when no more data is available, to detect short streams; the
+            write method will return none-None when the end of a stream is
+            detected. The output object must accept bytes objects.
+
+        :param strict: If True (the default), the decoder will not knowingly
+            accept input that is not conformant to the HTTP specification.
+            (This does not imply that it will catch every nonconformance.)
+            If False, it will accept incorrect input that is still
+            unambiguous.
+        """
+        self.output = output
+        self.buffered_bytes = []
+        self.state = self._read_length
+        self.body_length = 0
+        self.strict = strict
+        self._match_chars = _b("0123456789abcdefABCDEF\r\n")
+        self._slash_n = _b('\n')
+        self._slash_r = _b('\r')
+        self._slash_rn = _b('\r\n')
+        self._slash_nr = _b('\n\r')
+
+    def close(self):
+        """Close the decoder.
+
+        :raises ValueError: If the stream is incomplete ValueError is raised.
+        """
+        if self.state != self._finished:
+            raise ValueError("incomplete stream")
+
+    def _finished(self):
+        """Finished reading, return any remaining bytes."""
+        if self.buffered_bytes:
+            buffered_bytes = self.buffered_bytes
+            self.buffered_bytes = []
+            return empty.join(buffered_bytes)
+        else:
+            raise ValueError("stream is finished")
+
+    def _read_body(self):
+        """Pass body bytes to the output."""
+        while self.body_length and self.buffered_bytes:
+            if self.body_length >= len(self.buffered_bytes[0]):
+                self.output.write(self.buffered_bytes[0])
+                self.body_length -= len(self.buffered_bytes[0])
+                del self.buffered_bytes[0]
+                # No more data available.
+                if not self.body_length:
+                    self.state = self._read_length
+            else:
+                self.output.write(self.buffered_bytes[0][:self.body_length])
+                self.buffered_bytes[0] = \
+                    self.buffered_bytes[0][self.body_length:]
+                self.body_length = 0
+                self.state = self._read_length
+                return self.state()
+
+    def _read_length(self):
+        """Try to decode a length from the bytes."""
+        count_chars = []
+        for bytes in self.buffered_bytes:
+            for pos in range(len(bytes)):
+                byte = bytes[pos:pos+1]
+                if byte not in self._match_chars:
+                    break
+                count_chars.append(byte)
+                if byte == self._slash_n:
+                    break
+        if not count_chars:
+            return
+        if count_chars[-1] != self._slash_n:
+            return
+        count_str = empty.join(count_chars)
+        if self.strict:
+            if count_str[-2:] != self._slash_rn:
+                raise ValueError("chunk header invalid: %r" % count_str)
+            if self._slash_r in count_str[:-2]:
+                raise ValueError("too many CRs in chunk header %r" % count_str)
+        self.body_length = int(count_str.rstrip(self._slash_nr), 16)
+        excess_bytes = len(count_str)
+        while excess_bytes:
+            if excess_bytes >= len(self.buffered_bytes[0]):
+                excess_bytes -= len(self.buffered_bytes[0])
+                del self.buffered_bytes[0]
+            else:
+                self.buffered_bytes[0] = self.buffered_bytes[0][excess_bytes:]
+                excess_bytes = 0
+        if not self.body_length:
+            self.state = self._finished
+            if not self.buffered_bytes:
+                # May not call into self._finished with no buffered data.
+                return empty
+        else:
+            self.state = self._read_body
+        return self.state()