Skip to content

Commit bcc76f0

Browse files
committed
Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
Merge tag 'clone-5.7.34-build' into mysql-5.7-cluster-7.5 Change-Id: I2ac0d9af6f324ae993d8c09b65daebc38428a665
2 parents ae6899c + 64885fb commit bcc76f0

File tree

5,448 files changed

+6732
-9124
lines changed

Some content is hidden

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

5,448 files changed

+6732
-9124
lines changed

BUILD/SETUP.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2000, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2005, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2009, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2004, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2000, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2000, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2001, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2001, 2021, 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2020, Oracle and/or its affiliates.
4-
#
3+
# Copyright (c) 2000, 2021, Oracle and/or its affiliates.
4+
#
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,
77
# as published by the Free Software Foundation.

BUILD/compile-pentium-gprof

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2000, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2002, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2008, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2002, 2021, 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,

Docs/myisam.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2000, 2020, Oracle and/or its affiliates.
1+
# Copyright (c) 2000, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2003, 2020, Oracle and/or its affiliates.
1+
Copyright (c) 2003, 2021, 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

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, 2021, 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

Lines changed: 190 additions & 2 deletions
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.6.12 (and later).
1212

13-
Last updated: November 2020
13+
Last updated: January 2021
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, 2020, Oracle and/or its affiliates.
39+
Copyright (c) 1997, 2021, Oracle and/or its affiliates.
4040

4141
Election of GPLv2
4242

@@ -6076,6 +6076,194 @@ By Steve Reid <steve@edmweb.com>
60766076
======================================================================
60776077
======================================================================
60786078

