Merge tag 'clone-5.7.37-build' into mysql-cluster-7.6.21-release

Change-Id: I4ad5598c7d7233308c582eff232e794cec7bf162

Author: arnabray21

LICENSE

@@ -1690,6 +1690,39 @@ THE SOFTWARE.
    ======================================================================
    ======================================================================
 
+jemalloc
+
+   jemalloc
+
+Copyright (C) 2002-present Jason Evans <[email protected]>.
+All rights reserved.
+Copyright (C) 2007-2012 Mozilla Foundation.  All rights reserved.
+Copyright (C) 2009-present Facebook, Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice(s),
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice(s),
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+   ======================================================================
+   ======================================================================
+
 lib_sql.cc
 
    lib_sql.cc
@@ -6164,6 +6197,195 @@ By Steve Reid <[email protected]>
    ======================================================================
    ======================================================================
 
+Time Zone Information
+
+Unless specified below, all files in the tz code and data (including this
+LICENSE file) are in the public domain. If the files date.c,
+newstrftime.3, and strftime.c are present, they contain material derived
+from BSD and use the BSD 3-clause license. tzdata:
+    # This file is in the public domain, so clarified as of
+    # 2009-05-17 by Arthur David Olson.
+/* Copyright 1985, 1987, 1988 The Regents of the University of California.
+   All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. Neither the name of the University nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.  */
+
+   ======================================================================
+   ======================================================================
+
+Unicode Data Files, V5.2.0
+
+   Unicode Data Files, V5.2.0
+
+# unidata-5.2.0.txt
+# Date: 2009-09-22, 16:23:42 PDT [KW]
+#
+# This file defines the Default Unicode Collation Element Table
+#   (DUCET) for the Unicode Collation Algorithm
+#
+# Copyright (c) 2001-2009 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# See UTS #10, Unicode Collation Algorithm, for more information.
+#
+# Diagnostic weight ranges
+# Primary weight range:   0200..3ACA (14539)
+# Secondary weight range: 0020..0192 (371)
+# Variant secondaries:    0159..015E (6)
+# Digit secondaries:      015F..0192 (52)
+# Tertiary weight range:  0002..001F (30)
+#
+@version 5.2.0
+
+=== http://www.unicode.org/terms_of_use.html
+For the general privacy policy governing access to this site, see the
+Unicode Privacy Policy.
+
+Unicode Copyright
+    Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.
+Definitions
+Unicode Data Files ("DATA FILES") include all data files under the
+directories:
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
+Unicode Data Files do not include PDF online code charts under the directory:
+https://www.unicode.org/Public/
+Unicode Software ("SOFTWARE") includes any source code published in the
+Unicode Standard
+or any source code or compiled code under the directories:
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
+
+Terms of Use
+Certain documents and files on this website contain a legend indicating that
+"Modification is permitted." Any person is hereby authorized, without fee, to
+modify such documents and files to create derivative works conforming to the
+Unicode(R) Standard, subject to Terms and Conditions herein.
+Any person is hereby authorized, without fee, to view, use, reproduce, and
+distribute all documents and files, subject to the Terms and Conditions
+herein.
+Further specifications of rights and restrictions pertaining to the use of
+the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files
+and Software License.
+Each version of the Unicode Standard has further specifications of rights and
+restrictions of use. For the book editions (Unicode 5.0 and earlier), these
+are found on the back of the title page.
+The Unicode PDF online code charts carry specific restrictions. Those
+restrictions are incorporated as the first page of each PDF code chart.
+All other files, including online documentation of the core specification for
+Unicode 6.0 and later, are covered under these general Terms of Use.
+No license is granted to "mirror" the Unicode website where a fee is charged
+for access to the "mirror" site.
+Modification is not permitted with respect to this document. All copies of
+this document must be verbatim.
+
+Restricted Rights Legend
+Any technical data or software which is licensed to the United States of
+America, its agencies and/or instrumentalities under this Agreement is
+commercial technical data or commercial computer software developed
+exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014
+(June 1995), as applicable. For technical data, use, duplication, or
+disclosure by the Government is subject to restrictions as set forth in DFARS
+202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this
+Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as
+applicable, use, duplication or disclosure by the Government is subject to
+the restrictions set forth in this Agreement.
+
+Warranties and Disclaimers
+This publication and/or website may include technical or typographical errors
+or other inaccuracies. Changes are periodically added to the information
+herein; these changes will be incorporated in new editions of the publication
+and/or website. Unicode, Inc. may make improvements and/or changes in the
+product(s) and/or program(s) described in this publication and/or website at
+any time.
+If this file has been purchased on magnetic or optical media from Unicode,
+Inc. the sole and exclusive remedy for any claim will be exchange of the
+defective media within ninety (90) days of original purchase.
+
+EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS
+PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR
+STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS
+LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS
+PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR
+LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+
+Waiver of Damages
+In no event shall Unicode, Inc. or its licensors be liable for any special,
+incidental, indirect or consequential damages of any kind, or any damages
+whatsoever, whether or not Unicode, Inc. was advised of the possibility of
+the damage, including, without limitation, those resulting from the
+following: loss of use, data or profits, in connection with the use,
+modification or distribution of this information or its derivatives.
+
+Trademarks & Logos
+The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc.
+¿The Unicode Consortium¿ and ¿Unicode, Inc.¿ are trade names of Unicode, Inc.
+Use of the information and materials found on this website indicates your
+acknowledgement of Unicode, Inc.¿s exclusive worldwide rights in the Unicode
+Word Mark, the Unicode Logo, and the Unicode trade names.
+The Unicode Consortium Name and Trademark Usage Policy (¿Trademark Policy¿)
+are incorporated herein by reference and you agree to abide by the provisions
+of the Trademark Policy, which may be changed from time to time in the sole
+discretion of Unicode, Inc.
+All third party trademarks referenced herein are the property of their
+respective owners.
+
+Miscellaneous
+Jurisdiction and Venue. This website is operated from a location in the State
+of California, United States of America. Unicode, Inc. makes no
+representation that the materials are appropriate for use in other locations.
+If you access this website from other locations, you are responsible for
+compliance with local laws. This Agreement, all use of this website and any
+claims and damages resulting from use of this website are governed solely by
+the laws of the State of California without regard to any principles which
+would apply the laws of a different jurisdiction. The user agrees that any
+disputes regarding this website shall be resolved solely in the courts
+located in Santa Clara County, California. The user agrees said courts have
+personal jurisdiction and agree to waive any right to transfer the dispute to
+any other forum.
+
+Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify
+this Agreement at any time by posting it to this website. The user may not
+assign any part of this Agreement without Unicode, Inc.¿s prior written
+consent.
+
+Taxes. The user agrees to pay any taxes arising from access to this website
+or use of the information herein, except for those based on Unicode¿s net
+income.
+
+Severability.  If any provision of this Agreement is declared invalid or
+unenforceable, the remaining provisions of this Agreement shall remain in
+effect.
+
+Entire Agreement. This Agreement constitutes the entire agreement between the
+parties.
+
+   ======================================================================
+   ======================================================================
+
 Unicode Data Files, V9.0
 
    Unicode Data Files, V9.0

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=36
+MYSQL_VERSION_PATCH=37
 MYSQL_VERSION_EXTRA=-ndb-7.6.21

