WL#3201

  Fixes after first review

config/ac-macros/ha_ndbcluster.m4

@@ -307,9 +307,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
 
   AC_SUBST(NDB_DEFS)
   AC_SUBST(ndb_cxxflags_fix)
-])
 
-AC_DEFUN([NDBCLUSTER_CONFIG_FILES], [
   AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
    storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
    storage/ndb/docs/Makefile dnl

configure.in

@@ -123,8 +123,8 @@ MYSQL_MODULE_DIRECTORY(ndbcluster,[storage/ndb])
 MYSQL_MODULE_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
 MYSQL_MODULE_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
 
-MYSQL_STORAGE_ENGINE(partition, partition, [Partition Engine],
-        [MySQL Table Partitioning Engine], [max,max-no-ndb])
+MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
+        [MySQL Partitioning Support], [max,max-no-ndb])
 
 MYSQL_MODULE_MANDATORY(csv)     dnl Used for logging
 MYSQL_MODULE_MANDATORY(heap)    dnl Memory tables
@@ -2624,8 +2624,6 @@ done
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
-NDBCLUSTER_CONFIG_FILES
-
 # Output results
 AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  strings/Makefile regex/Makefile dnl

sql/ha_partition.cc

@@ -5498,7 +5498,7 @@ mysql_declare_plugin(partition)
   &partition_hton,
   partition_hton.name,
   "Mikael Ronstrom, MySQL AB",
-  "Partitioning Engine",
+  "Partitioning Support",
   NULL, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,

sql/handler.cc

@@ -44,6 +44,9 @@
 #include "ha_innodb.h"
 #endif
 
+/* While we have legacy_db_type, we have this array to
+   check for dups and to find handlerton from legacy_db_type.
+   Remove when legacy_db_type is finally gone */
 static handlerton *installed_htons[128];
 
 #define BITMAP_STACKBUF_SIZE (128/8)