Commit fa8fcecb authored by unknown's avatar unknown
Browse files

Cleanup for handlerton structure to allow for loadable engine work. This is... 

Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 


sql/examples/ha_archive.cc:
  Now declared externally.
sql/examples/ha_example.cc:
  Now declared externally
sql/examples/ha_tina.cc:
  Now declared externally
sql/ha_berkeley.cc:
  Now declared externally
sql/ha_blackhole.cc:
  Now declared externally
sql/ha_federated.cc:
  Now declared externally.
sql/ha_heap.cc:
  Now declared externally.
sql/ha_innodb.cc:
  Now declared externally.
sql/ha_myisam.cc:
  Now declared externally
sql/ha_myisammrg.cc:
  Now declared externally.
sql/ha_ndbcluster.cc:
  Now declared externally.
sql/handler.cc:
  Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array).
sql/handler.h:
  New alias structure and change to show_table_st to place handlerton in the structure.
parent 78cf7b19

sql/examples/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static HASH archive_open_tables; 
#define ARCHIVE_CHECK_HEADER 254 // The number we use to determine corruption



/* dummy handlerton - only to have something to return from archive_db_init */

static handlerton archive_hton = {

handlerton archive_hton = {

  "archive",

  0,       /* slot */

  0,       /* savepoint size. */

sql/examples/ha_example.cc

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
#include "ha_example.h"





static handlerton example_hton= {

handlerton example_hton= {

  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

sql/examples/ha_tina.cc

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ pthread_mutex_t tina_mutex; 
static HASH tina_open_tables;

static int tina_init= 0;



static handlerton tina_hton= {

handlerton tina_hton= {

  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

sql/ha_berkeley.cc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int berkeley_close_connection(THD *thd); 
static int berkeley_commit(THD *thd, bool all);

static int berkeley_rollback(THD *thd, bool all);



static handlerton berkeley_hton = {

handlerton berkeley_hton = {

  "BerkeleyDB",

  0, /* slot */

  0, /* savepoint size */

sql/ha_blackhole.cc

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


/* Blackhole storage engine handlerton */



static handlerton blackhole_hton= {

handlerton blackhole_hton= {

  "BLACKHOLE",

  0,       /* slot */

  0,       /* savepoint size. */