cmake/readline.cmake

@@ -90,7 +90,7 @@ MACRO (FIND_CURSES)
  ENDIF()
 ENDMACRO()
 
-SET(CURRENT_LIBEDIT_DIRECTORY "extra/libedit/libedit-20191231-3.1")
+SET(CURRENT_LIBEDIT_DIRECTORY "extra/libedit/libedit-20210910-3.1")
 
 MACRO (MYSQL_USE_BUNDLED_EDITLINE)
   SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")

cmake/ssl.cmake

@@ -37,7 +37,6 @@
 # We assume you have installed
 #     https://slproweb.com/products/Win32OpenSSL.html
 #     We look for "C:/Program Files/OpenSSL-Win64/"
-#     The .dll files must be in your PATH.
 # or
 #     http://brewformulas.org/Openssl
 #     We look for "/usr/local/opt/openssl"
@@ -122,6 +121,32 @@ MACRO (MYSQL_CHECK_SSL)
       ELSE()
         SET(WITH_SSL_PATH "C:/Program Files/OpenSSL-Win64/")
       ENDIF()
+
+      # Note that several packages may come with ssl headers,
+      # e.g. Strawberry Perl, so ignore some system paths below.
+      IF(WIN32 AND NOT OPENSSL_ROOT_DIR AND WITH_SSL STREQUAL "system")
+        FILE(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+        IF(SIZEOF_VOIDP EQUAL 8)
+          FIND_PATH(OPENSSL_WIN64
+            NAMES  "include/openssl/ssl.h"
+            PATHS "${_programfiles}/OpenSSL-Win64" "C:/OpenSSL-Win64/"
+            NO_SYSTEM_ENVIRONMENT_PATH
+            NO_CMAKE_SYSTEM_PATH
+            )
+          IF(OPENSSL_WIN64)
+            SET(OPENSSL_ROOT_DIR ${OPENSSL_WIN64})
+            FIND_LIBRARY(OPENSSL_LIBRARY
+              NAMES libssl_static
+              HINTS ${OPENSSL_ROOT_DIR}/lib)
+            FIND_LIBRARY(CRYPTO_LIBRARY
+              NAMES libcrypto_static
+              HINTS ${OPENSSL_ROOT_DIR}/lib)
+            IF(OPENSSL_LIBRARY AND CRYPTO_LIBRARY)
+              SET(FOUND_STATIC_SSL_LIBS 1)
+            ENDIF()
+          ENDIF()
+        ENDIF()
+      ENDIF()
     ENDIF()
 
     # First search in WITH_SSL_PATH.
@@ -267,7 +292,7 @@ MACRO (MYSQL_CHECK_SSL)
         SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL})
       ENDIF()
       MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}")
