summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
committerSergei Golubchik <serg@mariadb.org>2017-03-30 12:48:42 +0200
commitda4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch)
tree7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /BUILD
parent9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff)
parenta00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff)
downloadmariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/compile-bintar2
-rw-r--r--BUILD/compile-pentium64-wsrep4
-rw-r--r--BUILD/util.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/BUILD/compile-bintar b/BUILD/compile-bintar
index 8434bf57a52..94d1371f69d 100755
--- a/BUILD/compile-bintar
+++ b/BUILD/compile-bintar
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
# This script's purpose is to build the binary tarball packages for MariaDB
diff --git a/BUILD/compile-pentium64-wsrep b/BUILD/compile-pentium64-wsrep
index 0bccb34e753..53c0e897eec 100644
--- a/BUILD/compile-pentium64-wsrep
+++ b/BUILD/compile-pentium64-wsrep
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02111-1301, USA
path=`dirname $0`
. "$path/SETUP.sh"
diff --git a/BUILD/util.sh b/BUILD/util.sh
index c8559184013..010b3d86e06 100644
--- a/BUILD/util.sh
+++ b/BUILD/util.sh
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA.
# Setting cpu options.
get_cpuopt () {