Skip to content

Commit 914105a

Browse files
bjornmubjornmu
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents d42c047 + b8c41c1 commit 914105a

File tree

21 files changed

+33
-59
lines changed

21 files changed

+33
-59
lines changed

‎Docs/README.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2003, 2023, Oracle and/or its affiliates.
1+
Copyright (c) 2003, 2024, 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,

‎extra/RAPIDJSON-README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015, 2023, Oracle and/or its affiliates.
1+
Copyright (c) 2015, 2024, 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,

‎mysql-test/std_data/latin1.xml

-26
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,6 @@
22

33
<charsets>
44

5-
<copyright>
6-
Copyright (c) 2009 Sun Microsystems, Inc.
7-
Use is subject to license terms.
8-
9-
This program is free software; you can redistribute it and/or modify
10-
it under the terms of the GNU General Public License, version 2.0,
11-
as published by the Free Software Foundation.
12-
13-
This program is designed to work with certain software (including
14-
but not limited to OpenSSL) that is licensed under separate terms,
15-
as designated in a particular file or component or in included license
16-
documentation. The authors of MySQL hereby grant you an additional
17-
permission to link the program and your derivative works with the
18-
separately licensed software that they have either included with
19-
the program or referenced in the documentation.
20-
21-
This program is distributed in the hope that it will be useful,
22-
but WITHOUT ANY WARRANTY; without even the implied warranty of
23-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24-
GNU General Public License, version 2.0, for more details.
25-
26-
You should have received a copy of the GNU General Public License
27-
along with this program; if not, write to the Free Software
28-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
29-
</copyright>
30-
315
<charset name="latin1">
326

337
<ctype>

‎packaging/WiX/mysql_server.wxs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2010, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2010, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎packaging/WiX/mysql_server_extra.wxs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2012, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2012, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎packaging/WiX/redist_check.wxs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2020, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2020, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎packaging/WiX/router/custom_ui.wxs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2010, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2010, 2024, Oracle and/or its affiliates.
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,
@@ -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, 2023, 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, 2024, 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>

‎packaging/WiX/router/mysql_router.wxs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2010, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2010, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎packaging/WiX/router/mysql_router_extra.wxs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

33
<!--
4-
Copyright (c) 2012, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2012, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎packaging/deb-in/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2016, 2024, 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/deb-in/README.Maintainer

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2016, 2024, 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,

