Commit fa8fcecb authored by unknown's avatar unknown

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
...@@ -136,7 +136,7 @@ static HASH archive_open_tables; ...@@ -136,7 +136,7 @@ static HASH archive_open_tables;
#define ARCHIVE_CHECK_HEADER 254 // The number we use to determine corruption #define ARCHIVE_CHECK_HEADER 254 // The number we use to determine corruption
/* dummy handlerton - only to have something to return from archive_db_init */ /* dummy handlerton - only to have something to return from archive_db_init */
static handlerton archive_hton = { handlerton archive_hton = {
"archive", "archive",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
#include "ha_example.h" #include "ha_example.h"
static handlerton example_hton= { handlerton example_hton= {
"CSV", "CSV",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -54,7 +54,7 @@ pthread_mutex_t tina_mutex; ...@@ -54,7 +54,7 @@ pthread_mutex_t tina_mutex;
static HASH tina_open_tables; static HASH tina_open_tables;
static int tina_init= 0; static int tina_init= 0;
static handlerton tina_hton= { handlerton tina_hton= {
"CSV", "CSV",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -107,7 +107,7 @@ static int berkeley_close_connection(THD *thd); ...@@ -107,7 +107,7 @@ static int berkeley_close_connection(THD *thd);
static int berkeley_commit(THD *thd, bool all); static int berkeley_commit(THD *thd, bool all);
static int berkeley_rollback(THD *thd, bool all); static int berkeley_rollback(THD *thd, bool all);
static handlerton berkeley_hton = { handlerton berkeley_hton = {
"BerkeleyDB", "BerkeleyDB",
0, /* slot */ 0, /* slot */
0, /* savepoint size */ 0, /* savepoint size */
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* Blackhole storage engine handlerton */ /* Blackhole storage engine handlerton */
static handlerton blackhole_hton= { handlerton blackhole_hton= {
"BLACKHOLE", "BLACKHOLE",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -690,7 +690,7 @@ error: ...@@ -690,7 +690,7 @@ error:
/* Federated storage engine handlerton */ /* Federated storage engine handlerton */
static handlerton federated_hton= { handlerton federated_hton= {
"FEDERATED", "FEDERATED",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <myisampack.h> #include <myisampack.h>
#include "ha_heap.h" #include "ha_heap.h"
static handlerton heap_hton= { handlerton heap_hton= {
"MEMORY", "MEMORY",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -206,7 +206,7 @@ static int innobase_rollback_to_savepoint(THD* thd, void *savepoint); ...@@ -206,7 +206,7 @@ static int innobase_rollback_to_savepoint(THD* thd, void *savepoint);
static int innobase_savepoint(THD* thd, void *savepoint); static int innobase_savepoint(THD* thd, void *savepoint);
static int innobase_release_savepoint(THD* thd, void *savepoint); static int innobase_release_savepoint(THD* thd, void *savepoint);
static handlerton innobase_hton = { handlerton innobase_hton = {
"InnoDB", "InnoDB",
0, /* slot */ 0, /* slot */
sizeof(trx_named_savept_t), /* savepoint size. TODO: use it */ sizeof(trx_named_savept_t), /* savepoint size. TODO: use it */
......
...@@ -46,7 +46,7 @@ TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names)-1,"", ...@@ -46,7 +46,7 @@ TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names)-1,"",
/* MyISAM handlerton */ /* MyISAM handlerton */
static handlerton myisam_hton= { handlerton myisam_hton= {
"MyISAM", "MyISAM",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
/* MyISAM MERGE handlerton */ /* MyISAM MERGE handlerton */
static handlerton myisammrg_hton= { handlerton myisammrg_hton= {
"MRG_MyISAM", "MRG_MYISAM",
0, /* slot */ 0, /* slot */
0, /* savepoint size. */ 0, /* savepoint size. */
NULL, /* close_connection */ NULL, /* close_connection */
......
...@@ -49,7 +49,7 @@ static int ndbcluster_close_connection(THD *thd); ...@@ -49,7 +49,7 @@ static int ndbcluster_close_connection(THD *thd);
static int ndbcluster_commit(THD *thd, bool all); static int ndbcluster_commit(THD *thd, bool all);
static int ndbcluster_rollback(THD *thd, bool all); static int ndbcluster_rollback(THD *thd, bool all);
static handlerton ndbcluster_hton = { handlerton ndbcluster_hton = {
"ndbcluster", "ndbcluster",
0, /* slot */ 0, /* slot */
0, /* savepoint size */ 0, /* savepoint size */
......
This diff is collapsed.
...@@ -177,13 +177,6 @@ enum db_type ...@@ -177,13 +177,6 @@ enum db_type
DB_TYPE_DEFAULT // Must be last DB_TYPE_DEFAULT // Must be last
}; };
struct show_table_type_st {
const char *type;
SHOW_COMP_OPTION *value;
const char *comment;
enum db_type db_type;
};
enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED, ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED,
ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT }; ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT };
...@@ -363,6 +356,20 @@ typedef struct ...@@ -363,6 +356,20 @@ typedef struct
uint32 flags; /* global handler flags */ uint32 flags; /* global handler flags */
} handlerton; } handlerton;
struct show_table_type_st {
const char *type;
SHOW_COMP_OPTION *value;
const char *comment;
enum db_type db_type;
handlerton *ht;
};
struct show_table_alias_st {
const char *alias;
const char *type;
show_table_type_st *st;
};
/* Possible flags of a handlerton */ /* Possible flags of a handlerton */
#define HTON_NO_FLAGS 0 #define HTON_NO_FLAGS 0
#define HTON_CLOSE_CURSORS_AT_COMMIT 1 #define HTON_CLOSE_CURSORS_AT_COMMIT 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment