Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  gbichot4.local:/home/mysql_src/mysql-maria-monty

storage/maria/unittest/Makefile.am

@@ -18,7 +18,8 @@ AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
                   -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
 INCLUDES         = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
                   -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
-EXTRA_DIST       = CMakeLists.txt
+EXTRA_DIST=	ma_test_all-t CMakeLists.txt \
+		ma_test_recovery.pl ma_test_recovery.expected
 # Only reason to link with libmyisam.a here is that it's where some fulltext
 # pieces are (but soon we'll remove fulltext dependencies from Maria).
 LDADD=			$(top_builddir)/unittest/mytap/libmytap.a \