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, 10 insertions, 9 deletions

diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 6986796cb2e..c4c2524a118 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -78,7 +78,7 @@ static int example_init_func();
 static bool example_init_func_for_handlerton();
 static int example_panic(enum ha_panic_function flag);
 
-handlerton example_hton;
+handlerton *example_hton;
 
 /* Variables for example share methods */
 static HASH example_open_tables; // Hash used to track open tables
@@ -96,25 +96,26 @@ static byte* example_get_key(EXAMPLE_SHARE *share,uint *length,
   return (byte*) share->table_name;
 }
 
-static int example_init_func()
+static int example_init_func(void *p)
 {
   DBUG_ENTER("example_init_func");
   if (!example_init)
   {
+    example_hton= (handlerton *)p;
     example_init= 1;
     VOID(pthread_mutex_init(&example_mutex,MY_MUTEX_INIT_FAST));
     (void) hash_init(&example_open_tables,system_charset_info,32,0,0,
                      (hash_get_key) example_get_key,0,0);
 
-    example_hton.state=   SHOW_OPTION_YES;
-    example_hton.db_type= DB_TYPE_EXAMPLE_DB;
-    example_hton.create=  example_create_handler;
-    example_hton.flags=   HTON_CAN_RECREATE;
+    example_hton->state=   SHOW_OPTION_YES;
+    example_hton->db_type= DB_TYPE_EXAMPLE_DB;
+    example_hton->create=  example_create_handler;
+    example_hton->flags=   HTON_CAN_RECREATE;
   }
   DBUG_RETURN(0);
 }
 
-static int example_done_func()
+static int example_done_func(void *p)
 {
   int error= 0;
   DBUG_ENTER("example_done_func");
@@ -207,7 +208,7 @@ static handler* example_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
 
 
 ha_example::ha_example(TABLE_SHARE *table_arg)
-  :handler(&example_hton, table_arg)
+  :handler(example_hton, table_arg)
 {}
 
 /*
@@ -702,7 +703,7 @@ int ha_example::create(const char *name, TABLE *table_arg,
 }
 
 struct st_mysql_storage_engine example_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, &example_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION, example_hton };
 
 
 mysql_declare_plugin(example)