Merge tag 'clone-5.7.30-build' into mysql-5.7-cluster-7.5

Change-Id: Ife0fb879352ed00f40d2862f337a4e3ab6804d57

Author: arnabray21

LICENSE

@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL NDB Cluster 7.5.16 (and later).
 
-   Last updated: December 2019
+   Last updated: March 2020
 
 Licensing Information
 
@@ -1909,12 +1909,12 @@ 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.
+   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.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -1929,45 +1929,73 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ==============================
 
 Portions of Libevent are based on works by others, also made available by
-them under the three-clause BSD license above. The copyright notices are
-available in the corresponding source files; the license is as above. Here's
+them under the three-clause BSD license above.  The copyright notices are
+available in the corresponding source files; the license is as above.  Here's
 a list:
 
 log.c:
-Copyright (c) 2000 Dug Song <dugsong@monkey.org>
-Copyright (c) 1993 The Regents of the University of California.
+   Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+   Copyright (c) 1993 The Regents of the University of California.
 
 strlcpy.c:
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 
 win32select.c:
-Copyright (c) 2003 Michael A. Davis <mike@datanerds.net>
+   Copyright (c) 2003 Michael A. Davis <mike@datanerds.net>
+
+evport.c:
+   Copyright (c) 2007 Sun Microsystems
 
 ht-internal.h:
-Copyright (c) 2002 Christopher Clark
+   Copyright (c) 2002 Christopher Clark
 
 minheap-internal.h:
-Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
+   Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
 
 ==============================
 
 The arc4module is available under the following, sometimes called the
 "OpenBSD" license:
 
-Copyright (c) 1996, David Mazieres <dm@uun.org>
-Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+   Copyright (c) 1996, David Mazieres <dm@uun.org>
+   Copyright (c) 2008, Damien Miller <djm@openbsd.org>
 
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+==============================
+
+The Windows timer code is based on code from libutp, which is
+distributed under this license, sometimes called the "MIT" license.
+
+Copyright (c) 2010 BitTorrent, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 libgcc & libstdc++ Libraries
 
@@ -4511,56 +4539,6 @@ code is licensed under the LGPLv2.1 license.
    This component is licensed under GNU Lesser General Public License
    Version 2.1, February 1999.
 
-OpenLDAP 2.8
-
-   The following software may be included in this product:
-
-   OpenLDAP 2.8
-The OpenLDAP Public License
-  Version 2.8, 17 August 2003
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions in source form must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-The OpenLDAP Foundation may revise this license from time to time.  Each
-revision is distinguished by a version number.  You may use this Software
-under terms of this license revision or under the terms of any subsequent
-revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED 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 OPENLDAP FOUNDATION, ITS
-CONTRIBUTORS, OR THE AUTHOR(S) OR OWNER(S) OF THE SOFTWARE 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.
-
-The names of the authors and copyright holders must not be used in
-advertising or otherwise to promote the sale, use or other dealing in this
-Software without specific, written prior permission.  Title to copyright in
-this Software shall at all times remain with copyright holders.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
-
 OpenPAM
 
    The following software may be included in this product:

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=29
+MYSQL_VERSION_PATCH=30
 MYSQL_VERSION_EXTRA=-ndb-7.5.18

client/dump/program.cc

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 
   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,
@@ -275,7 +275,13 @@ Program::Program()
 const char *load_default_groups[]=
 {
   "client", /* Read settings how to connect to server. */
-  "mysql_dump", /* Read special settings for mysql_dump. */
+  /*
+    Read special settings for mysql_dump.
+    This section will be deprecated.
+  */
+  "mysql_dump",
+  /* Read config options from mysqlpump section. */
+  "mysqlpump",
   0
 };
 

client/mysql.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
    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,
@@ -2825,12 +2825,12 @@ C_MODE_END
 
 #if defined(USE_NEW_EDITLINE_INTERFACE)
 static int fake_magic_space(int, int);
-extern "C" char *no_completion(const char*,int)
+char *no_completion(const char *, int)
 #elif defined(USE_LIBEDIT_INTERFACE)
-static int fake_magic_space(const char *, int);
-extern "C" int no_completion(const char*,int)
+static int fake_magic_space(int, int);
+char *no_completion(const char *, int)
 #else