‎plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* It was generated using rpcgen.
44
*/
55
#include "xcom_vp.h"
6-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
6+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
77
This program is free software; you can redistribute it and/or modify
88
it under the terms of the GNU General Public License, version 2.0,
99
as published by the Free Software Foundation.
@@ -701,7 +701,7 @@ xdr_pax_msg_1_0 (XDR *xdrs, pax_msg *objp)
701701
* It was generated using rpcgen.
702702
*/
703703
#include "xcom_vp.h"
704-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
704+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
705705
This program is free software; you can redistribute it and/or modify
706706
it under the terms of the GNU General Public License, version 2.0,
707707
as published by the Free Software Foundation.
@@ -1397,7 +1397,7 @@ xdr_pax_msg_1_1 (XDR *xdrs, pax_msg *objp)
13971397
* It was generated using rpcgen.
13981398
*/
13991399
#include "xcom_vp.h"
1400-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
1400+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
14011401
This program is free software; you can redistribute it and/or modify
14021402
it under the terms of the GNU General Public License, version 2.0,
14031403
as published by the Free Software Foundation.
@@ -2092,7 +2092,7 @@ xdr_pax_msg_1_2 (XDR *xdrs, pax_msg *objp)
20922092
* It was generated using rpcgen.
20932093
*/
20942094
#include "xcom_vp.h"
2095-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
2095+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
20962096
This program is free software; you can redistribute it and/or modify
20972097
it under the terms of the GNU General Public License, version 2.0,
20982098
as published by the Free Software Foundation.
@@ -2782,7 +2782,7 @@ xdr_pax_msg_1_3 (XDR *xdrs, pax_msg *objp)
27822782
* It was generated using rpcgen.
27832783
*/
27842784
#include "xcom_vp.h"
2785-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
2785+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
27862786
This program is free software; you can redistribute it and/or modify
27872787
it under the terms of the GNU General Public License, version 2.0,
27882788
as published by the Free Software Foundation.
@@ -3475,7 +3475,7 @@ xdr_pax_msg_1_4 (XDR *xdrs, pax_msg *objp)
34753475
* It was generated using rpcgen.
34763476
*/
34773477
#include "xcom_vp.h"
3478-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
3478+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
34793479
This program is free software; you can redistribute it and/or modify
34803480
it under the terms of the GNU General Public License, version 2.0,
34813481
as published by the Free Software Foundation.
@@ -4168,7 +4168,7 @@ xdr_pax_msg_1_5 (XDR *xdrs, pax_msg *objp)
41684168
* It was generated using rpcgen.
41694169
*/
41704170
#include "xcom_vp.h"
4171-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
4171+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
41724172
This program is free software; you can redistribute it and/or modify
41734173
it under the terms of the GNU General Public License, version 2.0,
41744174
as published by the Free Software Foundation.
@@ -4859,7 +4859,7 @@ xdr_pax_msg_1_6 (XDR *xdrs, pax_msg *objp)
48594859
* It was generated using rpcgen.
48604860
*/
48614861
#include "xcom_vp.h"
4862-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
4862+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
48634863
This program is free software; you can redistribute it and/or modify
48644864
it under the terms of the GNU General Public License, version 2.0,
48654865
as published by the Free Software Foundation.
@@ -5545,7 +5545,7 @@ xdr_pax_msg_1_7 (XDR *xdrs, pax_msg *objp)
55455545
* It was generated using rpcgen.
55465546
*/
55475547
#include "xcom_vp.h"
5548-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
5548+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
55495549
This program is free software; you can redistribute it and/or modify
55505550
it under the terms of the GNU General Public License, version 2.0,
55515551
as published by the Free Software Foundation.
@@ -6231,7 +6231,7 @@ xdr_pax_msg_1_8 (XDR *xdrs, pax_msg *objp)
62316231
* It was generated using rpcgen.
62326232
*/
62336233
#include "xcom_vp.h"
6234-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
6234+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
62356235
This program is free software; you can redistribute it and/or modify
62366236
it under the terms of the GNU General Public License, version 2.0,
62376237
as published by the Free Software Foundation.
@@ -6906,7 +6906,7 @@ xdr_pax_msg_1_9 (XDR *xdrs, pax_msg *objp)
69066906
* It was generated using rpcgen.
69076907
*/
69086908
#include "xcom_vp.h"
6909-
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
6909+
/* Copyright (c) 2010, 2024, Oracle and/or its affiliates.
69106910
This program is free software; you can redistribute it and/or modify
69116911
it under the terms of the GNU General Public License, version 2.0,
69126912
as published by the Free Software Foundation.

‎plugin/rewriter/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015, 2023, Oracle and/or its affiliates.
1+
Copyright (c) 2015, 2024, 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,

‎plugin/test_service_sql_api/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
1+
/* Copyright (c) 2015, 2024, 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,

‎plugin/test_services/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015, 2023, Oracle and/or its affiliates.
1+
Copyright (c) 2015, 2024, 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,

‎router/src/harness/README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MySQL Harness
22
=============
33

4-
Copyright (c) 2015, 2023, Oracle and/or its affiliates.
4+
Copyright (c) 2015, 2024, Oracle and/or its affiliates.
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,

‎storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BulkDeleteTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2023, Oracle and/or its affiliates.
2+
Copyright (c) 2023, 2024, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,

‎storage/ndb/docs/doxygen/postdoxy.pl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2003, 2005 MySQL AB
1+
# Copyright (C) 2003, 2024, Oracle and/or its affiliates.
22
# Use is subject to license terms
33
#
44
# This program is free software; you can redistribute it and/or modify
@@ -105,9 +105,9 @@
105105
while (<INFILE>)
106106
{
107107
if (/\\rfoot/) {
108-
print OUTFILE "\\rfoot[\\fancyplain{}{\\bfseries\\small \\copyright~Copyright 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.\\hfill support-cluster\@mysql.com}]{}\n";
108+
print OUTFILE "\\rfoot[\\fancyplain{}{\\bfseries\\small \\copyright~Copyright (C) 2003, 2024, Oracle and/or its affiliates.\\hfill support-cluster\@mysql.com}]{}\n";
109109
} elsif (/\\lfoot/) {
110-
print OUTFILE "\\lfoot[]{\\fancyplain{}{\\bfseries\\small support-cluster\@mysql.com\\hfill \\copyright~Copyright 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.}}\n";
110+
print OUTFILE "\\lfoot[]{\\fancyplain{}{\\bfseries\\small support-cluster\@mysql.com\\hfill \\copyright~Copyright (C) 2003, 2024, Oracle and/or its affiliates.}}\n";
111111
} else {
112112
print OUTFILE;
113113
}

‎storage/ndb/nodejs/perftest/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2013, 2023, Oracle and/or its affiliates.
2+
Copyright (c) 2013, 2024, Oracle and/or its affiliates.
33

44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,

‎storage/ndb/test/run-test/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2009, 2024, 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,

‎unittest/gunit/innodb/lob/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****************************************************************************
22

3-
Copyright (c) 2016, 2023, Oracle and/or its affiliates.
3+
Copyright (c) 2016, 2024, Oracle and/or its affiliates.
44

55
This program is free software; you can redistribute it and/or modify it under
66
the terms of the GNU General Public License, version 2.0, as published by the

0 commit comments

Comments
 (0)