summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_berkeley.cc14
-rw-r--r--sql/ha_federated.cc11
-rw-r--r--sql/ha_heap.cc14
-rw-r--r--sql/ha_innodb.cc12
-rw-r--r--sql/ha_myisam.cc12
-rw-r--r--sql/ha_myisammrg.cc12
-rw-r--r--sql/ha_ndbcluster.cc7
-rw-r--r--sql/ha_partition.cc11
8 files changed, 61 insertions, 32 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 0fabd00faa3..ef1876c0e2e 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -125,11 +125,15 @@ static int berkeley_savepoint(THD* thd, void *savepoint);
static int berkeley_release_savepoint(THD* thd, void *savepoint);
static handler *berkeley_create_handler(TABLE_SHARE *table);
+static const char berkeley_hton_name[]= "BerkeleyDB";
+static const char berkeley_hton_comment[]=
+ "Supports transactions and page-level locking";
+
handlerton berkeley_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "BerkeleyDB",
+ berkeley_hton_name,
SHOW_OPTION_YES,
- "Supports transactions and page-level locking",
+ berkeley_hton_comment,
DB_TYPE_BERKELEY_DB,
berkeley_init,
0, /* slot */
@@ -2733,9 +2737,9 @@ mysql_declare_plugin(berkeley)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&berkeley_hton,
- berkeley_hton.name,
- "MySQL AB",
- "BerkeleyDB Storage Engine",
+ berkeley_hton_name,
+ "Sleepycat Software",
+ berkeley_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index f1d2b0025a9..f4fc5f47193 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -370,11 +370,14 @@ static int federated_rollback(THD *thd, bool all);
/* Federated storage engine handlerton */
+static const char federated_hton_name[]= "FEDERATED";
+static const char federated_hton_comment[]= "Federated MySQL storage engine";
+
handlerton federated_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "FEDERATED",
+ federated_hton_name,
SHOW_OPTION_YES,
- "Federated MySQL storage engine",
+ federated_hton_comment,
DB_TYPE_FEDERATED_DB,
federated_db_init,
0, /* slot */
@@ -2813,9 +2816,9 @@ mysql_declare_plugin(federated)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&federated_hton,
- federated_hton.name,
+ federated_hton_name,
"Patrick Galbraith and Brian Aker, MySQL AB",
- "Federated Storage Engine",
+ federated_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 1223de37af8..ca33a31de4b 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -26,11 +26,15 @@
static handler *heap_create_handler(TABLE_SHARE *table);
+static const char heap_hton_name[]= "MEMORY";
+static const char heap_hton_comment[]=
+ "Hash based, stored in memory, useful for temporary tables";
+
handlerton heap_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "MEMORY",
+ heap_hton_name,
SHOW_OPTION_YES,
- "Hash based, stored in memory, useful for temporary tables",
+ heap_hton_comment,
DB_TYPE_HEAP,
NULL,
0, /* slot */
@@ -711,9 +715,9 @@ mysql_declare_plugin(heap)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&heap_hton,
- heap_hton.name,
- NULL,
- heap_hton.comment,
+ heap_hton_name,
+ "MySQL AB",
+ heap_hton_comment,
NULL,
NULL,
0
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 530d513cf21..ad7c5fd2c0e 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -205,11 +205,15 @@ static int innobase_savepoint(THD* thd, void *savepoint);
static int innobase_release_savepoint(THD* thd, void *savepoint);
static handler *innobase_create_handler(TABLE_SHARE *table);
+static const char innobase_hton_name[]= "InnoDB";
+static const char innobase_hton_comment[]=
+ "Supports transactions, row-level locking, and foreign keys";
+
handlerton innobase_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "InnoDB",
+ innobase_hton_name,
SHOW_OPTION_YES,
- "Supports transactions, row-level locking, and foreign keys",
+ innobase_hton_comment,
DB_TYPE_INNODB,
innobase_init,
0, /* slot */
@@ -7439,9 +7443,9 @@ mysql_declare_plugin(innobase)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&innobase_hton,
- innobase_hton.name,
+ innobase_hton_name,
"Innobase OY",
- "InnoDB Storage Engine",
+ innobase_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 9a0a4a9896f..74aa157cbc1 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -56,11 +56,15 @@ static handler *myisam_create_handler(TABLE_SHARE *table);
/* MyISAM handlerton */
+static const char myisam_hton_name[]= "MyISAM";
+static const char myisam_hton_comment[]=
+ "Default engine as of MySQL 3.23 with great performance";
+
handlerton myisam_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "MyISAM",
+ myisam_hton_name,
SHOW_OPTION_YES,
- "Default engine as of MySQL 3.23 with great performance",
+ myisam_hton_comment,
DB_TYPE_MYISAM,
NULL,
0, /* slot */
@@ -1795,9 +1799,9 @@ mysql_declare_plugin(myisam)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&myisam_hton,
- myisam_hton.name,
+ myisam_hton_name,
"MySQL AB",
- "MyISAM Storage Engine",
+ myisam_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 8130a5d939a..89f0f9e3647 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -38,11 +38,15 @@ static handler *myisammrg_create_handler(TABLE_SHARE *table);
/* MyISAM MERGE handlerton */
+static const char myisammrg_hton_name[]= "MRG_MYISAM";
+static const char myisammrg_hton_comment[]=
+ "Collection of identical MyISAM tables";
+
handlerton myisammrg_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "MRG_MYISAM",
+ myisammrg_hton_name,
SHOW_OPTION_YES,
- "Collection of identical MyISAM tables",
+ myisammrg_hton_comment,
DB_TYPE_MRG_MYISAM,
NULL,
0, /* slot */
@@ -580,9 +584,9 @@ mysql_declare_plugin(myisammrg)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&myisammrg_hton,
- myisammrg_hton.name,
+ myisammrg_hton_name,
"MySQL AB",
- "MyISAMMRG Storage Engine",
+ myisammrg_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 89084f72217..a20026c7af9 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -69,6 +69,9 @@ static bool ndbcluster_show_status(THD*,stat_print_fn *,enum ha_stat_type);
static int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info);
static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond);
+static const char ndbcluster_hton_name[]= "ndbcluster";
+static const char ndbcluster_hton_comment[]= "Clustered, fault-tolerant tables";
+
handlerton ndbcluster_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION,
"ndbcluster",
@@ -10287,9 +10290,9 @@ mysql_declare_plugin(ndbcluster)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&ndbcluster_hton,
- ndbcluster_hton.name,
+ ndbcluster_hton_name,
"MySQL AB",
- "NDB Storage Engine",
+ ndbcluster_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 6b29d6588fc..bff21d6681d 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -73,11 +73,14 @@ static handler *partition_create_handler(TABLE_SHARE *share);
static uint partition_flags();
static uint alter_table_flags(uint flags);
+static const char partition_hton_name[]= "partition";
+static const char partition_hton_comment[]= "Partition Storage Engine Helper";
+
handlerton partition_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION,
- "partition",
+ partition_hton_name,
SHOW_OPTION_YES,
- "Partition Storage Engine Helper", /* A comment used by SHOW to describe an engine */
+ partition_hton_comment, /* A comment used by SHOW to describe an engine */
DB_TYPE_PARTITION_DB,
0, /* Method that initializes a storage engine */
0, /* slot */
@@ -5447,9 +5450,9 @@ mysql_declare_plugin(partition)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&partition_hton,
- partition_hton.name,
+ partition_hton_name,
"Mikael Ronstrom, MySQL AB",
- "Partitioning Support",
+ partition_hton_comment,
NULL, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
View Lorry Controller Status