diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
| commit | 940ad61b712cb2f10bf5ff62330b0c9c4d8473ba (patch) | |
| tree | a2457e79f43173dfb97236266c5bb7a47fdbf65f /configure.in | |
| parent | 72ae25b11ea922c018953053e3c3cdd5fd80f971 (diff) | |
| parent | e287445d416044a7004ba2da289350f5c6dfb546 (diff) | |
| download | mariadb-git-940ad61b712cb2f10bf5ff62330b0c9c4d8473ba.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/configure.in b/configure.in index ec74b15efb0..c2770536d1f 100644 --- a/configure.in +++ b/configure.in @@ -19,15 +19,16 @@ dnl Process this file with autoconf to produce a configure script. # Minimum Autoconf version required. AC_PREREQ(2.59) -# Various people throughout the community may parse configure.in to -# get the MySQL version from the source branch. If the formatting -# of this line is going to be changed, please announce the change to -# internals@lists.mysql.com in advance of pushing the change. -# -# 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 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([MySQL Server], [5.5.5-m3], [], [mysql]) + AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in |