WL#3201 post-review fixups

  end plugin/module naming schizophrenia
  fixup shell code and m4 macro comments
  cmakelists.txt included in EXTRA_DIST

BUILD/SETUP.sh

@@ -147,9 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static"
 local_infile_configs="--enable-local-infile"
 
 
-max_no_embedded_configs="$SSL_LIBRARY --with-modules=max"
-max_no_ndb_configs="$SSL_LIBRARY --with-modules=max-no-ndb --with-embedded-server"
-max_configs="$SSL_LIBRARY --with-modules=max --with-embedded-server"
+max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"
+max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"
+max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"
 
 #
 # CPU and platform specific compilation flags.

configure.in

@@ -54,81 +54,81 @@ romanian russian serbian slovak spanish swedish ukrainian"
 
 MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],
         [Archive Storage Engine], [max,max-no-ndb])
-MYSQL_MODULE_DIRECTORY(archive, [storage/archive])
-MYSQL_MODULE_STATIC(archive,    [libarchive.a])
-MYSQL_MODULE_DYNAMIC(archive,   [ha_archive.la])
+MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])
+MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])
+MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])
 
 MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],
         [Transactional Tables using BerkeleyDB], [max,max-no-ndb])
-MYSQL_MODULE_DIRECTORY(berkeley,[storage/bdb])
-MYSQL_MODULE_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])
-MYSQL_MODULE_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])
+MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])
+MYSQL_PLUGIN_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])
+MYSQL_PLUGIN_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])
 
 MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
         [Basic Write-only Read-never tables], [max,max-no-ndb])
-MYSQL_MODULE_DIRECTORY(blackhole, [storage/blackhole])
-MYSQL_MODULE_STATIC(blackhole,  [libblackhole.a])
-MYSQL_MODULE_DYNAMIC(blackhole, [ha_blackhole.la])
+MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
+MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.a])
+MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
 
 MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],
         [Stores tables in text CSV format])
-MYSQL_MODULE_DIRECTORY(csv,     [storage/csv])
-MYSQL_MODULE_STATIC(csv,        [libcsv.a])
+MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])
+MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])
+MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging
 
 MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],
         [Skeleton for Storage Engines for developers], [max,max-no-ndb])
-MYSQL_MODULE_DIRECTORY(example, [storage/example])
-MYSQL_MODULE_STATIC(example,    [libexample.a])
-MYSQL_MODULE_DYNAMIC(example,   [ha_example.la])
+MYSQL_PLUGIN_DIRECTORY(example, [storage/example])
+MYSQL_PLUGIN_STATIC(example,    [libexample.a])
+MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])
 
 MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
         [Connects to tables on remote MySQL servers], [max,max-no-ndb])
 
-MYSQL_MODULE(ftexample,         [Simple Parser],
+MYSQL_PLUGIN(ftexample,         [Simple Parser],
         [Simple full-text parser plugin])
-MYSQL_MODULE_DIRECTORY(ftexample, [plugin/fulltext])
-MYSQL_MODULE_DYNAMIC(ftexample, [mypluglib.la])
+MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])
+MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])
 
 MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],
         [In memory hashed tables])
-MYSQL_MODULE_DIRECTORY(heap,    [storage/heap])
-MYSQL_MODULE_STATIC(heap,       [libheap.a])
+MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])
+MYSQL_PLUGIN_STATIC(heap,       [libheap.a])
+MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables
 
 MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_MODULE_DIRECTORY(innobase, [storage/innobase])
-MYSQL_MODULE_STATIC(innobase,   [libinnobase.a])
-MYSQL_MODULE_ACTIONS(innobase,  [
+MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
+MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
+MYSQL_PLUGIN_ACTIONS(innobase,  [
   AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
   AC_SUBST(innodb_system_libs)
 ])
 
 MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
         [Traditional non-transactional MySQL tables])
-MYSQL_MODULE_DIRECTORY(myisam,  [storage/myisam])
-MYSQL_MODULE_STATIC(myisam,     [libmyisam.a])
+MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])
+MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])
+MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default
 
 MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
         [Merge multiple MySQL tables into one])
-MYSQL_MODULE_DIRECTORY(myisammrg,[storage/myisammrg])
-MYSQL_MODULE_STATIC(myisammrg,  [libmyisammrg.a])
+MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
+MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])
+MYSQL_PLUGIN_MANDATORY(myisammrg)
 
 MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
         [High Availability Clustered tables], [max])
-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_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])
+MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
+MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
 
 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
-MYSQL_MODULE_MANDATORY(myisam)  dnl Default
-MYSQL_MODULE_MANDATORY(myisammrg)
-
 dnl -- ndbcluster requires partition to be enabled
-MYSQL_MODULE_DEPENDS(ndbcluster, partition)
+MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])
+
 
 #####
 #####

storage/archive/Makefile.am

@@ -57,5 +57,6 @@ archive_test_LDADD =	$(top_builddir)/mysys/libmysys.a \
 archive_test_LDFLAGS = @NOINST_LDFLAGS@
 
 
+EXTRA_DIST =		cmakelists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%

storage/blackhole/Makefile.am

@@ -47,5 +47,6 @@ libblackhole_a_CFLAGS =	$(AM_CFLAGS)
 libblackhole_a_SOURCES=	ha_blackhole.cc
 
 
+EXTRA_DIST =		cmakelists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%

storage/csv/Makefile.am

@@ -41,5 +41,6 @@ noinst_LIBRARIES =	@plugin_csv_static_target@
 libcsv_a_CXXFLAGS =	$(AM_CFLAGS)
 libcsv_a_SOURCES =	ha_tina.cc
 
+EXTRA_DIST =		cmakelists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%

storage/example/Makefile.am

@@ -47,5 +47,6 @@ libexample_a_CFLAGS =	$(AM_CFLAGS)
 libexample_a_SOURCES=	ha_example.cc
 
 
+EXTRA_DIST =		cmakelists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%