Merge 10.4 into 10.5

Author: dr-m

cmake/FindLZ4.cmake

@@ -1,9 +1,9 @@
 find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-find_library(LZ4_LIBRARY NAMES lz4)
+find_library(LZ4_LIBRARIES NAMES lz4)
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(
     LZ4 DEFAULT_MSG
-    LZ4_LIBRARY LZ4_INCLUDE_DIR)
+    LZ4_LIBRARIES LZ4_INCLUDE_DIR)
 
-mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)
+mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARIES)

cmake/Findzstd.cmake renamed to cmake/FindZSTD.cmake

@@ -5,10 +5,6 @@
 # ZSTD_LIBRARIES - List of libraries when using zstd.
 # ZSTD_FOUND - True if zstd found.
 
-if (DEFINED ZSTD_LIBRARIES)
-  return()
-endif()
-
 find_path(ZSTD_INCLUDE_DIR
   NAMES zstd.h
   HINTS ${ZSTD_ROOT_DIR}/include)
@@ -18,7 +14,7 @@ find_library(ZSTD_LIBRARIES
   HINTS ${ZSTD_ROOT_DIR}/lib)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIR)
+find_package_handle_standard_args(ZSTD DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIR)
 
 mark_as_advanced(
   ZSTD_LIBRARIES

cmake/configure.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 

cmake/dtrace.cmake

@@ -43,7 +43,8 @@ MACRO(CHECK_DTRACE)
  IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
      AND NOT BUGGY_GCC_NO_DTRACE_MODULES
      AND NOT BUGGY_LINUX_DTRACE
-     AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
+     AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS"
+     AND NOT WIN32)
    SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
  ENDIF()
  # On GNU/Hurd, dtrace is not supported

dbug/dbug.c

@@ -490,17 +490,17 @@ static int DbugParse(CODE_STATE *cs, const char *control)
   rel= control[0] == '+' || control[0] == '-';
   if ((!rel || (!stack->out_file && !stack->next)))
   {
+    LockIfInitSettings(cs);
     FreeState(cs, 0);
     stack->flags= 0;
     stack->delay= 0;
     stack->maxdepth= 0;
     stack->sub_level= 0;
     stack->out_file= sstderr;
     stack->functions= NULL;
-    LockIfInitSettings(cs);
     stack->keywords= NULL;
-    UnlockIfInitSettings(cs);
     stack->processes= NULL;
+    UnlockIfInitSettings(cs);
   }
   else if (!stack->out_file)
   {

dbug/dbug_add_tags.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright (c) 2002 MySQL AB, 2009 Sun Microsystems, Inc.
 # Use is subject to license terms.

dbug/remove_function_from_trace.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 die <<EEE unless @ARGV;
 Usage: $0 func1 [func2 [ ...] ]

debian/additions/mariadb-report

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 
 # mariadb-report v4.0 Oct 23 2015
 # renamed to from mysqlreport in 2020

extra/mariabackup/xtrabackup.cc

@@ -119,7 +119,7 @@ my_bool xtrabackup_move_back;
 my_bool xtrabackup_decrypt_decompress;
 my_bool xtrabackup_print_param;
 my_bool xtrabackup_mysqld_args;
-my_bool help;
+my_bool xtrabackup_help;
 
 my_bool xtrabackup_export;
 
@@ -1418,7 +1418,7 @@ struct my_option xb_server_options[] =
 
     {"help", '?',
      "Display this help and exit.",
-     (G_PTR *) &help, (G_PTR *) &help, 0,
+     (G_PTR *) &xtrabackup_help, (G_PTR *) &xtrabackup_help, 0,
      GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

include/scope.h

@@ -0,0 +1,66 @@
+/*
+   Copyright (c) 2020, MariaDB
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
+*/
+
+#pragma once
+
+#include <type_traits>
+#include <utility>
+
+namespace detail
+{
+
+template <typename Callable> class scope_exit
+{
+public:
+  template <typename F>
+  explicit scope_exit(F &&f) : function_(std::forward<F>(f))
+  {
+  }
+
+  scope_exit(scope_exit &&rhs)
+      : function_(std::move(rhs.function_)), engaged_(rhs.engaged_)
+  {
+    rhs.release();
+  }
+
+  scope_exit(const scope_exit &)= delete;
+  scope_exit &operator=(scope_exit &&)= delete;
+  scope_exit &operator=(const scope_exit &)= delete;
+
+  void release() { engaged_= false; }
+
+  ~scope_exit()
+  {
+    if (engaged_)
+      function_();
+  }
+
+private:
+  Callable function_;
+  bool engaged_= true;
+};
+
+} // end namespace detail
+
+template <typename Callable>
+detail::scope_exit<typename std::decay<Callable>::type>
+make_scope_exit(Callable &&f)
+{
+  return detail::scope_exit<typename std::decay<Callable>::type>(
+      std::forward<Callable>(f));
+}