summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-06 11:12:37 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-06 11:12:37 +0300
commit2b0d16bcd9833ce73062c555f6755b9863e92ee2 (patch)
tree01bb0c61273a4c1e999c9d2d967c32dca8f98a2a /configure.in
parent13141c9842c055406730daead25337e46a57f4d8 (diff)
parent8b48a0aa28a7538d372146a19e836a5c3b63046a (diff)
downloadmariadb-git-2b0d16bcd9833ce73062c555f6755b9863e92ee2.tar.gz
Merge with 5.1
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 673146f64f9..d5e08b7a6c1 100644
--- a/configure.in
+++ b/configure.in
@@ -13,8 +13,8 @@ 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.
dnl
-dnl When merging new MySQL releases, update the version number to match the
-dnl MySQL version number.
+dnl When merging new MariaDB releases, update the version number to match the
+dnl MariaDB version number.
dnl
dnl Note: the following line must be parseable by win/configure.js:GetVersion()
AC_INIT([MariaDB Server], [5.2.1-MariaDB-beta], [], [mysql])