Skip to content

Commit 2eee58b

Browse files
arnabray21arnabray21
committed
Merge tag 'clone-5.7.42-build' into mysql-5.7-cluster-7.5
Change-Id: I302b98ca437915d94254e44f2c3cc07bb5d722fb
2 parents 62f51bb + c5b0117 commit 2eee58b

File tree

3,522 files changed

+4726
-3983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,522 files changed

+4726
-3983
lines changed

‎BUILD/SETUP.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/autorun.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2005, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/cmake_configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2009, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2004, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-debug-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2001, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2001, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-debug-max-no-ndb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2001, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2001, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-gprof

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-valgrind-max

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2002, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium-valgrind-max-no-ndb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2008, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎BUILD/compile-pentium64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2002, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0,

‎CMakeLists.txt

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

‎Docs/myisam.txt

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

‎Docs/sp-imp-spec.txt

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

‎Doxyfile-perfschema

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

‎LICENSE

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introduction
1010
third-party software which may be included in this distribution of
1111
MySQL NDB Cluster 7.5.16 (and later).
1212

13-
Last updated: November 2022
13+
Last updated: February 2023
1414

1515
Licensing Information
1616

@@ -36,7 +36,7 @@ Licensing Information
3636
reproduced below and can also be found along with its FAQ at
3737
http://oss.oracle.com/licenses/universal-foss-exception.
3838

39-
Copyright (c) 1997, 2022, Oracle and/or its affiliates.
39+
Copyright (c) 1997, 2023, Oracle and/or its affiliates.
4040

4141
Election of GPLv2
4242

@@ -460,7 +460,9 @@ The Universal FOSS Exception, Version 1.0
460460
together with Other FOSS after enabling interoperability using the
461461
Interfaces of one or both, and distributing the resulting
462462
combination under different licenses for the respective portions
463-
thereof. For avoidance of doubt, a license which is OSI-approved or
463+
thereof.
464+
465+
For avoidance of doubt, a license which is OSI-approved or
464466
categorized by the FSF as free, includes, for the purpose of this
465467
permission, such licenses with additional permissions, and any
466468
license that has previously been so approved or categorized as

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=5
22
MYSQL_VERSION_MINOR=7
3-
MYSQL_VERSION_PATCH=41
3+
MYSQL_VERSION_PATCH=42
44
MYSQL_VERSION_EXTRA=-ndb-7.5.30

‎client/CMakeLists.txt

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

‎client/auth_utils.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2012, 2023, 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,

‎client/auth_utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2012, 2023, 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,

‎client/base/CMakeLists.txt

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

‎client/base/abstract_connection_program.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_connection_program.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_enum_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2016, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2016, 2023, 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,

‎client/base/abstract_integer_number_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_number_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_options_provider.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2001, 2023, 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,

‎client/base/abstract_options_provider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_program.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_program.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_string_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/abstract_value_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/atomic.h

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

‎client/base/bool_option.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/bool_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/char_array_option.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2001, 2023, 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,

‎client/base/char_array_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/composite_options_provider.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2001, 2023, 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,

‎client/base/composite_options_provider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/debug_options.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/debug_options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/disabled_option.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2001, 2023, 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,

‎client/base/disabled_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/enum_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2016, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2016, 2023, 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,

‎client/base/help_options.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/help_options.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/i_connection_factory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/i_option.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/i_option.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

‎client/base/i_option_changed_listener.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2014, 2023, 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,

0 commit comments

Comments
 (0)