fox for bug #62472 (mysqlhotcopy errors on databases containing MyISAM)

[packages/mysql.git] / innodb_show_sys_tables.patch

diff --git a/innodb_show_sys_tables.patch b/innodb_show_sys_tables.patch
index 7a3032f0ce8f749f0540524fa1bca764bb5a6d7b..5ad8bebecb870f94b83299a8fbe044c76f890e60 100644 (file)
--- a/innodb_show_sys_tables.patch
+++ b/innodb_show_sys_tables.patch
@@ -5,10 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
---- a/storage/innobase/dict/dict0load.c        2011-01-20 07:37:08.000000000 +0900
-+++ b/storage/innobase/dict/dict0load.c        2011-02-14 18:59:40.774162959 +0900
-@@ -437,7 +437,7 @@
+--- a/storage/innobase/dict/dict0load.c
++++ b/storage/innobase/dict/dict0load.c
+@@ -442,7 +442,7 @@
  
  }
  
@@ -17,7 +16,7 @@ diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.
  /********************************************************************//**
  This function parses a SYS_FOREIGN record and populate a dict_foreign_t
  structure with the information from the record. For detail information
-@@ -513,9 +513,9 @@
+@@ -518,9 +518,9 @@
  
        return(NULL);
  }
@@ -29,7 +28,7 @@ diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.
  /********************************************************************//**
  This function parses a SYS_FOREIGN_COLS record and extract necessary
  information from the record and return to caller.
-@@ -579,7 +579,7 @@
+@@ -584,7 +584,7 @@
  
        return(NULL);
  }
@@ -38,10 +37,9 @@ diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.
  
  /********************************************************************//**
  Determine the flags of a table described in SYS_TABLES.
-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
-@@ -11772,7 +11772,14 @@
+--- 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,
@@ -57,9 +55,8 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
  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>
  
@@ -72,7 +69,7 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
  #include "dict0mem.h"
  #include "dict0types.h"
  #include "ha_prototypes.h" /* for innobase_convert_name() */
-@@ -1784,6 +1786,1675 @@
+@@ -1812,6 +1814,1703 @@
        DBUG_RETURN(0);
  }
  
@@ -321,7 +318,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 */
@@ -618,7 +619,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 */
@@ -864,7 +869,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 */
@@ -1100,7 +1109,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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[] =
@@ -1307,7 +1320,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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 */
@@ -1528,7 +1545,11 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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[] =
@@ -1742,15 +1763,18 @@ diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
 +
 +      /* 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
+--- 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;