Merge 10.11 into 11.0

BUILD/SETUP.sh

@@ -216,15 +216,14 @@ max_plugins="--with-plugins=max"
 max_no_embedded_configs="$max_plugins"
 max_no_qc_configs="$max_plugins --without-query-cache"
 max_configs="$max_plugins --with-embedded-server --with-libevent --with-plugin-rocksdb=dynamic --with-plugin-test_sql_discovery=DYNAMIC --with-plugin-file_key_management=DYNAMIC --with-plugin-hashicorp_key_management=DYNAMIC --with-plugin-auth_gssapi=DYNAMIC"
-all_configs="$max_plugins --with-embedded-server --with-innodb_plugin --with-libevent"
+all_configs="$max_configs"
 
 #
 # CPU and platform specific compilation flags.
 #
 alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag"
-amd64_cflags="$check_cpu_cflags"
-amd64_cxxflags=""  # If dropping '--with-big-tables', add here  "-DBIG_TABLES"
 pentium_cflags="$check_cpu_cflags -m32"
+amd64_cflags="$check_cpu_cflags -m64"
 pentium64_cflags="$check_cpu_cflags -m64"
 ppc_cflags="$check_cpu_cflags"
 sparc_cflags=""

BUILD/compile-amd64-debug-all

@@ -1,7 +1,10 @@
 #! /bin/sh
+
 path=`dirname $0`
+set -- "$@" --with-debug=full
 . "$path/SETUP.sh"
+
 extra_flags="$amd64_cflags $debug_cflags"
 extra_configs="$amd64_configs $debug_configs $all_configs"
-
+CC="$CC --pipe"
 . "$path/FINISH.sh"

BUILD/compile-amd64-debug-max

@@ -1,7 +1,6 @@
 #! /bin/sh
 
-# Copyright (c) 2005, 2006 MySQL AB
-# Use is subject to license terms
+# Copyright (c) 2005, 2010, 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 as published by
@@ -14,11 +13,13 @@
 # 
 # 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 Street, Fifth Floor, Boston, MA  02110-1335  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
 
 path=`dirname $0`
 . "$path/SETUP.sh"
+
 extra_flags="$amd64_cflags $debug_cflags"
 extra_configs="$amd64_configs $debug_configs $max_configs"
 
+CC="$CC --pipe"
 . "$path/FINISH.sh"

BUILD/compile-pentium64-debug-all

@@ -6,7 +6,5 @@ set -- "$@" --with-debug=full
 
 extra_flags="$pentium64_cflags $debug_cflags"
 extra_configs="$pentium_configs $debug_configs $all_configs"
-
-extra_configs="$extra_configs "
 CC="$CC --pipe"
 . "$path/FINISH.sh"

BUILD/compile-pentium64-debug-max

@@ -21,6 +21,5 @@ path=`dirname $0`
 extra_flags="$pentium64_cflags $debug_cflags"
 extra_configs="$pentium_configs $debug_configs $max_configs"
 
-extra_configs="$extra_configs "
 CC="$CC --pipe"
 . "$path/FINISH.sh"

client/mysqltest.cc

@@ -5262,6 +5262,7 @@ void do_shutdown_server(struct st_command *command)
     if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout))
     {
       (void) my_kill(pid, SIGKILL);
+      wait_until_dead(pid, 5);
     }
   }
   DBUG_VOID_RETURN;

debian/autobake-deb.sh

@@ -196,34 +196,39 @@ dch -b -D "${LSBNAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}." --co
 
 echo "Creating package version ${VERSION} ... "
 
-BUILDPACKAGE_DPKGCMD=""
+BUILDPACKAGE_DPKGCMD=()
+
+# Fakeroot test
+if fakeroot true; then
+  BUILDPACKAGE_DPKGCMD+=( "fakeroot" "--" )
+fi
 
 # Use eatmydata is available to build faster with less I/O, skipping fsync()
 # during the entire build process (safe because a build can always be restarted)
 if which eatmydata > /dev/null
 then
-  BUILDPACKAGE_DPKGCMD="eatmydata"
+  BUILDPACKAGE_DPKGCMD+=("eatmydata")
 fi
 
-BUILDPACKAGE_DPKGCMD+="dpkg-buildpackage"
+BUILDPACKAGE_DPKGCMD+=("dpkg-buildpackage")
 
 # Using dpkg-buildpackage args
 # -us Allow unsigned sources
 # -uc Allow unsigned changes
 # -I  Tar ignore
-BUILDPACKAGE_DPKG_ARGS=(-us -uc -I)
+BUILDPACKAGE_DPKGCMD+=(-us -uc -I)
 
 # There can be also extra flags that are appended to args
 if [ -n "$BUILDPACKAGE_FLAGS" ]
 then
   read -ra BUILDPACKAGE_TMP_ARGS <<< "$BUILDPACKAGE_FLAGS"
-  BUILDPACKAGE_DPKG_ARGS=("${BUILDPACKAGE_DPKG_ARGS[@]} ${BUILDPACKAGE_TMP_ARGS[@]}")
+  BUILDPACKAGE_DPKGCMD+=( "${BUILDPACKAGE_TMP_ARGS[@]}" )
 fi
 
 # Build the package
 # Pass -I so that .git and other unnecessary temporary and source control files
 # will be ignored by dpkg-source when creating the tar.gz source package.
-fakeroot -- "${BUILDPACKAGE_DPKGCMD}" "${BUILDPACKAGE_DPKG_ARGS[@]}"
+"${BUILDPACKAGE_DPKGCMD[@]}"
 
 # If the step above fails due to missing dependencies, you can manually run
 #   sudo mk-build-deps debian/control -r -i

debian/control

@@ -932,6 +932,7 @@ Depends: libxml2,
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: curl
 Breaks: mariadb-connect-engine-10.0,
         mariadb-connect-engine-10.1,
         mariadb-connect-engine-10.2,