-extern "C" char *no_completion()
+char *no_completion()
 #endif
 {
   return 0;					/* No filename completion */
@@ -2855,7 +2855,7 @@ static int not_in_history(const char *line)
 #if defined(USE_NEW_EDITLINE_INTERFACE)
 static int fake_magic_space(int, int)
 #else
-static int fake_magic_space(const char *, int)
+static int fake_magic_space(int, int)
 #endif
 {
   rl_insert(1, ' ');
@@ -2870,15 +2870,15 @@ static void initialize_readline (char *name)
 
   /* Tell the completer that we want a crack first. */
 #if defined(USE_NEW_EDITLINE_INTERFACE)
-  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
+  rl_attempted_completion_function= &new_mysql_completion;
+  rl_completion_entry_function= &no_completion;
 
-  rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1);
+  rl_add_defun("magic-space", &fake_magic_space, -1);
 #elif defined(USE_LIBEDIT_INTERFACE)
   setlocale(LC_ALL,""); /* so as libedit use isprint */
-  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
+  rl_attempted_completion_function= &new_mysql_completion;
   rl_completion_entry_function= &no_completion;
-  rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+  rl_add_defun("magic-space", &fake_magic_space, -1);
 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
   rl_completion_entry_function= &no_completion;
@@ -2900,7 +2900,7 @@ static char **new_mysql_completion(const char *text,
 #if defined(USE_NEW_EDITLINE_INTERFACE)
     return rl_completion_matches(text, new_command_generator);
 #else
-    return completion_matches((char *)text, (CPFunction *)new_command_generator);
+    return completion_matches(const_cast<char*>(text), new_command_generator);
 #endif
   else
     return (char**) 0;

cmake/os/FreeBSD.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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,
@@ -28,8 +28,10 @@ INCLUDE(CheckCSourceRuns)
 SET(FREEBSD 1)
 
 # On FreeBSD some includes, e.g. sasl/sasl.h, is in /usr/local/include
-INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
 LIST(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
+# Do not INCLUDE_DIRECTORIES here, we need to do that *after* configuring boost,
+# in order to search include/boost_1_59_0/patches
+# INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
 
 # We require at least Clang 3.3.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)

cmake/readline.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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,
@@ -63,10 +63,10 @@ MACRO (FIND_CURSES)
  IF(NOT CURSES_FOUND)
    SET(ERRORMSG "Curses library not found. Please install appropriate package,
     remove CMakeCache.txt and rerun cmake.")
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(ERRORMSG ${ERRORMSG} 
-    "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " 
-    "it is ncurses-devel.")
+   IF(LINUX)
+     SET(ERRORMSG ${ERRORMSG} 
+       "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " 
+       "it is ncurses-devel.")
    ENDIF()
    MESSAGE(FATAL_ERROR ${ERRORMSG})
  ENDIF()
@@ -76,24 +76,8 @@ MACRO (FIND_CURSES)
  ELSEIF(CURSES_HAVE_NCURSES_H)
    SET(HAVE_NCURSES_H 1 CACHE INTERNAL "")
  ENDIF()
- IF(CMAKE_SYSTEM_NAME MATCHES "HP")
-   # CMake uses full path to library /lib/libcurses.sl 
-   # On Itanium, it results into architecture mismatch+
-   # the library is for  PA-RISC
-   SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
- ENDIF()
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-   # CMake generates /lib/64/libcurses.so -R/lib/64
-   # The result is we cannot find
-   # /opt/studio12u2/lib/stlport4/v9/libstlport.so.1
-   # at runtime
-   SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   MESSAGE(STATUS "CURSES_LIBRARY ${CURSES_LIBRARY}")
- ENDIF()
 
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ IF(LINUX)
    # -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora 
    # Lower-level libcurses calls are exposed by libtinfo
    CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} tputs "" HAVE_TPUTS_IN_CURSES)
@@ -107,12 +91,14 @@ MACRO (FIND_CURSES)
 ENDMACRO()
 
 MACRO (MYSQL_USE_BUNDLED_EDITLINE)
+  SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")
   SET(USE_LIBEDIT_INTERFACE 1)
   SET(HAVE_HIST_ENTRY 1)
-  SET(EDITLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/editline)
+  SET(EDITLINE_INCLUDE_DIR
+    ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/libedit-20190324-3.1/src/editline)
   SET(EDITLINE_LIBRARY edit)
   FIND_CURSES()
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/libedit-20190324-3.1/src)
 ENDMACRO()
 
 MACRO (FIND_SYSTEM_EDITLINE)
@@ -142,8 +128,10 @@ MACRO (FIND_SYSTEM_EDITLINE)
 
   INCLUDE(CheckCXXSourceCompiles)
   IF(EDITLINE_LIBRARY AND EDITLINE_INCLUDE_DIR)
+    CMAKE_PUSH_CHECK_STATE()
+
     SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
-    SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
     #include <readline.h>
@@ -188,6 +176,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
         SET(USE_NEW_EDITLINE_INTERFACE 1)
       ENDIF()
     ENDIF()
+    CMAKE_POP_CHECK_STATE()
   ENDIF()
 ENDMACRO()