6079+
Time Zone Information
6080+
6081+
Unless specified below, all files in the tz code and data (including this
6082+
LICENSE file) are in the public domain. If the files date.c,
6083+
newstrftime.3, and strftime.c are present, they contain material derived
6084+
from BSD and use the BSD 3-clause license. tzdata:
6085+
# This file is in the public domain, so clarified as of
6086+
# 2009-05-17 by Arthur David Olson.
6087+
/* Copyright 1985, 1987, 1988 The Regents of the University of California.
6088+
All rights reserved.
6089+
Redistribution and use in source and binary forms, with or without
6090+
modification, are permitted provided that the following conditions
6091+
are met:
6092+
1. Redistributions of source code must retain the above copyright
6093+
notice, this list of conditions and the following disclaimer.
6094+
2. Redistributions in binary form must reproduce the above copyright
6095+
notice, this list of conditions and the following disclaimer in the
6096+
documentation and/or other materials provided with the distribution.
6097+
3. Neither the name of the University nor the names of its contributors
6098+
may be used to endorse or promote products derived from this software
6099+
without specific prior written permission.
6100+
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
6101+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
6102+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
6103+
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
6104+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
6105+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
6106+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
6107+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
6108+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
6109+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
6110+
SUCH DAMAGE. */
6111+
6112+
======================================================================
6113+
======================================================================
6114+
6115+
Unicode Data Files, V5.2.0
6116+
6117+
Unicode Data Files, V5.2.0
6118+
# unidata-5.2.0.txt
6119+
# Date: 2009-09-22, 16:23:42 PDT [KW]
6120+
#
6121+
# This file defines the Default Unicode Collation Element Table
6122+
# (DUCET) for the Unicode Collation Algorithm
6123+
#
6124+
# Copyright (c) 2001-2009 Unicode, Inc.
6125+
# For terms of use, see http://www.unicode.org/terms_of_use.html
6126+
#
6127+
# See UTS #10, Unicode Collation Algorithm, for more information.
6128+
#
6129+
# Diagnostic weight ranges
6130+
# Primary weight range: 0200..3ACA (14539)
6131+
# Secondary weight range: 0020..0192 (371)
6132+
# Variant secondaries: 0159..015E (6)
6133+
# Digit secondaries: 015F..0192 (52)
6134+
# Tertiary weight range: 0002..001F (30)
6135+
#
6136+
@version 5.2.0
6137+
6138+
=== http://www.unicode.org/terms_of_use.html
6139+
For the general privacy policy governing access to this site, see the
6140+
Unicode Privacy Policy.
6141+
6142+
Unicode Copyright
6143+
Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.
6144+
Definitions
6145+
Unicode Data Files ("DATA FILES") include all data files under the
6146+
directories:
6147+
https://www.unicode.org/Public/
6148+
https://www.unicode.org/reports/
6149+
https://www.unicode.org/ivd/data/
6150+
Unicode Data Files do not include PDF online code charts under the directory:
6151+
https://www.unicode.org/Public/
6152+
Unicode Software ("SOFTWARE") includes any source code published in the
6153+
Unicode Standard
6154+
or any source code or compiled code under the directories:
6155+
https://www.unicode.org/Public/PROGRAMS/
6156+
https://www.unicode.org/Public/cldr/
6157+
http://site.icu-project.org/download/
6158+
6159+
Terms of Use
6160+
Certain documents and files on this website contain a legend indicating that
6161+
"Modification is permitted." Any person is hereby authorized, without fee, to
6162+
modify such documents and files to create derivative works conforming to the
6163+
Unicode(R) Standard, subject to Terms and Conditions herein.
6164+
Any person is hereby authorized, without fee, to view, use, reproduce, and
6165+
distribute all documents and files, subject to the Terms and Conditions
6166+
herein.
6167+
Further specifications of rights and restrictions pertaining to the use of
6168+
the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files
6169+
and Software License.
6170+
Each version of the Unicode Standard has further specifications of rights and
6171+
restrictions of use. For the book editions (Unicode 5.0 and earlier), these
6172+
are found on the back of the title page.
6173+
The Unicode PDF online code charts carry specific restrictions. Those
6174+
restrictions are incorporated as the first page of each PDF code chart.
6175+
All other files, including online documentation of the core specification for
6176+
Unicode 6.0 and later, are covered under these general Terms of Use.
6177+
No license is granted to "mirror" the Unicode website where a fee is charged
6178+
for access to the "mirror" site.
6179+
Modification is not permitted with respect to this document. All copies of
6180+
this document must be verbatim.
6181+
6182+
Restricted Rights Legend
6183+
Any technical data or software which is licensed to the United States of
6184+
America, its agencies and/or instrumentalities under this Agreement is
6185+
commercial technical data or commercial computer software developed
6186+
exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014
6187+
(June 1995), as applicable. For technical data, use, duplication, or
6188+
disclosure by the Government is subject to restrictions as set forth in DFARS
6189+
202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this
6190+
Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as
6191+
applicable, use, duplication or disclosure by the Government is subject to
6192+
the restrictions set forth in this Agreement.
6193+
6194+
Warranties and Disclaimers
6195+
This publication and/or website may include technical or typographical errors
6196+
or other inaccuracies. Changes are periodically added to the information
6197+
herein; these changes will be incorporated in new editions of the publication
6198+
and/or website. Unicode, Inc. may make improvements and/or changes in the
6199+
product(s) and/or program(s) described in this publication and/or website at
6200+
any time.
6201+
If this file has been purchased on magnetic or optical media from Unicode,
6202+
Inc. the sole and exclusive remedy for any claim will be exchange of the
6203+
defective media within ninety (90) days of original purchase.
6204+
6205+
EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS
6206+
PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR
6207+
STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY,
6208+
FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS
6209+
LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS
6210+
PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR
6211+
LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
6212+
6213+
Waiver of Damages
6214+
In no event shall Unicode, Inc. or its licensors be liable for any special,
6215+
incidental, indirect or consequential damages of any kind, or any damages
6216+
whatsoever, whether or not Unicode, Inc. was advised of the possibility of
6217+
the damage, including, without limitation, those resulting from the
6218+
following: loss of use, data or profits, in connection with the use,
6219+
modification or distribution of this information or its derivatives.
6220+
6221+
Trademarks & Logos
6222+
The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc.
6223+
¿The Unicode Consortium¿ and ¿Unicode, Inc.¿ are trade names of Unicode, Inc.
6224+
Use of the information and materials found on this website indicates your
6225+
acknowledgement of Unicode, Inc.¿s exclusive worldwide rights in the Unicode
6226+
Word Mark, the Unicode Logo, and the Unicode trade names.
6227+
The Unicode Consortium Name and Trademark Usage Policy (¿Trademark Policy¿)
6228+
are incorporated herein by reference and you agree to abide by the provisions
6229+
of the Trademark Policy, which may be changed from time to time in the sole
6230+
discretion of Unicode, Inc.
6231+
All third party trademarks referenced herein are the property of their
6232+
respective owners.
6233+
6234+
Miscellaneous
6235+
Jurisdiction and Venue. This website is operated from a location in the State
6236+
of California, United States of America. Unicode, Inc. makes no
6237+
representation that the materials are appropriate for use in other locations.
6238+
If you access this website from other locations, you are responsible for
6239+
compliance with local laws. This Agreement, all use of this website and any
6240+
claims and damages resulting from use of this website are governed solely by
6241+
the laws of the State of California without regard to any principles which
6242+
would apply the laws of a different jurisdiction. The user agrees that any
6243+
disputes regarding this website shall be resolved solely in the courts
6244+
located in Santa Clara County, California. The user agrees said courts have
6245+
personal jurisdiction and agree to waive any right to transfer the dispute to
6246+
any other forum.
6247+
6248+
Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify
6249+
this Agreement at any time by posting it to this website. The user may not
6250+
assign any part of this Agreement without Unicode, Inc.¿s prior written
6251+
consent.
6252+
6253+
Taxes. The user agrees to pay any taxes arising from access to this website
6254+
or use of the information herein, except for those based on Unicode¿s net
6255+
income.
6256+
6257+
Severability. If any provision of this Agreement is declared invalid or
6258+
unenforceable, the remaining provisions of this Agreement shall remain in
6259+
effect.
6260+
6261+
Entire Agreement. This Agreement constitutes the entire agreement between the
6262+
parties.
6263+
6264+
======================================================================
6265+
======================================================================
6266+
60796267
Unicode Data Files, V9.0
60806268

60816269
Unicode Data Files, V9.0

client/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2012, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2012, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2014, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2014, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2014, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2016, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2014, 2021, 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2014, 2021, 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)