diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-23 16:26:45 +0300 |
| commit | f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59 (patch) | |
| tree | 906d61216e1d999772c7a2a993909fc6915a9ab0 /configure.in | |
| parent | 0afa209018fad0a0863048cebfcc8f0a52b814ee (diff) | |
| parent | 6f78ef71d485fb3968355941860d012fc17a9c59 (diff) | |
| download | mariadb-git-f0d2fe34f2bd074dfc0f9ae6c5ffbc414a6f9b59.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index e50f2897781..4dde58d8196 100644 --- a/configure.in +++ b/configure.in @@ -4,9 +4,14 @@ 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 client/mysqlbinlog.cc:check_master_version(). +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 Remember to also update version.c in ndb. +dnl When changing major version number please also check switch statement +dnl in client/mysqlbinlog.cc:check_master_version(). AC_INIT([MySQL Server], [5.5.2-m2], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM |