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

1 files changed, 8 insertions, 4 deletions

diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 31d0b0c3917..e9fd1c2319d 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -29,13 +29,17 @@
 static handler *blackhole_create_handler(TABLE_SHARE *table);
 
 
+static const char blackhole_hton_name[]= "BLACKHOLE";
+static const char blackhole_hton_comment[]=
+  "/dev/null storage engine (anything you write to it disappears)";
+
 /* Blackhole storage engine handlerton */
 
 handlerton blackhole_hton= {
   MYSQL_HANDLERTON_INTERFACE_VERSION,
-  "BLACKHOLE",
+  blackhole_hton_name,
   SHOW_OPTION_YES,
-  "/dev/null storage engine (anything you write to it disappears)",
+  blackhole_hton_comment,
   DB_TYPE_BLACKHOLE_DB,
   NULL,
   0,       /* slot */
@@ -256,9 +260,9 @@ mysql_declare_plugin(blackhole)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &blackhole_hton,
-  blackhole_hton.name,
+  blackhole_hton_name,
   "MySQL AB",
-  "Blackhole Storage Engine",
+  blackhole_hton_comment,
   NULL, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,