add 2 placeholder values for config and system variables.

14 files changed, 42 insertions, 14 deletions

diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 156c3312c53..739f7bc5fc6 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -60,7 +60,7 @@ __MYSQL_DECLARE_PLUGIN(NAME, \
                  builtin_ ## NAME ## _sizeof_struct_st_plugin, \
                  builtin_ ## NAME ## _plugin)
 
-#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}}
+#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0}}
 
 /*
   declarations for SHOW STATUS support in plugins
@@ -96,6 +96,8 @@ struct st_mysql_plugin
   int (*deinit)(void);  /* the function to invoke when plugin is unloaded */
   unsigned int version; /* plugin version (for SHOW PLUGINS)            */
   struct st_mysql_show_var *status_vars;
+  void * __reserved1;   /* placeholder for system variables             */
+  void * __reserved2;   /* placeholder for config options               */
 };
 
 /*************************************************************************
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index beb02128774..34350e317ba 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -225,7 +225,9 @@ mysql_declare_plugin(ftexample)
   simple_parser_plugin_init,  /* init function (when loaded)     */
   simple_parser_plugin_deinit,/* deinit function (when unloaded) */
   0x0001,                     /* version                         */
-  simple_status               /* status variables                */
+  simple_status,              /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 7f4d6abd4b7..9f7965ffb3a 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -7623,7 +7623,9 @@ mysql_declare_plugin(innobase)
   innobase_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  innodb_status_variables_export
+  innodb_status_variables_export,/* status variables             */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 486bbd35fc0..cc5e5b5040a 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -10598,7 +10598,9 @@ mysql_declare_plugin(ndbcluster)
   ndbcluster_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  ndb_status_variables_export
+  ndb_status_variables_export,/* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index ee0667b92bd..43303bb1a03 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -5598,7 +5598,9 @@ mysql_declare_plugin(partition)
   partition_initialize, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100, /* 1.0 */
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/sql/log.cc b/sql/log.cc
index b93d36cf630..50b9119f7e6 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -4678,6 +4678,8 @@ mysql_declare_plugin(binlog)
   binlog_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index de8b50fd2f3..3029b1db53e 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1583,7 +1583,9 @@ mysql_declare_plugin(archive)
   archive_db_init, /* Plugin Init */
   archive_db_done, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index d22d9372e0d..c1141cce5ae 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -223,6 +223,8 @@ mysql_declare_plugin(blackhole)
   blackhole_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 2fe2afeb470..ce19202d745 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1529,7 +1529,9 @@ mysql_declare_plugin(csv)
   tina_init_func, /* Plugin Init */
   tina_done_func, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 704ea757749..6986796cb2e 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -715,7 +715,9 @@ mysql_declare_plugin(example)
   example_init_func, /* Plugin Init */
   example_done_func, /* Plugin Deinit */
   0x0001 /* 0.1 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 98f48b09ba6..456b6c73f3c 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2896,7 +2896,9 @@ mysql_declare_plugin(federated)
   federated_db_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 317f85d26f2..57777410bea 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -708,6 +708,8 @@ mysql_declare_plugin(heap)
   heap_init,
   NULL,
   0x0100, /* 1.0 */
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 209478ee9a5..6a32ba95eee 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -1800,7 +1800,9 @@ mysql_declare_plugin(myisam)
   myisam_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100, /* 1.0 */
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;
 
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 8c767e32b83..2d1628e5e4f 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -573,6 +573,8 @@ mysql_declare_plugin(myisammrg)
   myisammrg_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100, /* 1.0 */
-  0
+  NULL,                       /* status variables                */
+  NULL,                       /* system variables                */
+  NULL                        /* config options                  */
 }
 mysql_declare_plugin_end;