This changes the order of the universe, black is now the new white.

In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 


include/mysql/plugin.h:
  Optional to pass parameter now to init and deinit functions
sql/ha_ndbcluster.cc:
  Cleanup, handlerton is now a pointer.
sql/ha_ndbcluster_binlog.cc:
  Cleanup (handlerton is now a pointer)
sql/ha_ndbcluster_binlog.h:
  Cleanup (handlerton is now a pointer)
sql/ha_partition.cc:
  Cleaned up handlerton change
sql/handler.cc:
  Cheanup of handlerton change
sql/item_sum.cc:
  Cleanedup of handlerton change
sql/log.cc:
  Cleanup of handlerton change
sql/mysql_priv.h:
  Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)
sql/mysqld.cc:
  Cleanup of handlerton changes and reverted have variable patch
sql/partition_info.cc:
  Cleanup of handlerton (we need to clean this up a bit more).
sql/set_var.cc:
  Cleanup related to handlerton changes
sql/sql_cache.cc:
  Handlerton changes cleanup
sql/sql_insert.cc:
  Handlerton changes cleanup.
sql/sql_partition.cc:
  Handlerton cleanup changes
sql/sql_plugin.cc:
  Handlerton changes.
  
  init() can now be controlled by a plugin specific startup. 
  
  There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines.
sql/sql_select.cc:
  Handlerton cleanup changes
sql/sql_show.cc:
  Handlerton cleanup changes
sql/sql_table.cc:
  Handlerton cleanup changes
sql/table.cc:
  Cleanup
storage/archive/ha_archive.cc:
  Cleanup
storage/archive/ha_archive.h:
  Cleanup
storage/blackhole/ha_blackhole.cc:
  Cleanup
storage/csv/ha_tina.cc:
  Cleanup
storage/example/ha_example.cc:
  Cleanup
storage/federated/ha_federated.cc:
  Cleanup
storage/heap/ha_heap.cc:
  Cleanup
storage/innobase/handler/ha_innodb.cc:
  Cleanup
storage/myisam/ha_myisam.cc:
  Cleanup
storage/myisammrg/ha_myisammrg.cc:
  Cleanup

1 files changed, 31 insertions, 27 deletions

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 84810fb3324..97c28dd1fa5 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -477,13 +477,6 @@ err:
 void plugin_deinitialize(struct st_plugin_int *plugin)
 {
 
-  if (plugin_type_deinitialize[plugin->plugin->type] &&
-      (*plugin_type_deinitialize[plugin->plugin->type])(plugin))
-  {
-    sql_print_error("Plugin '%s' of type %s failed deinitialization",
-                    plugin->name.str, plugin_type_names[plugin->plugin->type]);
-  }
-
   if (plugin->plugin->status_vars)
   {
 #ifdef FIX_LATER
@@ -504,10 +497,18 @@ void plugin_deinitialize(struct st_plugin_int *plugin)
 #endif /* FIX_LATER */
   }
 
-  if (plugin->plugin->deinit)
+  if (plugin_type_deinitialize[plugin->plugin->type])
+  {
+    if ((*plugin_type_deinitialize[plugin->plugin->type])(plugin))
+    {
+      sql_print_error("Plugin '%s' of type %s failed deinitialization",
+                      plugin->name.str, plugin_type_names[plugin->plugin->type]);
+    } 
+  }
+  else if (plugin->plugin->deinit)
   {
     DBUG_PRINT("info", ("Deinitializing plugin: '%s'", plugin->name.str));
-    if (plugin->plugin->deinit())
+    if (plugin->plugin->deinit(NULL))
     {
       DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.",
                              plugin->name.str));
@@ -556,6 +557,27 @@ static int plugin_initialize(struct st_plugin_int *plugin)
 {
   DBUG_ENTER("plugin_initialize");
 
+  if (plugin_type_initialize[plugin->plugin->type])
+  {
+    if ((*plugin_type_initialize[plugin->plugin->type])(plugin))
+    {
+      sql_print_error("Plugin '%s' registration as a %s failed.",
+                      plugin->name.str, plugin_type_names[plugin->plugin->type]);
+      goto err;
+    }
+  }
+  else if (plugin->plugin->init)
+  {
+    if (plugin->plugin->init(NULL))
+    {
+      sql_print_error("Plugin '%s' init function returned error.",
+                      plugin->name.str);
+      goto err;
+    }
+  }
+
+  plugin->state= PLUGIN_IS_READY;
+
   if (plugin->plugin->status_vars)
   {
 #ifdef FIX_LATER
@@ -576,24 +598,6 @@ static int plugin_initialize(struct st_plugin_int *plugin)
     add_status_vars(plugin->plugin->status_vars); // add_status_vars makes a copy
 #endif /* FIX_LATER */
   }
-  if (plugin->plugin->init)
-  {
-    if (plugin->plugin->init())
-    {
-      sql_print_error("Plugin '%s' init function returned error.",
-                      plugin->name.str);
-      goto err;
-    }
-  }
-  if (plugin_type_initialize[plugin->plugin->type] &&
-      (*plugin_type_initialize[plugin->plugin->type])(plugin))
-  {
-    sql_print_error("Plugin '%s' registration as a %s failed.",
-                    plugin->name.str, plugin_type_names[plugin->plugin->type]);
-    goto err;
-  }
-
-  plugin->state= PLUGIN_IS_READY;
 
   DBUG_RETURN(0);
 err: