Commit 09c88914 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents 75cc4ef2 6b32d44d
......@@ -323,17 +323,12 @@ execute stmt4;
Engine Support Comment
MyISAM YES/NO Default engine as of MySQL 3.23 with great performance
MEMORY YES/NO Hash based, stored in memory, useful for temporary tables
HEAP YES/NO Alias for MEMORY
MERGE YES/NO Collection of identical MyISAM tables
MRG_MYISAM YES/NO Alias for MERGE
MRG_MYISAM YES/NO Collection of identical MyISAM tables
ISAM YES/NO Obsolete storage engine, now replaced by MyISAM
MRG_ISAM YES/NO Obsolete storage engine, now replaced by MERGE
InnoDB YES/NO Supports transactions, row-level locking, and foreign keys
INNOBASE YES/NO Alias for INNODB
BDB YES/NO Supports transactions and page-level locking
BERKELEYDB YES/NO Alias for BDB
BERKELEYDB YES/NO Supports transactions and page-level locking
NDBCLUSTER YES/NO Clustered, fault-tolerant, memory-based tables
NDB YES/NO Alias for NDBCLUSTER
EXAMPLE YES/NO Example storage engine
ARCHIVE YES/NO Archive storage engine
CSV YES/NO CSV storage engine
......
......@@ -147,7 +147,7 @@ Variable_name Value
storage_engine MEMORY
show global variables like 'storage_engine';
Variable_name Value
storage_engine MERGE
storage_engine MRG_MYISAM
set GLOBAL query_cache_size=100000;
set GLOBAL myisam_max_sort_file_size=2000000;
show global variables like 'myisam_max_sort_file_size';
......
......@@ -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. */
......
......@@ -73,7 +73,7 @@
#include "ha_example.h"
static handlerton example_hton= {
handlerton example_hton= {
"CSV",
0, /* slot */
0, /* savepoint size. */
......
......@@ -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. */
......
......@@ -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 */
......
......@@ -26,7 +26,7 @@
/* Blackhole storage engine handlerton */
static handlerton blackhole_hton= {
handlerton blackhole_hton= {
"BLACKHOLE",
0, /* slot */
0, /* savepoint size. */
......
......@@ -693,7 +693,7 @@ error:
/* Federated storage engine handlerton */
static handlerton federated_hton= {
handlerton federated_hton= {
"FEDERATED",
0, /* slot */
0, /* savepoint size. */
......
......@@ -23,7 +23,7 @@
#include <myisampack.h>
#include "ha_heap.h"
static handlerton heap_hton= {
handlerton heap_hton= {
"MEMORY",
0, /* slot */
0, /* savepoint size. */
......
......@@ -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_release_savepoint(THD* thd, void *savepoint);
static handlerton innobase_hton = {
handlerton innobase_hton = {
"InnoDB",
0, /* slot */
sizeof(trx_named_savept_t), /* savepoint size. TODO: use it */
......
......@@ -46,7 +46,7 @@ TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names)-1,"",
/* MyISAM handlerton */
static handlerton myisam_hton= {
handlerton myisam_hton= {
"MyISAM",
0, /* slot */
0, /* savepoint size. */
......
......@@ -34,8 +34,8 @@
/* MyISAM MERGE handlerton */
static handlerton myisammrg_hton= {
"MRG_MyISAM",
handlerton myisammrg_hton= {
"MRG_MYISAM",
0, /* slot */
0, /* savepoint size. */
NULL, /* close_connection */
......
......@@ -49,7 +49,7 @@ static int ndbcluster_close_connection(THD *thd);
static int ndbcluster_commit(THD *thd, bool all);
static int ndbcluster_rollback(THD *thd, bool all);
static handlerton ndbcluster_hton = {
handlerton ndbcluster_hton = {
"ndbcluster",
0, /* slot */
0, /* savepoint size */
......
This diff is collapsed.
......@@ -177,13 +177,6 @@ enum db_type
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,
ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED,
ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT };
......@@ -363,6 +356,20 @@ typedef struct
uint32 flags; /* global handler flags */
} 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 */
#define HTON_NO_FLAGS 0
#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