#!!! notice !!!
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:53:54.615040167 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 16:07:26.851357007 +0900
-@@ -11673,7 +11673,14 @@
+--- a/storage/innobase/dict/dict0load.c
++++ b/storage/innobase/dict/dict0load.c
+@@ -442,7 +442,7 @@
+
+ }
+
+-#ifdef FOREIGN_NOT_USED
++//#ifdef FOREIGN_NOT_USED
+ /********************************************************************//**
+ This function parses a SYS_FOREIGN record and populate a dict_foreign_t
+ structure with the information from the record. For detail information
+@@ -518,9 +518,9 @@
+
+ return(NULL);
+ }
+-#endif /* FOREIGN_NOT_USED */
++//#endif /* FOREIGN_NOT_USED */
+
+-#ifdef FOREIGN_NOT_USED
++//#ifdef FOREIGN_NOT_USED
+ /********************************************************************//**
+ This function parses a SYS_FOREIGN_COLS record and extract necessary
+ information from the record and return to caller.
+@@ -584,7 +584,7 @@
+
+ return(NULL);
+ }
+-#endif /* FOREIGN_NOT_USED */
++//#endif /* FOREIGN_NOT_USED */
+
+ /********************************************************************//**
+ Determine the flags of a table described in SYS_TABLES.
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -11950,7 +11950,14 @@
i_s_innodb_cmp,
i_s_innodb_cmp_reset,
i_s_innodb_cmpmem,
mysql_declare_plugin_end;
/** @brief Initialize the default value of innodb_commit_concurrency.
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc 2010-12-03 15:49:59.207956807 +0900
-+++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:10:02.719210529 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
@@ -36,9 +36,11 @@
#include <mysql/innodb_priv.h>
#include "dict0mem.h"
#include "dict0types.h"
#include "ha_prototypes.h" /* for innobase_convert_name() */
-@@ -1787,6 +1789,1675 @@
+@@ -1812,6 +1814,1703 @@
DBUG_RETURN(0);
}
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+
+/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+
+/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+
+/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_COLUMNS */
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_fields */
+static ST_FIELD_INFO innodb_sys_fields_fields_info[] =
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+
+/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign */
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign_cols */
+static ST_FIELD_INFO innodb_sys_foreign_cols_fields_info[] =
+
+ /* plugin author (for SHOW PLUGINS) */
+ /* const char* */
-+ STRUCT_FLD(author, plugin_author),
++ STRUCT_FLD(author, "Percona"),
+
+ /* general descriptive text (for SHOW PLUGINS) */
+ /* const char* */
+
+ /* reserved for dependency checking */
+ /* void* */
-+ STRUCT_FLD(__reserved1, NULL)
++ STRUCT_FLD(__reserved1, NULL),
++
++ /* flags for plugin */
++ /* unsigned long */
++ STRUCT_FLD(flags, 0UL)
+};
+
/***********************************************************************
*/
static ST_FIELD_INFO i_s_innodb_rseg_fields_info[] =
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h 2010-12-03 15:37:45.540456499 +0900
-+++ b/storage/innobase/handler/i_s.h 2010-12-03 16:08:57.596941207 +0900
-@@ -33,6 +33,13 @@
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
+@@ -35,6 +35,13 @@
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;