Merge branch 'mysql-5.7' into mysql-8.0

Change-Id: Ibca8420797e643e755dc3ec36f8cab87df6c8648

Author: bjornmu

README

@@ -1,4 +1,4 @@
-Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 
 This is a release of MySQL, an SQL database server.
 

mysql-test/r/mysql_config_editor.result

@@ -100,7 +100,7 @@ user = "test_user4"
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
-Copyright (c) 2012, 2024, Oracle and/or its affiliates.
+Copyright (c) 2012, 2025, Oracle and/or its affiliates.
 
 Oracle is a registered trademark of Oracle Corporation and/or its
 affiliates. Other names may be trademarks of their respective

packaging/WiX/custom_ui.wxs

@@ -1,7 +1,7 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <!--
-   Copyright (c) 2010, 2024, Oracle and/or its affiliates.
+   Copyright (c) 2010, 2025, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -37,7 +37,7 @@
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2024, Oracle and/or its affiliates." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2025, Oracle and/or its affiliates." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>

packaging/deb-in/copyright.com.in

@@ -4,7 +4,7 @@ Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
 Files: *
-Copyright: 2000, 2024, Oracle and/or its affiliates.
+Copyright: 2000, 2025, Oracle and/or its affiliates.
 License: Commercial
  This is a release of MySQL, an SQL database server.
  .

packaging/deb-in/copyright.gpl.in

@@ -3,7 +3,7 @@ Upstream-Name: @DEB_COPYRIGHT_UPSTREAMNAME@
 Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
-Copyright: 2000, 2024, Oracle and/or its affiliates.
+Copyright: 2000, 2025, Oracle and/or its affiliates.
 License:
  This is a release of MySQL, an SQL database server.
  .

router/README.router

@@ -1,4 +1,4 @@
-Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 
 This is a release of MySQL Router, a building block for high
 availability solutions based on MySQL InnoDB clusters.