diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
| commit | 0a5b406fc54a16ac266cd6d38953b19af3feed30 (patch) | |
| tree | 50764a5d381794b53bd844836e2ae9c962816860 /support-files/Makefile.am | |
| parent | e6e3b4abc3cb1b0b92dc862810d5571b8b20397f (diff) | |
| parent | 0305aea88a220ff9080432a65d50cb30493f3109 (diff) | |
| download | mariadb-git-0a5b406fc54a16ac266cd6d38953b19af3feed30.tar.gz | |
Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
Diffstat (limited to 'support-files/Makefile.am')
| -rw-r--r-- | support-files/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 47e8c395b31..80bffd45c3f 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2001, 2003-2006 MySQL AB +# Copyright (C) 2000-2006 MySQL AB, 2008-2010 Sun Microsystems, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -120,6 +120,7 @@ SUFFIXES = .sh -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \ -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \ -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \ + -e 's!@''MYSQL_U_SCORE_VERSION''@!@MYSQL_U_SCORE_VERSION@!' \ -e 's!@''MYSQL_COPYRIGHT_YEAR''@!@MYSQL_COPYRIGHT_YEAR@!' \ -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \ |