diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-13 15:51:47 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-13 15:51:47 +0200 |
| commit | 09d2e7f68029071dc98bc827a7215d00f2b9a859 (patch) | |
| tree | 66ace303cfc1a254c981ddea815ec6b8e1915d79 /configure.in | |
| parent | ffb0cd6146662705491e1461a7727c9627f9bd15 (diff) | |
| parent | 0b20943e9d7e22332ccc14b30b49a78a780cc23d (diff) | |
| download | mariadb-git-09d2e7f68029071dc98bc827a7215d00f2b9a859.tar.gz | |
merge with 5.1
(Includes patch for overrun detected by valgrind thanks to previous my_alloca() -> my_malloc() patch)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 977417464ef..b9379775b2e 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl dnl When changing the major version number please also check the switch dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. -AC_INIT([MariaDB Server], [5.2.4-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.2.5-MariaDB], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM |