Makefile.am:

  Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin

3 files changed, 35 insertions, 25 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 629618609a3..24f921a4877 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -19,11 +19,24 @@ EXTRA_DIST =		mysql.info INSTALL-BINARY @extra_docs@
 # automake only seems to take care of this automatically,
 # if we're building the info page from texi directly.
 install-data-hook:	$(srcdir)/mysql.info
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
+	if test `basename $(prefix)` = "mysql" ; then \
+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/docs ; \
+	  $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(prefix)/docs ; \
+	  test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(prefix)/docs ; \
+	else \
+	  $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) ; \
+	  $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir) ; \
+	  test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir) ; \
+	fi
 
 uninstall-local:
-	@RM@ -f $(DESTDIR)$(infodir)/mysql.info
+	if test `basename $(prefix)` = "mysql" ; then \
+	  @RM@ -f $(DESTDIR)$(prefix)/docs/mysql.info ; \
+	  @RM@ -f $(DESTDIR)$(prefix)/docs/ChangeLog ; \
+	else \
+	  @RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
+	  @RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
+	fi
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/Makefile.am b/Makefile.am
index f999df86acf..60b4f9bd07c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,45 +132,40 @@ test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \
 	        --skip-ndbcluster --ps-protocol
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \
-	        --skip-ndbcluster --mysqld=--binlog-format=row
 	-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
 	  cd mysql-test ; \
 	    MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \
-	          --ps-protocol --mysqld=--binlog-format=row ; \
+	      @PERL@ ./mysql-test-run.pl --comment=ndb+rpl_ndb+ps --force --timer \
+	          --ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \
 	    MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \
+	      @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
 	          --with-ndbcluster-only ; \
 	else \
 	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
 	fi
-	-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
-	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
-	          --embedded-server --skip-rpl --skip-ndbcluster ; \
-	else \
-	  echo "no program found for 'embedded' tests - skipped testing" ; \
-	fi
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
+	      @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
 	fi
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
-	      @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
+	      @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
+	fi
+	-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+	          --embedded-server --skip-rpl --skip-ndbcluster ; \
+	else \
+	  echo "no program found for 'embedded' tests - skipped testing" ; \
 	fi
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
 
 # Re-enable the "jp" suite when bug#28563 is fixed
 #	-cd mysql-test ; MTR_BUILD_THREAD=auto \
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 7f7674eefc9..5cbd85c62b4 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -341,7 +341,6 @@ BuildMySQL "--enable-shared \
 %endif
 		--with-archive-storage-engine \
 		--with-csv-storage-engine \
-		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
 %if %{FEDERATED_BUILD}
 		--with-federated-storage-engine \
@@ -373,13 +372,16 @@ BuildMySQL "--enable-shared \
 		--with-innodb \
 %if %{CLUSTER_BUILD}
 		--with-ndbcluster \
+%else
+		--without-ndbcluster \
 %endif
 		--with-archive-storage-engine \
 		--with-csv-storage-engine \
-		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
 %if %{FEDERATED_BUILD}
 		--with-federated-storage-engine \
+%else
+		--without-federated-storage-engine \
 %endif
 	        --with-partition \
 		--with-embedded-server \