diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-24 16:52:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-24 16:52:27 +0300 |
| commit | 04b8cb1882d895931380f2671fe942852e62bc24 (patch) | |
| tree | 46d0af1ca06ba43198a4cde04fa6f0a3937b0118 /configure.in | |
| parent | bca31a686ded83db136be66efe36eab022ebf882 (diff) | |
| parent | b416a553769cabf9b99232df39244c4f4a9f48c6 (diff) | |
| download | mariadb-git-04b8cb1882d895931380f2671fe942852e62bc24.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- client/mysql.cc
- client/mysqldump.c
- configure.in
- mysql-test/r/csv.result
- mysql-test/r/func_time.result
- mysql-test/r/show_check.result
- mysql-test/r/sp-error.result
- mysql-test/r/sp.result
- mysql-test/r/sp_trans.result
- mysql-test/r/type_blob.result
- mysql-test/r/type_timestamp.result
- mysql-test/r/warnings.result
- mysql-test/suite/rpl/r/rpl_sp.result
- sql/mysql_priv.h
- sql/mysqld.cc
- sql/sp.cc
- sql/sql_base.cc
- sql/sql_table.cc
- sql/sql_trigger.cc
- sql/sql_view.cc
- sql/table.h
- sql/share/errmsg.txt
- mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 3280c979c8c..f5b3e3da2d2 100644 --- a/configure.in +++ b/configure.in @@ -19,6 +19,11 @@ 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(). |