This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).

Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 

2 files changed, 4 insertions, 5 deletions

diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index a5a03f4f849..0fd5f0ed099 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -142,13 +142,13 @@ static HASH archive_open_tables;
 static handler *archive_create_handler(handlerton *hton, 
                                        TABLE_SHARE *table, 
                                        MEM_ROOT *mem_root);
+int archive_db_end(handlerton *hton, ha_panic_function type);
+
 /*
   Number of rows that will force a bulk insert.
 */
 #define ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT 2
 
-handlerton *archive_hton;
-
 static handler *archive_create_handler(handlerton *hton,
                                        TABLE_SHARE *table, 
                                        MEM_ROOT *mem_root)
@@ -182,6 +182,7 @@ static byte* archive_get_key(ARCHIVE_SHARE *share,uint *length,
 int archive_db_init(void *p)
 {
   DBUG_ENTER("archive_db_init");
+  handlerton *archive_hton;
   if (archive_inited)
     DBUG_RETURN(FALSE);
   archive_hton= (handlerton *)p;
@@ -230,7 +231,7 @@ int archive_db_done(void *p)
 }
 
 
-int archive_db_end(ha_panic_function type)
+int archive_db_end(handlerton *hton, ha_panic_function type)
 {
   return archive_db_done(NULL);
 }
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index 7f64f2f385d..1a601c8451a 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.h
@@ -139,5 +139,3 @@ public:
   bool check_and_repair(THD *thd);
 };
 
-int archive_db_end(ha_panic_function type);
-