diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | b1e00b6be81c80b09d11085d77d86978e26df988 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /configure.in | |
| parent | 1f683a7270e63abfadce20c6f51370621ff065e1 (diff) | |
| parent | c9cfd2df5f2f58c2cdf716999ebea252c307333f (diff) | |
| download | mariadb-git-b1e00b6be81c80b09d11085d77d86978e26df988.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.
Still two test failures to be solved: main.myisam and main.subselect.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 47682c34fea..833bec5cd46 100644 --- a/configure.in +++ b/configure.in @@ -4,10 +4,16 @@ dnl Process this file with autoconf to produce a configure script. # 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 mysqlbinlog::check_master_version(). -AC_INIT([MariaDB Server], [5.1.44-MariaDB], [], [mysql]) +dnl Various people throughout the community may parse configure.in to +dnl get the MySQL version from the source branch. If the formatting +dnl of this line is going to be changed, please announce the change to +dnl internals@lists.mysql.com in advance of pushing the change. +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.1.46-MariaDB], [], [mysql]) + AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in |