Fix merge errors in configure.in

Add vcol test suite to `make dist`.

configure.in

@@ -4,9 +4,6 @@ dnl Process this file with autoconf to produce a configure script.
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-# Minimum Autoconf version required.
-AC_PREREQ(2.59)
-
 # Remember to also update version.c in ndb.
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc / check_master_version().
@@ -15,7 +12,7 @@ AC_PREREQ(2.59)
 # MySQL version number.
 #
 # Note: the following line must be parseable by win/configure.js:GetVersion()
-AC_INIT([MariaDB Server], [5.2.0-MariaDB], [], [mysql])
+AC_INIT([MariaDB Server], [5.2.0-MariaDB-alpha], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in

mysql-test/Makefile.am

@@ -102,7 +102,8 @@ TEST_DIRS = t r include std_data std_data/parts collections \
 	suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \
 	suite/parts suite/parts/t suite/parts/r suite/parts/inc \
 	suite/pbxt/t suite/pbxt/r \
-	suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include
+	suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
+	suite/vcol suite/vcol/t suite/vcol/r suite/vcol/inc
 
 # Used by dist-hook and install-data-local to copy all
 # test files into either dist or install directory