Skip to content

Commit bdc4c65

Browse files
committed
Merge tag 'clone-5.6.55-build' into mysql-cluster-7.4.35-release
Change-Id: I73eccc6a7b39d919322b26a797496d7979ec5359
2 parents 3b0f896 + 4171800 commit bdc4c65

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=5
22
MYSQL_VERSION_MINOR=6
3-
MYSQL_VERSION_PATCH=54
3+
MYSQL_VERSION_PATCH=55
44
MYSQL_VERSION_EXTRA=-ndb-7.4.35

include/welcome_copyright_notice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, 2020, Oracle and/or its affiliates.
1+
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

packaging/WiX/custom_ui.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
3838
<Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
3939
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
40-
<Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2021, Oracle and/or its affiliates." />
40+
<Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2022, Oracle and/or its affiliates." />
4141
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
4242
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
4343
</Dialog>

0 commit comments

Comments
 (0)