Merge lp:~stewart/percona-server/bug896439 into lp:percona-server/5.1

[Stewart Smith]

fix crashes with selecting Innodb/xtradb I_S tables with skip-innodb.

There was a simple macro to do it and we missed it :(

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/mysql-test/r/information_schema.result'
--- Percona-Server/mysql-test/r/information_schema.result	2011-11-24 02:00:56 +0000
+++ Percona-Server/mysql-test/r/information_schema.result	2012-06-15 06:06:23 +0000
@@ -83,7 +83,7 @@
 INNODB_RSEG
 INNODB_LOCKS
 INNODB_BUFFER_POOL_PAGES
-XTRADB_ENHANCEMENTS
+INNODB_TABLE_STATS
 INNODB_TRX
 XTRADB_ADMIN_COMMAND
 INNODB_LOCK_WAITS
@@ -96,7 +96,6 @@
 INNODB_SYS_INDEXES
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_CMPMEM_RESET
-INNODB_TABLE_STATS
 columns_priv
 db
 event
@@ -901,14 +900,14 @@
 TEMPORARY_TABLES	TABLE_NAME	select
 TABLE_STATISTICS	TABLE_NAME	select
 VIEWS	TABLE_NAME	select
+INNODB_TABLE_STATS	table_name	select
 INNODB_INDEX_STATS	table_name	select
-INNODB_TABLE_STATS	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	54
+information_schema	53
 mysql	22
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1335,7 +1334,7 @@
 INNODB_RSEG	rseg_id
 INNODB_LOCKS	lock_id
 INNODB_BUFFER_POOL_PAGES	page_type
-XTRADB_ENHANCEMENTS	name
+INNODB_TABLE_STATS	table_schema
 INNODB_TRX	trx_id
 XTRADB_ADMIN_COMMAND	result_message
 INNODB_LOCK_WAITS	requesting_trx_id
@@ -1348,7 +1347,6 @@
 INNODB_SYS_INDEXES	TABLE_ID
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
 INNODB_CMPMEM_RESET	page_size
-INNODB_TABLE_STATS	table_schema
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -1404,7 +1402,7 @@
 INNODB_RSEG	rseg_id
 INNODB_LOCKS	lock_id
 INNODB_BUFFER_POOL_PAGES	page_type
-XTRADB_ENHANCEMENTS	name
+INNODB_TABLE_STATS	table_schema
 INNODB_TRX	trx_id
 XTRADB_ADMIN_COMMAND	result_message
 INNODB_LOCK_WAITS	requesting_trx_id
@@ -1417,15 +1415,14 @@
 INNODB_SYS_INDEXES	TABLE_ID
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
 INNODB_CMPMEM_RESET	page_size
-INNODB_TABLE_STATS	table_schema
 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
 MAX(table_name)
-XTRADB_ENHANCEMENTS
+XTRADB_ADMIN_COMMAND
 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
-XTRADB_ENHANCEMENTS
+XTRADB_ADMIN_COMMAND
 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';
@@ -1536,7 +1533,6 @@
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
 USER_STATISTICS	information_schema.USER_STATISTICS	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);

=== modified file 'Percona-Server/mysql-test/r/information_schema_db.result'
--- Percona-Server/mysql-test/r/information_schema_db.result	2011-11-24 02:00:56 +0000
+++ Percona-Server/mysql-test/r/information_schema_db.result	2012-06-15 06:06:23 +0000
@@ -45,7 +45,7 @@
 INNODB_RSEG
 INNODB_LOCKS
 INNODB_BUFFER_POOL_PAGES
-XTRADB_ENHANCEMENTS
+INNODB_TABLE_STATS
 INNODB_TRX
 XTRADB_ADMIN_COMMAND
 INNODB_LOCK_WAITS
@@ -58,7 +58,6 @@
 INNODB_SYS_INDEXES
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_CMPMEM_RESET
-INNODB_TABLE_STATS
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES

=== modified file 'Percona-Server/mysql-test/r/mysqlshow.result'
--- Percona-Server/mysql-test/r/mysqlshow.result	2011-11-24 02:00:56 +0000
+++ Percona-Server/mysql-test/r/mysqlshow.result	2012-06-15 06:06:23 +0000
@@ -119,7 +119,7 @@
 | INNODB_RSEG                           |
 | INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES              |
-| XTRADB_ENHANCEMENTS                   |
+| INNODB_TABLE_STATS                    |
 | INNODB_TRX                            |
 | XTRADB_ADMIN_COMMAND                  |
 | INNODB_LOCK_WAITS                     |
@@ -132,7 +132,6 @@
 | INNODB_SYS_INDEXES                    |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
-| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -178,7 +177,7 @@
 | INNODB_RSEG                           |
 | INNODB_LOCKS                          |
 | INNODB_BUFFER_POOL_PAGES              |
-| XTRADB_ENHANCEMENTS                   |
+| INNODB_TABLE_STATS                    |
 | INNODB_TRX                            |
 | XTRADB_ADMIN_COMMAND                  |
 | INNODB_LOCK_WAITS                     |
@@ -191,7 +190,6 @@
 | INNODB_SYS_INDEXES                    |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
-| INNODB_TABLE_STATS                    |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_skip_innodb_i_s.result	2012-06-15 06:06:23 +0000
@@ -0,0 +1,93 @@
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'INNODB%' ORDER BY TABLE_NAME;
+TABLE_NAME
+INNODB_BUFFER_POOL_PAGES
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_CMP
+INNODB_CMPMEM
+INNODB_CMPMEM_RESET
+INNODB_CMP_RESET
+INNODB_INDEX_STATS
+INNODB_LOCKS
+INNODB_LOCK_WAITS
+INNODB_RSEG
+INNODB_SYS_INDEXES
+INNODB_SYS_STATS
+INNODB_SYS_TABLES
+INNODB_TABLE_STATS
+INNODB_TRX
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'XTRADB%' ORDER BY TABLE_NAME;
+TABLE_NAME
+XTRADB_ADMIN_COMMAND
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+index_id	space_id	page_no	n_recs	data_size	hashed	access_time	modified	dirty	old	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_RSEG;
+rseg_id	space_id	zip_size	page_no	max_size	curr_size
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_RSEG but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP;
+page_size	compress_ops	compress_ops_ok	compress_time	uncompress_ops	uncompress_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMP but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX;
+trx_id	trx_state	trx_started	trx_requested_lock_id	trx_wait_started	trx_weight	trx_mysql_thread_id	trx_query
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_TRX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
+requesting_trx_id	requested_lock_id	blocking_trx_id	blocking_lock_id
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_LOCK_WAITS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS;
+lock_id	lock_trx_id	lock_mode	lock_type	lock_table	lock_index	lock_space	lock_page	lock_rec	lock_data
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_LOCKS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP_RESET;
+page_size	compress_ops	compress_ops_ok	compress_time	uncompress_ops	uncompress_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMP_RESET but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES;
+page_type	space_id	page_no	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+SCHEMA	NAME	ID	N_COLS	TYPE	MIX_ID	MIX_LEN	CLUSTER_NAME	SPACE
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_TABLES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+index_id	space_id	page_no	n_recs	data_size	hashed	access_time	modified	dirty	old	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM;
+page_size	pages_used	pages_free	relocation_ops	relocation_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMPMEM but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB;
+space_id	page_no	compressed	part_len	next_page_no	lru_position	fix_count	flush_type
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
+page_size	pages_used	pages_free	relocation_ops	relocation_time
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_CMPMEM_RESET but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS;
+table_schema	table_name	rows	clust_size	other_size	modified
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_TABLE_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_STATS;
+INDEX_ID	KEY_COLS	DIFF_VALS	NON_NULL_VALS
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_INDEX_STATS;
+table_schema	table_name	index_name	fields	row_per_keys	index_size	leaf_pages
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_INDEX_STATS but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
+TABLE_ID	ID	NAME	N_FIELDS	TYPE	SPACE	PAGE_NO
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.INNODB_SYS_INDEXES but the InnoDB storage engine is not installed
+SELECT * FROM INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND;
+result_message
+Warnings:
+Warning	1012	InnoDB: SELECTing from INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND but the InnoDB storage engine is not installed

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s-master.opt	2012-06-15 06:06:23 +0000
@@ -0,0 +1,1 @@
+--skip-innodb

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_skip_innodb_i_s.test	2012-06-15 06:06:23 +0000
@@ -0,0 +1,21 @@
+# we just test that we don't crash. The SELECT below is to ensure we update the test if we add I_S tables for INNODB or XTRADB
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'INNODB%' ORDER BY TABLE_NAME;
+SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' AND TABLE_NAME LIKE 'XTRADB%' ORDER BY TABLE_NAME;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_RSEG;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMP_RESET;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_INDEX;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_PAGES_BLOB;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_TABLE_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_INDEX_STATS;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
+SELECT * FROM INFORMATION_SCHEMA.XTRADB_ADMIN_COMMAND;

=== modified file 'Percona-Server/storage/innodb_plugin/Makefile.am'
--- Percona-Server/storage/innodb_plugin/Makefile.am	2011-11-24 02:00:02 +0000
+++ Percona-Server/storage/innodb_plugin/Makefile.am	2012-06-15 06:06:23 +0000
@@ -226,7 +226,6 @@
 			include/ut0vec.h	\
 			include/ut0vec.ic	\
 			include/ut0wqueue.h	\