-      IF(WIN32 AND WITH_SSL STREQUAL "system")
+      IF(WIN32 AND WITH_SSL STREQUAL "system" AND NOT FOUND_STATIC_SSL_LIBS)
         MESSAGE(STATUS "Please do\nPATH=\"${WITH_SSL_PATH}bin\":$PATH")
         FILE(TO_NATIVE_PATH "${WITH_SSL_PATH}" WITH_SSL_PATH_XX)
         MESSAGE(STATUS "or\nPATH=\"${WITH_SSL_PATH_XX}bin\":$PATH")

extra/libedit/libedit-20191231-3.1/COPYING renamed to extra/libedit/libedit-20210910-3.1/COPYING

@@ -1,6 +1,48 @@
    * See also NetBSD changelog:
 	http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit
 
+2021-09-10 Jess Thrysoee
+
+   * all: sync with upstream source
+
+2021-07-14 Jess Thrysoee
+
+   * all: sync with upstream source
+
+   * src/histedit.h: Add wcsdup declaration when ifndef HAVE_WCSDUP. Patch by Rainer Jung.
+
+   * examples/wtc1.c: Fix warnings and add missing brace. Patch by Rainer Jung.
+
+2021-05-22 Jess Thrysoee
+
+   * version-info: 0:66:0
+
+   * all: sync with upstream source
+
+   * src/el.c: editrc not read on systems without issetugid
+	Patch by Trevor Cordes
+
+2021-04-19 Jess Thrysoee
+
+   * version-info: 0:65:0
+
+   * all: sync with upstream source
+
+   * src/getline.c,src/sys.h: Provide getline.c implementation if not available
+	Patch by Claes Nästén
+
+   * src/makelist: Use Posix locale; mainly to get ASCII character classes in e.g. `tr`
+	Patch by Claes Nästén
+
+  * examples/test_filecompletion.c, examples/wtc1.c: err.h not supported by
+	Solaris
+
+2021-02-16 Jess Thrysoee
+
+   * version-info: 0:64:0
+
+   * all: sync with upstream source
+
 2019-12-31 Jess Thrysoee
 
    * version-info: 0:63:0