#At lp:maria/5.2 2745 knielsen@knielsen-hq.org 2010-03-18 Fix merge errors in configure.in modified: configure.in === modified file 'configure.in' --- a/configure.in 2010-03-15 11:51:23 +0000 +++ b/configure.in 2010-03-18 11:51:40 +0000 @@ -4,9 +4,6 @@ dnl Process this file with autoconf to p # 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