From d009d48d8cae272d1675b88a8eebae4b6090e454 Mon Sep 17 00:00:00 2001 From: Bala Date: Mon, 5 Jan 2015 11:13:50 +0100 Subject: Raise version number after cloning 5.5.42 --- README | 2 +- VERSION | 2 +- include/welcome_copyright_notice.h | 4 ++-- packaging/WiX/custom_ui.wxs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 99a9efea4d3..47b38689038 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ For the avoidance of doubt, this particular copy of the software is released under the version 2 of the GNU General Public License. MySQL is brought to you by Oracle. -Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. License information can be found in the COPYING file. diff --git a/VERSION b/VERSION index 78c69c9f30d..dbfc5f823c9 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 -MYSQL_VERSION_PATCH=42 +MYSQL_VERSION_PATCH=43 MYSQL_VERSION_EXTRA= diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 4b00f0dbff6..eb2bf260af3 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015" /* This define specifies copyright notice which is displayed by every MySQL diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs index d49e4210b12..a28c3c9b8a1 100644 --- a/packaging/WiX/custom_ui.wxs +++ b/packaging/WiX/custom_ui.wxs @@ -2,7 +2,7 @@ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">