Makefile.am:

  Extended test section
  Removed duplicate EXTRA_DIST

Makefile.am

@@ -149,13 +149,25 @@ test-force-mem:
 
 test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=normal --report-features
+	@PERL@ ./mysql-test-run.pl --comment=normal --force --timer \
+	--skip-ndbcluster --report-features
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol
+	@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
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \
+	--ps-protocol --mysqld=--binlog-format=row
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \
+	--with-ndbcluster-only
 
 test-bt-debug:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=debug --report-features
+	@PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \
+	--skip-ndbcluster --skip-rpl --report-features
 
 # Keep these for a while
 test-pl:	test

client/Makefile.am

@@ -34,7 +34,7 @@ LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
 noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
 				client_priv.h
 
-EXTRA_DIST =			get_password.c CMakeLists.txt
+EXTRA_DIST =			get_password.c CMakeLists.txt echo.c
 
 bin_PROGRAMS =			mysql \
 				mysqladmin \
@@ -96,7 +96,6 @@ DEFS =			-DUNDEF_THREADS_HACK \
 
 sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
 strings_src=decimal.c
-EXTRA_DIST =		get_password.c CMakeLists.txt echo.c
 
 link_sources:
 	for f in $(sql_src) ; do \