-			handler/innodb_patch_info.h	\
 			mem/mem0dbg.c
 
 EXTRA_LIBRARIES=	libinnobase.a

=== modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc'
--- Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc	2012-05-09 04:14:12 +0000
+++ Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc	2012-06-15 06:06:23 +0000
@@ -12224,8 +12224,7 @@
 i_s_innodb_admin_command,
 i_s_innodb_sys_tables,
 i_s_innodb_sys_indexes,
-i_s_innodb_sys_stats,
-i_s_innodb_patches
+i_s_innodb_sys_stats
 mysql_declare_plugin_end;
 
 /** @brief Initialize the default value of innodb_commit_concurrency.

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
--- Percona-Server/storage/innodb_plugin/handler/i_s.cc	2011-11-24 16:33:30 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc	2012-06-15 06:06:23 +0000
@@ -32,7 +32,6 @@
 #include <mysys_err.h>
 #include <my_sys.h>
 #include "i_s.h"
-#include "innodb_patch_info.h"
 #include <mysql/plugin.h>
 
 extern "C" {
@@ -224,168 +223,11 @@
 	return(ret);
 }
 
-/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_patches */
-static ST_FIELD_INFO	innodb_patches_fields_info[] =
-{
-#define IDX_PATCH_NAME		0
-	{STRUCT_FLD(field_name,		"name"),
-	 STRUCT_FLD(field_length,	255),
-	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
-	 STRUCT_FLD(value,		0),
-	 STRUCT_FLD(field_flags,	0),
-	 STRUCT_FLD(old_name,		""),
-	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
-
-#define IDX_PATCH_DESCR		1
-	{STRUCT_FLD(field_name,		"description"),
-	 STRUCT_FLD(field_length,	255),
-	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
-	 STRUCT_FLD(value,		0),
-	 STRUCT_FLD(field_flags,	0),
-	 STRUCT_FLD(old_name,		""),
-	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
-
-#define IDX_PATCH_COMMENT		2
-	{STRUCT_FLD(field_name,		"comment"),
-	 STRUCT_FLD(field_length,	100),
-	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
-	 STRUCT_FLD(value,		0),
-	 STRUCT_FLD(field_flags,	0),
-	 STRUCT_FLD(old_name,		""),
-	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
-
-#define IDX_PATCH_LINK			3
-	{STRUCT_FLD(field_name,		"link"),
-	 STRUCT_FLD(field_length,	255),
-	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
-	 STRUCT_FLD(value,		0),
-	 STRUCT_FLD(field_flags,	0),
-	 STRUCT_FLD(old_name,		""),
-	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
-
-	END_OF_ST_FIELD_INFO
-};
-
 static struct st_mysql_information_schema	i_s_info =
 {
 	MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
 };
 
-/***********************************************************************
-Fill the dynamic table information_schema.innodb_patches */
-static
-int
-innodb_patches_fill(
-/*=============*/
-				/* out: 0 on success, 1 on failure */
-	THD*		thd,	/* in: thread */
-	TABLE_LIST*	tables,	/* in/out: tables to fill */
-	COND*		cond)	/* in: condition (ignored) */
-{
-	TABLE*	table	= (TABLE *) tables->table;
-	int	status	= 0;
-	int	i;
-	Field**	fields;
-
-
-	DBUG_ENTER("innodb_patches_fill");
-	fields = table->field;
-
-	/* deny access to non-superusers */
-	if (check_global_access(thd, PROCESS_ACL)) {
-
-		DBUG_RETURN(0);
-	}
-
-	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
-	
-	for (i = 0; innodb_enhancements[i].file; i++) {
-
-   	field_store_string(fields[0],innodb_enhancements[i].file);
-   	field_store_string(fields[1],innodb_enhancements[i].name);
-   	field_store_string(fields[2],innodb_enhancements[i].comment);
-   	field_store_string(fields[3],innodb_enhancements[i].link);
-
-	if (schema_table_store_record(thd, table)) {
-		status = 1;
-		break;
-	}
-
-	}
-
-
-	DBUG_RETURN(status);
-}
-
-/***********************************************************************
-Bind the dynamic table information_schema.innodb_patches. */
-static
-int
-innodb_patches_init(
-/*=========*/
-			/* out: 0 on success */
-	void*	p)	/* in/out: table schema object */
-{
-	DBUG_ENTER("innodb_patches_init");
-	ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
-
-	schema->fields_info = innodb_patches_fields_info;
-	schema->fill_table = innodb_patches_fill;
-
-	DBUG_RETURN(0);
-}
-
-
-UNIV_INTERN struct st_mysql_plugin      i_s_innodb_patches =
-{
-        /* the plugin type (a MYSQL_XXX_PLUGIN value) */
-        /* int */
-        STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
-
-        /* pointer to type-specific plugin descriptor */
-        /* void* */
-        STRUCT_FLD(info, &i_s_info),
-
-        /* plugin name */
-        /* const char* */
-        STRUCT_FLD(name, "XTRADB_ENHANCEMENTS"),
-
-        /* plugin author (for SHOW PLUGINS) */
-        /* const char* */
-        STRUCT_FLD(author, "Percona"),
-
-        /* general descriptive text (for SHOW PLUGINS) */
-        /* const char* */
-        STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"),
-
-        /* the plugin license (PLUGIN_LICENSE_XXX) */
-        /* int */
-        STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
-
-        /* the function to invoke when plugin is loaded */
-        /* int (*)(void*); */
-        STRUCT_FLD(init, innodb_patches_init),
-
-        /* the function to invoke when plugin is unloaded */
-        /* int (*)(void*); */
-        STRUCT_FLD(deinit, i_s_common_deinit),
-
-        /* plugin version (for SHOW PLUGINS) */
-        /* unsigned int */
-        STRUCT_FLD(version, INNODB_VERSION_SHORT),
-
-        /* struct st_mysql_show_var* */
-        STRUCT_FLD(status_vars, NULL),
-
-        /* struct st_mysql_sys_var** */
-        STRUCT_FLD(system_vars, NULL),
-
-        /* reserved for dependency checking */
-        /* void* */
-        STRUCT_FLD(__reserved1, NULL)
-};
-
-
 static ST_FIELD_INFO	i_s_innodb_buffer_pool_pages_fields_info[] =
 {
 	{STRUCT_FLD(field_name,		"page_type"),
@@ -1956,6 +1798,8 @@
 
 	DBUG_ENTER("i_s_cmp_fill_low");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -2224,6 +2068,8 @@
 
 	DBUG_ENTER("i_s_cmpmem_fill_low");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -2512,6 +2358,8 @@
 
 	DBUG_ENTER("i_s_innodb_rseg_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 
@@ -2645,6 +2493,8 @@
 
 	DBUG_ENTER("i_s_innodb_admin_command_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 		DBUG_RETURN(0);
@@ -2902,6 +2752,8 @@
 
 	DBUG_ENTER("i_s_innodb_table_stats_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 		DBUG_RETURN(0);
@@ -2965,6 +2817,8 @@
 
 	DBUG_ENTER("i_s_innodb_index_stats_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 		DBUG_RETURN(0);
@@ -3612,6 +3466,8 @@
 
 	DBUG_ENTER("i_s_innodb_schema_table_fill");
 
+	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
+
 	/* deny access to non-superusers */
 	if (check_global_access(thd, PROCESS_ACL)) {
 		DBUG_RETURN(0);

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.h'
--- Percona-Server/storage/innodb_plugin/handler/i_s.h	2011-11-24 02:00:45 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.h	2012-06-15 06:06:23 +0000
@@ -36,7 +36,6 @@
 extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
 extern struct st_mysql_plugin	i_s_innodb_cmpmem;
 extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
-extern struct st_mysql_plugin	i_s_innodb_patches;
 extern struct st_mysql_plugin	i_s_innodb_rseg;
 extern struct st_mysql_plugin	i_s_innodb_table_stats;
 extern struct st_mysql_plugin	i_s_innodb_index_stats;

=== removed file 'Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h'
--- Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h	2011-11-24 02:00:45 +0000
+++ Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/* Copyright (C) 2002-2006 MySQL AB
-  
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-  
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface                      /* gcc class implementation */
-#endif
-
-struct innodb_enhancement {
-       const char *file;
-       const char *name;
-       const char *comment;
-       const char *link;
-}innodb_enhancements[] = {
-{"xtradb_show_enhancements","I_S.XTRADB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_opt_lru_count","Fix of buffer_pool mutex","Decreases contention on buffer_pool mutex on LRU operations","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_expand_undo_slots","expandable maximum number of undo slots","from 1024 (default) to about 4000","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"},
-{"innodb_thread_concurrency_timer_based","use InnoDB timer based concurrency throttling (backport from MySQL 5.4.0)","",""},
-{"innodb_expand_import","convert .ibd file automatically when import tablespace","the files are generated by xtrabackup export mode.","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_files_extend","allow >4GB transaction log files, and can vary universal page size of datafiles","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},
-{"innodb_sys_tables_sys_indexes","Expose InnoDB SYS_TABLES and SYS_INDEXES schema tables","","http://www.percona.com/docs/wiki/percona-xtradb"},
-{NULL, NULL, NULL, NULL}
-};