diff --git a/mysql-test/innodb-index.result b/mysql-test/innodb-index.result
index a476d16a5f0..f6fd0fa4a7f 100644
--- a/mysql-test/innodb-index.result
+++ b/mysql-test/innodb-index.result
@@ -46,13 +46,6 @@ t1	CREATE TABLE `t1` (
   KEY `d2` (`d`),
   KEY `b` (`b`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
-alter table t1 add unique index (c), add index (d);
-ERROR HY000: Table 'test.t1#1' already exists
-rename table `t1#1` to `t1#2`;
-alter table t1 add unique index (c), add index (d);
-ERROR HY000: Table 'test.t1#2' already exists
-drop table `t1#2`;
 alter table t1 add unique index (c), add index (d);
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/innodb-index.test b/mysql-test/innodb-index.test
index 0ca02f0538a..47f7330a12b 100644
--- a/mysql-test/innodb-index.test
+++ b/mysql-test/innodb-index.test
@@ -17,16 +17,6 @@ show create table t1;
 alter table t1 add index (b);
 show create table t1;
 
-# Check how existing tables interfere with temporary tables.
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
-
---error 156
-alter table t1 add unique index (c), add index (d);
-rename table `t1#1` to `t1#2`;
---error 156
-alter table t1 add unique index (c), add index (d);
-drop table `t1#2`;
-
 alter table t1 add unique index (c), add index (d);
 show create table t1;
 explain select * from t1 force index(c) order by c;
diff --git a/mysql-test/innodb_bug34300.test b/mysql-test/innodb_bug34300.test
index 114bcf98c25..14918f55490 100644
--- a/mysql-test/innodb_bug34300.test
+++ b/mysql-test/innodb_bug34300.test
@@ -30,3 +30,4 @@ ALTER TABLE bug34300 ADD COLUMN (f10 INT);
 SELECT f4, f8 FROM bug34300;
 
 DROP TABLE bug34300;
+SET @@global.max_allowed_packet=1048576;
diff --git a/mysql-test/innodb_bug36169.result b/mysql-test/innodb_bug36169.result
index aa80e4d7aa4..48f5895bdbd 100644
--- a/mysql-test/innodb_bug36169.result
+++ b/mysql-test/innodb_bug36169.result
@@ -1,2 +1,5 @@
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
diff --git a/mysql-test/innodb_bug36169.test b/mysql-test/innodb_bug36169.test
index d3566d3eb39..b95e66fa34a 100644
--- a/mysql-test/innodb_bug36169.test
+++ b/mysql-test/innodb_bug36169.test
@@ -4,6 +4,9 @@
 #
 
 -- source include/have_innodb.inc
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
 
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
@@ -1153,3 +1156,7 @@ DROP TABLE IF EXISTS table4;
 DROP TABLE IF EXISTS table5;
 DROP TABLE IF EXISTS table6;
 
+set global innodb_file_per_table=@old_innodb_file_per_table;
+set global innodb_file_format=@old_innodb_file_format;
+set global innodb_file_format_check=@old_innodb_file_format_check;
+
diff --git a/mysql-test/innodb_bug36172.test b/mysql-test/innodb_bug36172.test
index 666d4a2f4b7..e6f8fb17cd7 100644
--- a/mysql-test/innodb_bug36172.test
+++ b/mysql-test/innodb_bug36172.test
@@ -13,6 +13,9 @@ SET storage_engine=InnoDB;
 
 -- disable_query_log
 -- disable_result_log
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
 
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=on;
@@ -24,3 +27,7 @@ CHECK TABLE table0 EXTENDED;
 INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.9055146948, `col21` = 4293243420.5621204000, `col22` = '20511211123705', `col23` = 4289899778.6573381000, `col24` = 4293449279.0540481000, `col25` = 'emphysemic', `col26` = 'dentally', `col27` = '2347406', `col28` = 'eruct', `col30` = 1222, `col31` = 4294372994.9941406000, `col32` = 4291385574.1173744000, `col33` = 'borrowing\'s', `col34` = 'septics', `col35` = 'ratter\'s', `col36` = 'Kaye', `col37` = 'Florentia', `col38` = 'allium', `col39` = 'barkeep', `col40` = '19510407003441', `col41` = 4293559200.4215522000, `col42` = 22482, `col43` = 'decussate', `col44` = 'Brom\'s', `col45` = 'violated', `col46` = 4925506.4635456400, `col47` = 930549, `col48` = '51296066', `col49` = 'voluminously', `col50` = '29306676', `col51` = -88, `col52` = -2153690, `col53` = 4290250202.1464887000, `col54` = 'expropriation', `col55` = 'Aberdeen\'s', `col56` = 20343, `col58` = '19640415171532', `col59` = 'extern', `col60` = 'Ubana', `col61` = 4290487961.8539081000, `col62` = '2147', `col63` = -24271, `col64` = '20750801194548', `col65` = 'Cunaxa\'s', `col66` = 'pasticcio', `col67` = 2795817, `col68` = 'Indore\'s', `col70` = 6864127, `col71` = '1817832', `col72` = '20540506114211', `col73` = '20040101012300', `col74` = 'rationalized', `col75` = '45522', `col76` = 'indene', `col77` = -6964559, `col78` = 4247535.5266884370, `col79` = '20720416124357', `col80` = '2143', `col81` = 4292060102.4466386000, `col82` = 'striving', `col83` = 'boneblack\'s', `col84` = 'redolent', `col85` = 6489697.9009369183, `col86` = 4287473465.9731131000, `col87` = 7726015, `col88` = 'perplexed', `col89` = '17153791', `col90` = 5478587.1108127078, `col91` = 4287091404.7004304000, `col92` = 'Boulez\'s', `col93` = '2931278';
 CHECK TABLE table0 EXTENDED;
 DROP TABLE table0;
+set global innodb_file_per_table=@old_innodb_file_per_table;
+set global innodb_file_format=@old_innodb_file_format;
+set global innodb_file_format_check=@old_innodb_file_format_check;
+
diff --git a/mysql-test/innodb_xtradb_bug317074.result b/mysql-test/innodb_xtradb_bug317074.result
index aa80e4d7aa4..48f5895bdbd 100644
--- a/mysql-test/innodb_xtradb_bug317074.result
+++ b/mysql-test/innodb_xtradb_bug317074.result
@@ -1,2 +1,5 @@
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
diff --git a/mysql-test/innodb_xtradb_bug317074.test b/mysql-test/innodb_xtradb_bug317074.test
index d5abb7a1670..abaaae4c7c5 100644
--- a/mysql-test/innodb_xtradb_bug317074.test
+++ b/mysql-test/innodb_xtradb_bug317074.test
@@ -1,4 +1,7 @@
 -- source include/have_innodb.inc
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
 
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
@@ -36,3 +39,7 @@ DROP PROCEDURE insert_many;
 ALTER TABLE test1 ENGINE=MyISAM;
 
 DROP TABLE test1;
+set global innodb_file_per_table=@old_innodb_file_per_table;
+set global innodb_file_format=@old_innodb_file_format;
+set global innodb_file_format_check=@old_innodb_file_format_check;
+
diff --git a/mysql-test/patches/bug32625.diff b/mysql-test/patches/bug32625.diff
deleted file mode 100644
index dcedcb1fa79..00000000000
--- a/mysql-test/patches/bug32625.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-test/t/type_bit_innodb.test.orig	2008-10-07 11:32:32.000000000 +0300
-+++ mysql-test/t/type_bit_innodb.test	2008-10-07 11:56:40.000000000 +0300
-@@ -40,6 +40,7 @@
- create table t1 (a bit) engine=innodb;
- insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001');
- select hex(a) from t1;
-+--replace_regex /entry '(.*)' for/entry '' for/
- --error ER_DUP_ENTRY
- alter table t1 add unique (a);
- drop table t1;
diff --git a/mysql-test/patches/bug41893.diff b/mysql-test/patches/bug41893.diff
deleted file mode 100644
index f42f4ae71cb..00000000000
--- a/mysql-test/patches/bug41893.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-=== modified file 'mysql-test/r/variables.result'
---- mysql-test/r/variables.result	2008-11-27 10:50:28 +0000
-+++ mysql-test/r/variables.result	2009-01-06 07:33:27 +0000
-@@ -297,14 +297,14 @@
- select ROUND(RAND(),5);
- ROUND(RAND(),5)
- 0.02887
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name	Value
- query_alloc_block_size	8192
- query_prealloc_size	8192
- range_alloc_block_size	4096
- transaction_alloc_block_size	8192
- transaction_prealloc_size	4096
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME	VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE	8192
- QUERY_PREALLOC_SIZE	8192
-@@ -319,14 +319,14 @@
- select @@query_alloc_block_size;
- @@query_alloc_block_size
- 17408
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name	Value
- query_alloc_block_size	17408
- query_prealloc_size	18432
- range_alloc_block_size	16384
- transaction_alloc_block_size	19456
- transaction_prealloc_size	20480
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME	VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE	17408
- QUERY_PREALLOC_SIZE	18432
-@@ -336,14 +336,14 @@
- set @@range_alloc_block_size=default;
- set @@query_alloc_block_size=default, @@query_prealloc_size=default;
- set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name	Value
- query_alloc_block_size	8192
- query_prealloc_size	8192
- range_alloc_block_size	4096
- transaction_alloc_block_size	8192
- transaction_prealloc_size	4096
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME	VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE	8192
- QUERY_PREALLOC_SIZE	8192
-
-=== modified file 'mysql-test/t/variables.test'
---- mysql-test/t/variables.test	2008-11-27 10:50:28 +0000
-+++ mysql-test/t/variables.test	2009-01-06 07:28:12 +0000
-@@ -172,21 +172,21 @@
- set @@rand_seed1=10000000,@@rand_seed2=1000000;
- select ROUND(RAND(),5);
- 
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- set @@range_alloc_block_size=1024*16;
- set @@query_alloc_block_size=1024*17+2;
- set @@query_prealloc_size=1024*18;
- set @@transaction_alloc_block_size=1024*20-1;
- set @@transaction_prealloc_size=1024*21-1;
- select @@query_alloc_block_size;
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- set @@range_alloc_block_size=default;
- set @@query_alloc_block_size=default, @@query_prealloc_size=default;
- set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- 
- #
- # Bug #10904 Illegal mix of collations between
-
diff --git a/mysql-test/patches/events_stress.diff b/mysql-test/patches/events_stress.diff
new file mode 100644
index 00000000000..f1c36d44a1e
--- /dev/null
+++ b/mysql-test/patches/events_stress.diff
@@ -0,0 +1,30 @@
+--- mysql-test/t/events_stress.test.orig	2009-04-16 19:39:47.000000000 +0000
++++ mysql-test/t/events_stress.test	2009-04-16 19:41:16.000000000 +0000
+@@ -61,6 +61,7 @@
+ }
+ --enable_query_log
+ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
++SET @old_event_scheduler=@@event_scheduler;
+ SET GLOBAL event_scheduler=on;
+ --sleep 2.5
+ DROP DATABASE events_conn1_test2;
+@@ -135,3 +136,4 @@
+ #
+ 
+ DROP DATABASE events_test;
++SET GLOBAL event_scheduler=@old_event_scheduler;
+--- mysql-test/r/events_stress.result.orig	2009-04-16 19:41:48.000000000 +0000
++++ mysql-test/r/events_stress.result	2009-04-16 19:42:07.000000000 +0000
+@@ -32,6 +32,7 @@
+ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
+ COUNT(*)
+ 50
++SET @old_event_scheduler=@@event_scheduler;
+ SET GLOBAL event_scheduler=on;
+ DROP DATABASE events_conn1_test2;
+ SET GLOBAL event_scheduler=off;
+@@ -63,3 +64,4 @@
+ DROP TABLE fill_it2;
+ DROP TABLE fill_it3;
+ DROP DATABASE events_test;
++SET GLOBAL event_scheduler=@old_event_scheduler;
diff --git a/mysql-test/patches/information_schema.diff b/mysql-test/patches/information_schema.diff
index a3a21f7a08d..c09633f82b7 100644
--- a/mysql-test/patches/information_schema.diff
+++ b/mysql-test/patches/information_schema.diff
@@ -1,20 +1,25 @@
---- mysql-test/r/information_schema.result.orig	2009-01-31 03:38:50.000000000 +0200
-+++ mysql-test/r/information_schema.result	2009-01-31 07:51:58.000000000 +0200
-@@ -71,6 +71,13 @@
+--- mysql-test/r/information_schema.result.orig	2009-04-16 19:59:13.000000000 +0000
++++ mysql-test/r/information_schema.result	2009-04-16 20:00:16.000000000 +0000
+@@ -71,6 +71,18 @@
  TRIGGERS
  USER_PRIVILEGES
  VIEWS
-+INNODB_CMP_RESET
-+INNODB_TRX
-+INNODB_CMPMEM_RESET
-+INNODB_LOCK_WAITS
-+INNODB_CMPMEM
-+INNODB_CMP
++INNODB_BUFFER_POOL_PAGES_INDEX
++INNODB_RSEG
 +INNODB_LOCKS
++INNODB_BUFFER_POOL_PAGES
++XTRADB_ENHANCEMENTS
++INNODB_TRX
++INNODB_BUFFER_POOL_PAGES_BLOB
++INNODB_LOCK_WAITS
++INNODB_CMP_RESET
++INNODB_CMP
++INNODB_CMPMEM_RESET
++INNODB_CMPMEM
  columns_priv
  db
  event
-@@ -799,6 +806,8 @@
+@@ -799,6 +811,8 @@
  TABLES	UPDATE_TIME	datetime
  TABLES	CHECK_TIME	datetime
  TRIGGERS	CREATED	datetime
@@ -23,102 +28,92 @@
  event	execute_at	datetime
  event	last_executed	datetime
  event	starts	datetime
-@@ -852,7 +861,7 @@
+@@ -847,12 +861,13 @@
+ TABLE_CONSTRAINTS	TABLE_NAME	select
+ TABLE_PRIVILEGES	TABLE_NAME	select
+ VIEWS	TABLE_NAME	select
++INNODB_BUFFER_POOL_PAGES_INDEX	table_name	select
+ delete from mysql.user where user='mysqltest_4';
+ delete from mysql.db where user='mysqltest_4';
  flush privileges;
  SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
  table_schema	count(*)
 -information_schema	28
-+information_schema	35
++information_schema	40
  mysql	22
  create table t1 (i int, j int);
  create trigger trg1 before insert on t1 for each row
-@@ -1267,6 +1276,13 @@
+@@ -1267,6 +1282,18 @@
  TRIGGERS	TRIGGER_SCHEMA
  USER_PRIVILEGES	GRANTEE
  VIEWS	TABLE_SCHEMA
-+INNODB_CMP_RESET	page_size
-+INNODB_TRX	trx_id
-+INNODB_CMPMEM_RESET	page_size
-+INNODB_LOCK_WAITS	requesting_trx_id
-+INNODB_CMPMEM	page_size
-+INNODB_CMP	page_size
++INNODB_BUFFER_POOL_PAGES_INDEX	schema_name
++INNODB_RSEG	rseg_id
 +INNODB_LOCKS	lock_id
++INNODB_BUFFER_POOL_PAGES	page_type
++XTRADB_ENHANCEMENTS	name
++INNODB_TRX	trx_id
++INNODB_BUFFER_POOL_PAGES_BLOB	space_id
++INNODB_LOCK_WAITS	requesting_trx_id
++INNODB_CMP_RESET	page_size
++INNODB_CMP	page_size
++INNODB_CMPMEM_RESET	page_size
++INNODB_CMPMEM	page_size
  SELECT t.table_name, c1.column_name
  FROM information_schema.tables t
  INNER JOIN
-@@ -1310,6 +1326,13 @@
+@@ -1310,14 +1337,26 @@
  TRIGGERS	TRIGGER_SCHEMA
  USER_PRIVILEGES	GRANTEE
  VIEWS	TABLE_SCHEMA
-+INNODB_CMP_RESET	page_size
-+INNODB_TRX	trx_id
-+INNODB_CMPMEM_RESET	page_size
-+INNODB_LOCK_WAITS	requesting_trx_id
-+INNODB_CMPMEM	page_size
-+INNODB_CMP	page_size
++INNODB_BUFFER_POOL_PAGES_INDEX	schema_name
++INNODB_RSEG	rseg_id
 +INNODB_LOCKS	lock_id
++INNODB_BUFFER_POOL_PAGES	page_type
++XTRADB_ENHANCEMENTS	name
++INNODB_TRX	trx_id
++INNODB_BUFFER_POOL_PAGES_BLOB	space_id
++INNODB_LOCK_WAITS	requesting_trx_id
++INNODB_CMP_RESET	page_size
++INNODB_CMP	page_size
++INNODB_CMPMEM_RESET	page_size
++INNODB_CMPMEM	page_size
  SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
  MAX(table_name)
- VIEWS
-@@ -1386,6 +1409,13 @@
+-VIEWS
++XTRADB_ENHANCEMENTS
+ SELECT table_name from information_schema.tables
+ WHERE table_name=(SELECT MAX(table_name)
+ FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
+ table_name
+-VIEWS
++XTRADB_ENHANCEMENTS
+ DROP TABLE IF EXISTS bug23037;
+ DROP FUNCTION IF EXISTS get_value;
+ SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
+@@ -1386,6 +1425,17 @@
  FILES	information_schema.FILES	1
  GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
  GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
++INNODB_BUFFER_POOL_PAGES	information_schema.INNODB_BUFFER_POOL_PAGES	1
++INNODB_BUFFER_POOL_PAGES_BLOB	information_schema.INNODB_BUFFER_POOL_PAGES_BLOB	1
++INNODB_BUFFER_POOL_PAGES_INDEX	information_schema.INNODB_BUFFER_POOL_PAGES_INDEX	1
 +INNODB_CMP	information_schema.INNODB_CMP	1
 +INNODB_CMPMEM	information_schema.INNODB_CMPMEM	1
 +INNODB_CMPMEM_RESET	information_schema.INNODB_CMPMEM_RESET	1
 +INNODB_CMP_RESET	information_schema.INNODB_CMP_RESET	1
 +INNODB_LOCKS	information_schema.INNODB_LOCKS	1
 +INNODB_LOCK_WAITS	information_schema.INNODB_LOCK_WAITS	1
++INNODB_RSEG	information_schema.INNODB_RSEG	1
 +INNODB_TRX	information_schema.INNODB_TRX	1
  KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
  PARTITIONS	information_schema.PARTITIONS	1
  PLUGINS	information_schema.PLUGINS	1
-diff mysql-test/r/information_schema_db.result.orig mysql-test/r/information_schema_db.result
---- mysql-test/r/information_schema_db.result.orig	2008-08-04 09:27:49.000000000 +0300
-+++ mysql-test/r/information_schema_db.result	2008-10-07 12:26:31.000000000 +0300
-@@ -33,6 +33,13 @@
- TRIGGERS
- USER_PRIVILEGES
- VIEWS
-+INNODB_CMP_RESET
-+INNODB_TRX
-+INNODB_CMPMEM_RESET
-+INNODB_LOCK_WAITS
-+INNODB_CMPMEM
-+INNODB_CMP
-+INNODB_LOCKS
- show tables from INFORMATION_SCHEMA like 'T%';
- Tables_in_information_schema (T%)
- TABLES
-diff mysql-test/r/mysqlshow.result.orig mysql-test/r/mysqlshow.result
---- mysql-test/r/mysqlshow.result.orig	2008-08-04 09:27:51.000000000 +0300
-+++ mysql-test/r/mysqlshow.result	2008-10-07 12:35:39.000000000 +0300
-@@ -107,6 +107,13 @@
- | TRIGGERS                              |
- | USER_PRIVILEGES                       |
- | VIEWS                                 |
-+| INNODB_CMP_RESET                      |
-+| INNODB_TRX                            |
-+| INNODB_CMPMEM_RESET                   |
-+| INNODB_LOCK_WAITS                     |
-+| INNODB_CMPMEM                         |
-+| INNODB_CMP                            |
-+| INNODB_LOCKS                          |
- +---------------------------------------+
- Database: INFORMATION_SCHEMA
- +---------------------------------------+
-@@ -140,6 +147,13 @@
- | TRIGGERS                              |
- | USER_PRIVILEGES                       |
- | VIEWS                                 |
-+| INNODB_CMP_RESET                      |
-+| INNODB_TRX                            |
-+| INNODB_CMPMEM_RESET                   |
-+| INNODB_LOCK_WAITS                     |
-+| INNODB_CMPMEM                         |
-+| INNODB_CMP                            |
-+| INNODB_LOCKS                          |
- +---------------------------------------+
- Wildcard: inf_rmation_schema
- +--------------------+
+@@ -1404,6 +1454,7 @@
+ TRIGGERS	information_schema.TRIGGERS	1
+ USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
+ VIEWS	information_schema.VIEWS	1
++XTRADB_ENHANCEMENTS	information_schema.XTRADB_ENHANCEMENTS	1
+ create table t1(f1 int);
+ create view v1 as select f1+1 as a from t1;
+ create table t2 (f1 int, f2 int);
diff --git a/mysql-test/patches/information_schema_db.diff b/mysql-test/patches/information_schema_db.diff
new file mode 100644
index 00000000000..a645fcf4a08
--- /dev/null
+++ b/mysql-test/patches/information_schema_db.diff
@@ -0,0 +1,21 @@
+--- mysql-test/r/information_schema_db.result.orig	2009-04-16 20:05:49.000000000 +0000
++++ mysql-test/r/information_schema_db.result	2009-04-16 20:06:07.000000000 +0000
+@@ -33,6 +33,18 @@
+ TRIGGERS
+ USER_PRIVILEGES
+ VIEWS
++INNODB_BUFFER_POOL_PAGES_INDEX
++INNODB_RSEG
++INNODB_LOCKS
++INNODB_BUFFER_POOL_PAGES
++XTRADB_ENHANCEMENTS
++INNODB_TRX
++INNODB_BUFFER_POOL_PAGES_BLOB
++INNODB_LOCK_WAITS
++INNODB_CMP_RESET
++INNODB_CMP
++INNODB_CMPMEM_RESET
++INNODB_CMPMEM
+ show tables from INFORMATION_SCHEMA like 'T%';
+ Tables_in_information_schema (T%)
+ TABLES
diff --git a/mysql-test/patches/innodb-analyze.diff b/mysql-test/patches/innodb-analyze.diff
new file mode 100644
index 00000000000..573467be38d
--- /dev/null
+++ b/mysql-test/patches/innodb-analyze.diff
@@ -0,0 +1,16 @@
+--- mysql-test/t/innodb-analyze.test.orig	2009-04-16 22:08:00.000000000 +0000
++++ mysql-test/t/innodb-analyze.test	2009-04-16 22:09:08.000000000 +0000
+@@ -10,7 +10,7 @@
+ -- disable_query_log
+ -- disable_result_log
+ -- enable_warnings
+-
++SET @old_innodb_stats_sample_pages=@@innodb_stats_sample_pages;
+ SET GLOBAL innodb_stats_sample_pages=0;
+ 
+ # check that the value has been adjusted to 1
+@@ -61,3 +61,4 @@
+ ANALYZE TABLE innodb_analyze;
+ 
+ DROP TABLE innodb_analyze;
++SET GLOBAL innodb_stats_sample_pages=@old_innodb_stats_sample_pages;
diff --git a/mysql-test/patches/innodb-index.diff b/mysql-test/patches/innodb-index.diff
index 0b008c96f25..2aa753cd855 100644
--- a/mysql-test/patches/innodb-index.diff
+++ b/mysql-test/patches/innodb-index.diff
@@ -1,62 +1,42 @@
-This part of the innodb-index test causes mysqld to print some warnings
-and subsequently the whole mysql-test suite to fail.
-
-A permanent solution is probably to remove the printouts from the source
-code or to somehow tell the mysql-test suite that warnings are expected.
-Currently we simply do not execute the problematic tests. Please
-coordinate a permanent solution with Marko, who added those tests.
-
-This cannot be proposed to MySQL because it touches files that are not
-in the MySQL source repository.
-
-Index: storage/innobase/mysql-test/innodb-index.result
-===================================================================
---- storage/innobase/mysql-test/innodb-index.result	(revision 2870)
-+++ storage/innobase/mysql-test/innodb-index.result	(working copy)
-@@ -43,19 +43,12 @@ t1	CREATE TABLE `t1` (
-   `b` int(11) DEFAULT NULL,
-   `c` char(10) NOT NULL,
-   `d` varchar(20) DEFAULT NULL,
-   KEY `d2` (`d`),
-   KEY `b` (`b`)
- ) ENGINE=InnoDB DEFAULT CHARSET=latin1
--CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
--alter table t1 add unique index (c), add index (d);
--ERROR HY000: Table 'test.t1#1' already exists
--rename table `t1#1` to `t1#2`;
--alter table t1 add unique index (c), add index (d);
--ERROR HY000: Table 'test.t1#2' already exists
--drop table `t1#2`;
- alter table t1 add unique index (c), add index (d);
- show create table t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` int(11) NOT NULL,
-   `b` int(11) DEFAULT NULL,
-Index: storage/innobase/mysql-test/innodb-index.test
-===================================================================
---- storage/innobase/mysql-test/innodb-index.test	(revision 2870)
-+++ storage/innobase/mysql-test/innodb-index.test	(working copy)
-@@ -14,22 +14,12 @@ select * from t1 force index (d2) order 
- --error ER_DUP_ENTRY
- alter table t1 add unique index (b);
- show create table t1;
- alter table t1 add index (b);
- show create table t1;
+--- mysql-test/t/innodb-index.test.orig	2009-04-16 22:12:38.000000000 +0000
++++ mysql-test/t/innodb-index.test	2009-04-16 22:16:58.000000000 +0000
+@@ -344,6 +344,11 @@
  
--# Check how existing tables interfere with temporary tables.
--CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
--
----error 156
--alter table t1 add unique index (c), add index (d);
--rename table `t1#1` to `t1#2`;
----error 156
--alter table t1 add unique index (c), add index (d);
--drop table `t1#2`;
--
- alter table t1 add unique index (c), add index (d);
- show create table t1;
- explain select * from t1 force index(c) order by c;
- alter table t1 add primary key (a), drop index c;
- show create table t1;
- --error ER_MULTIPLE_PRI_KEY
+ let $per_table=`select @@innodb_file_per_table`;
+ let $format=`select @@innodb_file_format`;
++
++set @old_innodb_file_per_table=@@innodb_file_per_table;
++set @old_innodb_file_format=@@innodb_file_format;
++set @old_innodb_file_format_check=@@innodb_file_format_check;
++
+ set global innodb_file_per_table=on;
+ set global innodb_file_format='Barracuda';
+ # Test creating a table that could lead to undo log overflow.
+@@ -499,3 +504,8 @@
+ 
+ DROP TABLE t2;
+ DROP TABLE t1;
++
++set global innodb_file_per_table=@old_innodb_file_per_table;
++set global innodb_file_format=@old_innodb_file_format;
++set global innodb_file_format_check=@old_innodb_file_format_check;
++
+--- mysql-test/r/innodb-index.result.orig	2009-04-16 22:18:18.000000000 +0000
++++ mysql-test/r/innodb-index.result	2009-04-16 22:18:47.000000000 +0000
+@@ -877,6 +877,9 @@
+ 44
+ commit;
+ drop table t1;
++set @old_innodb_file_per_table=@@innodb_file_per_table;
++set @old_innodb_file_format=@@innodb_file_format;
++set @old_innodb_file_format_check=@@innodb_file_format_check;
+ set global innodb_file_per_table=on;
+ set global innodb_file_format='Barracuda';
+ create table t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob,h blob,
+@@ -1125,3 +1128,6 @@
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ DROP TABLE t2;
+ DROP TABLE t1;
++set global innodb_file_per_table=@old_innodb_file_per_table;
++set global innodb_file_format=@old_innodb_file_format;
++set global innodb_file_format_check=@old_innodb_file_format_check;
diff --git a/mysql-test/patches/innodb.diff b/mysql-test/patches/innodb.diff
new file mode 100644
index 00000000000..a2445f821b9
--- /dev/null
+++ b/mysql-test/patches/innodb.diff
@@ -0,0 +1,36 @@
+--- mysql-test/t/innodb.test.orig	2009-04-16 16:15:05.000000000 +0000
++++ mysql-test/t/innodb.test	2009-04-16 16:15:54.000000000 +0000
+@@ -1318,6 +1318,7 @@
+ show variables like "innodb_sync_spin_loops";
+ 
+ # Test for innodb_thread_concurrency variable
++set @old_innodb_thread_concurrency=@@innodb_thread_concurrency;
+ show variables like "innodb_thread_concurrency";
+ set global innodb_thread_concurrency=1001;
+ show variables like "innodb_thread_concurrency";
+@@ -1325,6 +1326,7 @@
+ show variables like "innodb_thread_concurrency";
+ set global innodb_thread_concurrency=16;
+ show variables like "innodb_thread_concurrency";
++set global innodb_thread_concurrency=@old_innodb_thread_concurrency;
+ 
+ # Test for innodb_concurrency_tickets variable
+ show variables like "innodb_concurrency_tickets";
+--- mysql-test/r/innodb.result.orig	2009-04-16 16:16:11.000000000 +0000
++++ mysql-test/r/innodb.result	2009-04-16 16:16:46.000000000 +0000
+@@ -1781,6 +1781,7 @@
+ show variables like "innodb_sync_spin_loops";
+ Variable_name	Value
+ innodb_sync_spin_loops	20
++set @old_innodb_thread_concurrency=@@innodb_thread_concurrency;
+ show variables like "innodb_thread_concurrency";
+ Variable_name	Value
+ innodb_thread_concurrency	0
+@@ -1798,6 +1799,7 @@
+ show variables like "innodb_thread_concurrency";
+ Variable_name	Value
+ innodb_thread_concurrency	16
++set global innodb_thread_concurrency=@old_innodb_thread_concurrency;
+ show variables like "innodb_concurrency_tickets";
+ Variable_name	Value
+ innodb_concurrency_tickets	500
diff --git a/mysql-test/patches/mysqlbinlog_row_big.diff b/mysql-test/patches/mysqlbinlog_row_big.diff
new file mode 100644
index 00000000000..afe4e7795ef
--- /dev/null
+++ b/mysql-test/patches/mysqlbinlog_row_big.diff
@@ -0,0 +1,70 @@
+--- mysql-test/r/mysqlbinlog_row_big.result.orig	2009-04-17 18:58:20.000000000 +0900
++++ mysql-test/r/mysqlbinlog_row_big.result	2009-04-17 18:56:48.000000000 +0900
+@@ -1,4 +1,9 @@
+ #
++# We need big packets.
++#
++SET @old_global_max_allowed_packet=@@global.max_allowed_packet;
++SET @@global.max_allowed_packet= 1024*1024*1024;
++#
+ # Preparatory cleanup.
+ #
+ DROP TABLE IF EXISTS t1;
+@@ -7,10 +12,6 @@
+ #
+ SET timestamp=1000000000;
+ #
+-# We need big packets.
+-#
+-SET @@global.max_allowed_packet= 1024*1024*1024;
+-#
+ # Delete all existing binary logs.
+ #
+ RESET MASTER;
+@@ -71,4 +72,5 @@
+ # Cleanup.
+ #
+ DROP TABLE t1;
++SET @@global.max_allowed_packet=@old_global_max_allowed_packet;
+ remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out
+--- mysql-test/t/mysqlbinlog_row_big.test.orig	2009-04-17 18:57:58.000000000 +0900
++++ mysql-test/t/mysqlbinlog_row_big.test	2009-04-17 18:56:32.000000000 +0900
+@@ -24,6 +24,16 @@
+ --source include/big_test.inc
+ 
+ --echo #
++--echo # We need big packets.
++--echo #
++connect (con1, localhost, root,,);
++connection con1;
++SET @old_global_max_allowed_packet=@@global.max_allowed_packet;
++SET @@global.max_allowed_packet= 1024*1024*1024;
++connect (con2, localhost, root,,);
++connection con2;
++
++--echo #
+ --echo # Preparatory cleanup.
+ --echo #
+ --disable_warnings
+@@ -36,11 +46,6 @@
+ SET timestamp=1000000000;
+ 
+ --echo #
+---echo # We need big packets.
+---echo #
+-SET @@global.max_allowed_packet= 1024*1024*1024;
+-
+---echo #
+ --echo # Delete all existing binary logs.
+ --echo #
+ RESET MASTER;
+@@ -122,6 +127,9 @@
+ --echo #
+ DROP TABLE t1;
+ 
++connection con1;
++SET @@global.max_allowed_packet=@old_global_max_allowed_packet;
++
+ --echo remove_file \$MYSQLTEST_VARDIR/$mysqlbinlog_output
+ #
+ # NOTE: If you want to see the *huge* mysqlbinlog output, disable next line:
diff --git a/mysql-test/patches/mysqlshow.diff b/mysql-test/patches/mysqlshow.diff
new file mode 100644
index 00000000000..7af21075624
--- /dev/null
+++ b/mysql-test/patches/mysqlshow.diff
@@ -0,0 +1,40 @@
+--- mysql-test/r/mysqlshow.result.orig	2009-04-16 20:13:30.000000000 +0000
++++ mysql-test/r/mysqlshow.result	2009-04-16 20:13:45.000000000 +0000
+@@ -107,6 +107,18 @@
+ | TRIGGERS                              |
+ | USER_PRIVILEGES                       |
+ | VIEWS                                 |
++| INNODB_BUFFER_POOL_PAGES_INDEX        |
++| INNODB_RSEG                           |
++| INNODB_LOCKS                          |
++| INNODB_BUFFER_POOL_PAGES              |
++| XTRADB_ENHANCEMENTS                   |
++| INNODB_TRX                            |
++| INNODB_BUFFER_POOL_PAGES_BLOB         |
++| INNODB_LOCK_WAITS                     |
++| INNODB_CMP_RESET                      |
++| INNODB_CMP                            |
++| INNODB_CMPMEM_RESET                   |
++| INNODB_CMPMEM                         |
+ +---------------------------------------+
+ Database: INFORMATION_SCHEMA
+ +---------------------------------------+
+@@ -140,6 +152,18 @@
+ | TRIGGERS                              |
+ | USER_PRIVILEGES                       |
+ | VIEWS                                 |
++| INNODB_BUFFER_POOL_PAGES_INDEX        |
++| INNODB_RSEG                           |
++| INNODB_LOCKS                          |
++| INNODB_BUFFER_POOL_PAGES              |
++| XTRADB_ENHANCEMENTS                   |
++| INNODB_TRX                            |
++| INNODB_BUFFER_POOL_PAGES_BLOB         |
++| INNODB_LOCK_WAITS                     |
++| INNODB_CMP_RESET                      |
++| INNODB_CMP                            |
++| INNODB_CMPMEM_RESET                   |
++| INNODB_CMPMEM                         |
+ +---------------------------------------+
+ Wildcard: inf_rmation_schema
+ +--------------------+
diff --git a/mysql-test/patches/variables-big.diff b/mysql-test/patches/variables-big.diff
new file mode 100644
index 00000000000..4b9bf610131
--- /dev/null
+++ b/mysql-test/patches/variables-big.diff
@@ -0,0 +1,61 @@
+--- mysql-test/r/variables-big.result.orig	2009-04-17 19:18:57.000000000 +0900
++++ mysql-test/r/variables-big.result	2009-04-17 19:17:10.000000000 +0900
+@@ -1,20 +1,21 @@
++set @pid_temp = (select ID from information_schema.processlist);
+ set session transaction_prealloc_size=1024*1024*1024*1;
+-show processlist;
+-Id	User	Host	db	Command	Time	State	Info
+-1	root	localhost	test	Query	0	NULL	show processlist
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
++TRUE
++1
+ set session transaction_prealloc_size=1024*1024*1024*2;
+-show processlist;
+-Id	User	Host	db	Command	Time	State	Info
+-1	root	localhost	test	Query	0	NULL	show processlist
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
++TRUE
++1
+ set session transaction_prealloc_size=1024*1024*1024*3;
+-show processlist;
+-Id	User	Host	db	Command	Time	State	Info
+-1	root	localhost	test	Query	0	NULL	show processlist
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
++TRUE
++1
+ set session transaction_prealloc_size=1024*1024*1024*4;
+-show processlist;
+-Id	User	Host	db	Command	Time	State	Info
+-1	root	localhost	test	Query	0	NULL	show processlist
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
++TRUE
++1
+ set session transaction_prealloc_size=1024*1024*1024*5;
+-show processlist;
+-Id	User	Host	db	Command	Time	State	Info
+-1	root	localhost	test	Query	0	NULL	show processlist
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
++TRUE
++1
+--- mysql-test/t/variables-big.test.orig	2009-04-17 19:18:12.000000000 +0900
++++ mysql-test/t/variables-big.test	2009-04-17 19:16:26.000000000 +0900
+@@ -8,13 +8,14 @@
+ # Bug #27322  	failure to allocate transaction_prealloc_size causes crash
+ #
+ 
++set @pid_temp = (select ID from information_schema.processlist);
+ set session transaction_prealloc_size=1024*1024*1024*1;
+-show processlist;
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
+ set session transaction_prealloc_size=1024*1024*1024*2;
+-show processlist;
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
+ set session transaction_prealloc_size=1024*1024*1024*3;
+-show processlist;
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
+ set session transaction_prealloc_size=1024*1024*1024*4;
+-show processlist;
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';
+ set session transaction_prealloc_size=1024*1024*1024*5;
+-show processlist;
++select @pid_temp = (select ID from information_schema.processlist) as 'TRUE';