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 ce986ab3ba5319dee45aa67d5bee5533208149ee..5ad8bebecb870f94b83299a8fbe044c76f890e60 100644 (file)
--- a/innodb_show_sys_tables.patch
+++ b/innodb_show_sys_tables.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/dict/dict0load.c
 +++ b/storage/innobase/dict/dict0load.c
-@@ -437,7 +437,7 @@
+@@ -442,7 +442,7 @@
  
  }
  
@@ -16,7 +16,7 @@
  /********************************************************************//**
  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);
  }
@@ -28,7 +28,7 @@
  /********************************************************************//**
  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);
  }
@@ -39,7 +39,7 @@
  Determine the flags of a table described in SYS_TABLES.
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11789,7 +11789,14 @@
+@@ -11950,7 +11950,14 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,
@@ -69,7 +69,7 @@
  #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);
  }
  
@@ -318,7 +318,11 @@
 +
 +      /* 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 */
@@ -615,7 +619,11 @@
 +
 +      /* 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 */
@@ -861,7 +869,11 @@
 +
 +      /* 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 */
@@ -1097,7 +1109,11 @@
 +
 +      /* 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[] =
@@ -1304,7 +1320,11 @@
 +
 +      /* 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 */
@@ -1525,7 +1545,11 @@
 +
 +      /* 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[] =
@@ -1739,7 +1763,11 @@
 +
 +      /* reserved for dependency checking */
 +      /* void* */
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++
++      /* flags for plugin */
++      /* unsigned long */
++      STRUCT_FLD(flags, 0UL)
 +};
 +
  /***********************************************************************
@@ -1761,18 +1789,3 @@
  extern struct st_mysql_plugin i_s_innodb_rseg;
  
  #endif /* i_s_h */
---- /dev/null
-+++ b/mysql-test/r/percona_innodb_use_sys_stats_table.result
-@@ -0,0 +1,3 @@
-+show variables like 'innodb_use_sys_stats%';
-+Variable_name Value
-+innodb_use_sys_stats_table    ON
---- /dev/null
-+++ b/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt
-@@ -0,0 +1 @@
-+--innodb_use_sys_stats_table
---- /dev/null
-+++ b/mysql-test/t/percona_innodb_use_sys_stats_table.test
-@@ -0,0 +1,2 @@
-+--source include/have_innodb.inc
-+show variables like 'innodb_use_sys_stats%';