summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2006-05-02 04:11:00 -0700
committerunknown <acurtis@xiphis.org>2006-05-02 04:11:00 -0700
commitad4c32c89a1b12a38518b589c944ac06ae023b50 (patch)
tree5d9330a6ecd663b4caf7da376b8a6372a8edeac7 /sql/ha_myisammrg.cc
parentb0efe477fbec37c273098bc85263b195544f2edc (diff)
downloadmariadb-git-ad4c32c89a1b12a38518b589c944ac06ae023b50.tar.gz
WL#3201 additional post-review fixes
config/ac-macros/plugins.m4: remove unneccessary `ifelse' add comment, add missing dnl configure.in: change description for heap engine include/mysql/plugin.h: change macro name sql/ha_berkeley.cc: store strings statically for use in handlerton and plugin structures sql/ha_federated.cc: store strings statically for use in handlerton and plugin structures sql/ha_heap.cc: store strings statically for use in handlerton and plugin structures sql/ha_innodb.cc: store strings statically for use in handlerton and plugin structures sql/ha_myisam.cc: store strings statically for use in handlerton and plugin structures sql/ha_myisammrg.cc: store strings statically for use in handlerton and plugin structures sql/ha_ndbcluster.cc: store strings statically for use in handlerton and plugin structures sql/ha_partition.cc: store strings statically for use in handlerton and plugin structures storage/archive/ha_archive.cc: store strings statically for use in handlerton and plugin structures storage/blackhole/ha_blackhole.cc: store strings statically for use in handlerton and plugin structures storage/csv/ha_tina.cc: store strings statically for use in handlerton and plugin structures storage/example/ha_example.cc: store strings statically for use in handlerton and plugin structures
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc12
1 files changed, 8 insertions, 4 deletions
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 */,