Update changelog and refresh patches after 10.1.34 import

debian/changelog

+mariadb-10.1 (1:10.1.34-1) unstable; urgency=medium
+
+  * New upstream release 10.1.34.
+  * Previous upstream version 10.1.33 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-2819
+    - CVE-2018-2817
+    - CVE-2018-2813
+    - CVE-2018-2787
+    - CVE-2018-2784
+    - CVE-2018-2782
+    - CVE-2018-2781
+    - CVE-2018-2771
+    - CVE-2018-2766
+    - CVE-2018-2761
+    - CVE-2018-2755
+  * Previous upstream version 10.1.31 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-2668
+    - CVE-2018-2665
+    - CVE-2018-2640
+    - CVE-2018-2622
+    - CVE-2018-2612
+    - CVE-2018-2562
+  * Previous upstream version 10.1.30 included fixes for the following
+    security vulnerabilities:
+    - CVE-2017-15365
+
+ -- Otto Kekäläinen <otto@debian.org>  Tue, 31 Jul 2018 14:58:30 +0800
+
 mariadb-10.1 (1:10.1.29-6) unstable; urgency=high
 
   * Ignore failed tests on more non-release platforms (kfreebsd-i386,

debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch

@@ -8,11 +8,9 @@ Subject: Change the default optimization from -O3 to -O2 in
  .../PerconaFT/cmake_modules/TokuSetupCompiler.cmake      | 16 ++++++++--------
  2 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
-index c07de46..69a70ff 100644
 --- a/cmake/build_configurations/mysql_release.cmake
 +++ b/cmake/build_configurations/mysql_release.cmake
-@@ -155,12 +155,12 @@ IF(UNIX)
+@@ -156,12 +156,12 @@ IF(UNIX)
    IF(CMAKE_COMPILER_IS_GNUCC)
      SET(COMMON_C_FLAGS               "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing  -Wno-uninitialized")
      SET(CMAKE_C_FLAGS_DEBUG          "-O ${COMMON_C_FLAGS}")
@@ -27,7 +25,7 @@ index c07de46..69a70ff 100644
    ENDIF()
  
    # IBM Z flags
-@@ -209,8 +209,8 @@ IF(UNIX)
+@@ -210,8 +210,8 @@ IF(UNIX)
        ENDIF()
        SET(CMAKE_C_FLAGS_DEBUG            "${COMMON_C_FLAGS}")
        SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
@@ -38,7 +36,7 @@ index c07de46..69a70ff 100644
        SET(WITH_SSL no)
      ENDIF()
    ENDIF()
-@@ -219,12 +219,12 @@ IF(UNIX)
+@@ -220,12 +220,12 @@ IF(UNIX)
    IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
      SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
      SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
@@ -53,11 +51,9 @@ index c07de46..69a70ff 100644
    ENDIF()
  
    # Solaris flags
-diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
-index 0cd9a9c..3b4b43c 100644
 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
 +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
-@@ -115,10 +115,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}")
+@@ -121,10 +121,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE
  ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them
  if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
    # have tried -flto and -O4, both make our statically linked executables break apple's linker
@@ -72,7 +68,7 @@ index 0cd9a9c..3b4b43c 100644
  else ()
    if (APPLE)
      set(FLTO_OPTS "-fwhole-program")
-@@ -126,10 +126,10 @@ else ()
+@@ -132,10 +132,10 @@ else ()
      set(FLTO_OPTS "-fuse-linker-plugin")
    endif()
    # we overwrite this because the default passes -DNDEBUG and we don't want that

debian/patches/Add_default_ExecStartPre_to_mariadb@.service.patch

@@ -6,11 +6,9 @@ Subject: Add_default_ExecStartPre_to_mariadb@.service
  support-files/mariadb@.service.in | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
-index 02be006..183b68b 100644
 --- a/support-files/mariadb@.service.in
 +++ b/support-files/mariadb@.service.in
-@@ -65,6 +65,8 @@ ProtectHome=true
+@@ -67,6 +67,8 @@ ProtectHome=true
  # Execute pre and post scripts as root, otherwise it does it as User=
  PermissionsStartOnly=true
  

debian/patches/c11_atomics.patch

@@ -10,8 +10,6 @@ Subject: c11_atomics
  sql/CMakeLists.txt            |  4 ++++
  5 files changed, 46 insertions(+), 4 deletions(-)
 
-diff --git a/configure.cmake b/configure.cmake
-index 0057c7f..43ad114 100644
 --- a/configure.cmake
 +++ b/configure.cmake
 @@ -128,7 +128,7 @@ IF(UNIX)
@@ -23,7 +21,7 @@ index 0057c7f..43ad114 100644
      ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
    # Need explicit pthread for gcc -fsanitize=address
    IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1028,7 +1028,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
+@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
      long long int *ptr= &var;
      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
    }"
@@ -51,8 +49,6 @@ index 0057c7f..43ad114 100644
  ELSE()
    MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
  ENDIF()
-diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h
-index 56a0323..044be2e 100644
 --- a/include/atomic/gcc_builtins.h
 +++ b/include/atomic/gcc_builtins.h
 @@ -16,6 +16,7 @@
@@ -84,8 +80,6 @@ index 56a0323..044be2e 100644
  #ifdef MY_ATOMIC_MODE_DUMMY
  #define make_atomic_load_body(S)   ret= *a
  #define make_atomic_store_body(S)  *a= v
-diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h
-index 2137445..2ad7d98 100644
 --- a/include/atomic/nolock.h
 +++ b/include/atomic/nolock.h
 @@ -17,7 +17,7 @@
@@ -106,8 +100,6 @@ index 2137445..2ad7d98 100644
  #      include "gcc_builtins.h"
  #    elif defined(__i386__) || defined(__x86_64__)
  #      include "x86-gcc.h"
-diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
-index eb7f75e..a9221d7 100644
 --- a/mysys/CMakeLists.txt
 +++ b/mysys/CMakeLists.txt
 @@ -78,6 +78,10 @@ IF(HAVE_BFD_H)
@@ -121,11 +113,9 @@ index eb7f75e..a9221d7 100644
  IF (WIN32)
    TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
  ENDIF(WIN32)
-diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index b4acac5..8247714 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
+@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
    ${SSL_LIBRARIES}
    ${LIBSYSTEMD})
  

debian/patches/extend_default_test_timeout_for_tokudb.patch

@@ -6,11 +6,9 @@ Subject: extend_default_test_timeout_for_tokudb
  mysql-test/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
-index 1c7cfaf..bc45177 100644
 --- a/mysql-test/CMakeLists.txt
 +++ b/mysql-test/CMakeLists.txt
-@@ -64,7 +64,7 @@ ELSE()
+@@ -65,7 +65,7 @@ ELSE()
  ENDIF()
  
  

debian/patches/fix-FTBFS-on-GNU-Hurd.patch

@@ -11,12 +11,10 @@ Subject: fix-FTBFS-on-GNU-Hurd
  storage/mroonga/vendor/groonga/config.h.cmake |  1 +
  6 files changed, 68 insertions(+), 21 deletions(-)
 
-diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
-index 3edcdc4..c090d65 100644
 --- a/cmake/dtrace.cmake
 +++ b/cmake/dtrace.cmake
-@@ -45,6 +45,10 @@ MACRO(CHECK_DTRACE)
-      AND NOT BUGGY_LINUX_DTRACE) 
+@@ -46,6 +46,10 @@ MACRO(CHECK_DTRACE)
+      AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
     SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
   ENDIF()
 + # On GNU/Hurd, dtrace is not supported
@@ -26,8 +24,6 @@ index 3edcdc4..c090d65 100644
   SET(HAVE_DTRACE ${ENABLE_DTRACE})
   IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
     IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
-index 7681f78..2a9b1e1 100644
 --- a/cmake/package_name.cmake
 +++ b/cmake/package_name.cmake
 @@ -81,6 +81,9 @@ IF(NOT VERSION)
@@ -40,8 +36,6 @@ index 7681f78..2a9b1e1 100644
      ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        IF(CMAKE_OSX_DEPLOYMENT_TARGET)
          SET(DEFAULT_PLATFORM "osx${CMAKE_OSX_DEPLOYMENT_TARGET}")
-diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
-index c019209..632faad 100644
 --- a/extra/mariabackup/backup_copy.cc
 +++ b/extra/mariabackup/backup_copy.cc
 @@ -623,11 +623,13 @@ static
@@ -61,7 +55,7 @@ index c019209..632faad 100644
  
  	for (p = parent + strlen(parent);
  	    !is_path_separator(*p) && p != parent; p--);
-@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags, myf MyFlags)
+@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags,
  
  	/* try to make parent directory */
  	if (p != parent && mkdirp(parent, Flags, MyFlags) != 0) {
@@ -115,8 +109,6 @@ index c019209..632faad 100644
  #else
  	return strcmp(first, second) == 0;
  #endif
-diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
-index 892e091..9bf44e0 100644
 --- a/mysys/mysys_priv.h
 +++ b/mysys/mysys_priv.h
 @@ -16,6 +16,10 @@
@@ -139,7 +131,7 @@ index 892e091..9bf44e0 100644
  #define O_PATH O_EXEC
  #endif
  #endif
-@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlinks(const char *pathname, int *pdfd);
+@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlink
    return res;
  #elif defined(HAVE_REALPATH) && defined(PATH_MAX)
  #define NOSYMLINK_FUNCTION_BODY(AT,NOAT)                                \
@@ -150,11 +142,9 @@ index 892e091..9bf44e0 100644
    if (strcmp(pathname, buf)) { errno= ENOTDIR; return -1; }             \
    return NOAT;
  #elif defined(HAVE_REALPATH)
-diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
-index 998f4e7..784b235 100644
 --- a/sql/wsrep_binlog.cc
 +++ b/sql/wsrep_binlog.cc
-@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t*  const wsrep,
+@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t*  const ws
  
  void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len)
  {
@@ -182,7 +172,7 @@ index 998f4e7..784b235 100644
      return;
    }
  
-@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len)
+@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const
      WSREP_ERROR("Failed to open file '%s': %d (%s)",
                  filename, errno, strerror(errno));
    }
@@ -190,7 +180,7 @@ index 998f4e7..784b235 100644
  }
  
  /*
-@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf,
+@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD
  {
    DBUG_ENTER("wsrep_dump_rbr_buf_with_header");
  
@@ -226,7 +216,7 @@ index 998f4e7..784b235 100644
      DBUG_VOID_RETURN;
    }
  
-@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf,
+@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD
    }
  
  cleanup2:
@@ -234,8 +224,6 @@ index 998f4e7..784b235 100644
    end_io_cache(&cache);
  
  cleanup1:
-diff --git a/storage/mroonga/vendor/groonga/config.h.cmake b/storage/mroonga/vendor/groonga/config.h.cmake
-index bfd0cbd..ec67c5e 100644
 --- a/storage/mroonga/vendor/groonga/config.h.cmake
 +++ b/storage/mroonga/vendor/groonga/config.h.cmake
 @@ -107,6 +107,7 @@

debian/patches/kFreeBSD-gettid.patch

@@ -6,11 +6,9 @@ Subject: kFreeBSD-gettid
  storage/tokudb/PerconaFT/portability/portability.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/storage/tokudb/PerconaFT/portability/portability.cc b/storage/tokudb/PerconaFT/portability/portability.cc
-index 19f445a..73dce92 100644
 --- a/storage/tokudb/PerconaFT/portability/portability.cc
 +++ b/storage/tokudb/PerconaFT/portability/portability.cc
-@@ -115,6 +115,10 @@ toku_os_gettid(void) {
+@@ -118,6 +118,10 @@ toku_os_gettid(void) {
      return syscall(SYS_gettid);
  #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
      return pthread_getthreadid_np();

debian/patches/libmariadbclient-rename.patch

@@ -13,8 +13,6 @@ Subject: libmariadbclient-rename
  unittest/mysys/CMakeLists.txt |  2 +-
  8 files changed, 46 insertions(+), 41 deletions(-)
 
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index e4643ad..523912e 100644
 --- a/client/CMakeLists.txt
 +++ b/client/CMakeLists.txt
 @@ -32,7 +32,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -85,8 +83,6 @@ index e4643ad..523912e 100644
  
  SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
  PROPERTIES HAS_CXX TRUE)
-diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake
-index dd79ea1..879da78 100644
 --- a/cmake/for_clients.cmake
 +++ b/cmake/for_clients.cmake
 @@ -2,8 +2,8 @@
@@ -113,8 +109,6 @@ index dd79ea1..879da78 100644
  SET(EMB_LIBS "-lmysqld ${ZLIB_DEPS} ${EMB_LIBS} ${openssl_libs}")
  
  MACRO(REPLACE_FOR_CLIENTS VAR)
-diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
-index acbd80b..5819d79 100644
 --- a/libmysql/CMakeLists.txt
 +++ b/libmysql/CMakeLists.txt
 @@ -398,6 +398,10 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -173,9 +167,9 @@ index acbd80b..5819d79 100644
 +      OUTPUT_NAME mariadbclient 
        VERSION "${OS_SHARED_LIB_VERSION}" 
        SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
-     IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
+     IF(VERSION_SCRIPT_LINK_FLAGS)
 @@ -510,13 +515,13 @@ IF(NOT DISABLE_SHARED)
-         "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
+         "${libmysql_link_flags} ${VERSION_SCRIPT_LINK_FLAGS}")
      ENDIF() 
      # clean direct output needs to be set several targets have the same name
 -    #(mysqlclient in this case)
@@ -201,8 +195,6 @@ index acbd80b..5819d79 100644
          "${CMAKE_SHARED_LIBRARY_SUFFIX}"
          "${ver}"
          linkname)
-diff --git a/man/mysql_config.1 b/man/mysql_config.1
-index 47e8a3a..c699974 100644
 --- a/man/mysql_config.1
 +++ b/man/mysql_config.1
 @@ -38,7 +38,7 @@ supports the following options\&.
@@ -214,7 +206,7 @@ index 47e8a3a..c699974 100644
  library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
  \fB\-\-include\fR
  for more portable options that contain only include paths\&.
-@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config [options]
+@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config
  Options:
    \-\-cflags         [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
    \-\-include        [\-I/usr/local/mysql/include/mysql]
@@ -226,8 +218,6 @@ index 47e8a3a..c699974 100644
                      \-lpthread \-lz \-lcrypt \-lnsl \-lm \-lpthread]
    \-\-socket         [/tmp/mysql\&.sock]
    \-\-port           [3306]
-diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
-index 2415d40..bfff308 100755
 --- a/scripts/make_win_bin_dist
 +++ b/scripts/make_win_bin_dist
 @@ -293,7 +293,7 @@ mkdir -p $DESTDIR/lib/plugin
@@ -239,7 +229,7 @@ index 2415d40..bfff308 100755
     mysys/$TARGET/mysys.lib \
     regex/$TARGET/regex.lib \
     strings/$TARGET/strings.lib \
-@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/lib/plugin/
+@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/l
  
  if [ x"$TARGET" != x"release" ] ; then
    cp libmysql/$TARGET/libmysql.pdb \
@@ -248,7 +238,7 @@ index 2415d40..bfff308 100755
       mysys/$TARGET/mysys.pdb \
       regex/$TARGET/regex.pdb \
       strings/$TARGET/strings.pdb \
-@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
+@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysq
    cp libmysql/debug/libmysql.dll \
       libmysql/debug/libmysql.lib \
       libmysql/debug/libmysql.pdb \
@@ -259,8 +249,6 @@ index 2415d40..bfff308 100755
       mysys/debug/mysys.lib \
       mysys/debug/mysys.pdb \
       regex/debug/regex.lib \
-diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
-index f2c27bc..9cf718b 100644
 --- a/scripts/mysql_config.pl.in
 +++ b/scripts/mysql_config.pl.in
 @@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" )
@@ -282,8 +270,6 @@ index f2c27bc..9cf718b 100644
    @lib_e_opts = ($linkpath,"-lmysqld");
  }
  
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index f32e027..cb7e31c 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
 @@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
@@ -310,11 +296,9 @@ index f32e027..cb7e31c 100644
    SET_TARGET_PROPERTIES(async_queries PROPERTIES LINKER_LANGUAGE CXX)
  
  ENDIF()
-diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt
-index ad5195a..965df3c 100644
 --- a/unittest/mysys/CMakeLists.txt
 +++ b/unittest/mysys/CMakeLists.txt
-@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES
  ADD_DEFINITIONS(${SSL_DEFINES})
  
  MY_ADD_TESTS(ma_dyncol

debian/patches/mips-connect-unaligned.patch

@@ -7,11 +7,9 @@ Subject: mips-connect-unaligned
  storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
  2 files changed, 52 insertions(+), 40 deletions(-)
 
-diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
-index 018c7ee..d32f804 100644
 --- a/storage/connect/valblk.cpp
 +++ b/storage/connect/valblk.cpp
-@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool check)
+@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
  template <class TYPE>
  char *TYPBLK<TYPE>::GetCharString(char *p, int n)
    {
@@ -28,7 +26,7 @@ index 018c7ee..d32f804 100644
    return p;
    } // end of GetCharString
  
-@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, int n)
+@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
    ChkTyp(valp);
  
    if (!(b = valp->IsNull()))
@@ -37,7 +35,7 @@ index 018c7ee..d32f804 100644
    else
      Reset(n);
  
-@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int n)
+@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
    ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
      
    if (minus && val < maxval)
@@ -49,7 +47,7 @@ index 018c7ee..d32f804 100644
  
    SetNull(n, false);
    } // end of SetValue
-@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, int n)
+@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
  		throw Type;
  	} // endif Check
  
@@ -58,7 +56,7 @@ index 018c7ee..d32f804 100644
    SetNull(n, false);
    } // end of SetValue
  
-@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, int n1, int n2)
+@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
    ChkTyp(pv);
  
    if (!(b = pv->IsNull(n2) && Nullable))
@@ -67,7 +65,7 @@ index 018c7ee..d32f804 100644
    else
      Reset(n1);
  
-@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int n)
+@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
    {
    CheckParms(valp, n)
    TYPE  tval = GetTypedValue(valp);
@@ -80,7 +78,7 @@ index 018c7ee..d32f804 100644
  
    } // end of SetMin
  
-@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int n)
+@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
    {
    CheckParms(valp, n)
    TYPE  tval = GetTypedValue(valp);
@@ -93,7 +91,7 @@ index 018c7ee..d32f804 100644
  
    } // end of SetMax
  
-@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
+@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
    CheckType(pv)
    TYPE *lp = ((TYPBLK*)pv)->Typp;
  
@@ -103,7 +101,7 @@ index 018c7ee..d32f804 100644
  
    } // end of SetValues
  #endif // 0
-@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
+@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
  template <class TYPE>
  void TYPBLK<TYPE>::Move(int i, int j)
    {
@@ -112,7 +110,7 @@ index 018c7ee..d32f804 100644
    MoveNull(i, j);
    } // end of Move
  
-@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
+@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
    ChkIndx(n);
    ChkTyp(vp);
  #endif   // _DEBUG
@@ -121,7 +119,7 @@ index 018c7ee..d32f804 100644
    TYPE vlv = GetTypedValue(vp);
  
    return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
+@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
  template <class TYPE>
  int TYPBLK<TYPE>::CompVal(int i1, int i2)
    {
@@ -150,7 +148,7 @@ index 018c7ee..d32f804 100644
      n = MY_MAX(n, m);
      } // endfor i
  
-@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int n)
+@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int
    char *vp;
  
    if (Dvalp) {
@@ -168,8 +166,6 @@ index 018c7ee..d32f804 100644
    } else
      TYPBLK<int>::SetValue(p, n);
  
-diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h
-index ad97010..3912868 100644
 --- a/storage/connect/valblk.h
 +++ b/storage/connect/valblk.h
 @@ -139,6 +139,7 @@ class VALBLK : public BLOCK {

debian/patches/mysql-test__db_test.patch

@@ -12,11 +12,9 @@ Subject: mysql-test__db_test
  mysql-test/mysql-test-run.pl | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
-index ac9f493..7e7f116 100755
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3203,6 +3203,10 @@ sub mysql_install_db {
+@@ -3222,6 +3222,10 @@ sub mysql_install_db {
        mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
             $bootstrap_sql_file);
  

debian/patches/mytop-merge_src:mytop_improvements.patch

@@ -6,11 +6,9 @@ Subject: mytop-merge_src:mytop_improvements
  scripts/mytop.sh | 184 +++++++++++++++++++++++++++++++++++++++----------------
  1 file changed, 132 insertions(+), 52 deletions(-)
 
-diff --git a/scripts/mytop.sh b/scripts/mytop.sh
-index 17a87e9..e8cc902 100644
 --- a/scripts/mytop.sh
 +++ b/scripts/mytop.sh
-@@ -15,6 +15,7 @@ mytop - display MariaDB server performance info like `top'
+@@ -15,6 +15,7 @@ mytop - display MariaDB server performan
  use 5.005;
  use strict;
  use DBI;
@@ -36,7 +34,7 @@ index 17a87e9..e8cc902 100644
      port          => 3306,
      resolve       => 0,
      slow	  => 10,	# slow query time
-@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which("my_print_defaults")))
+@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which
  
  unshift @ARGV, split "\n", `$my_print_defaults client mytop`;
  
@@ -261,7 +259,7 @@ index 17a87e9..e8cc902 100644
  
      open P, "|$config{pager}" or die "$!";
      print keys %{$data[0]};
-@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by
    e - explain the query that a thread is running
    E - display current replication error
    f - show full query info for a given thread
@@ -270,7 +268,7 @@ index 17a87e9..e8cc902 100644
    h - show only a specifc host's connections
    H - toggle the mytop header
    i - toggle the display of idle (sleeping) threads
-@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by
    r - reset the status counters (via FLUSH STATUS on your server)
    R - change reverse IP lookup
    s - change the delay between screen updates
@@ -279,7 +277,7 @@ index 17a87e9..e8cc902 100644
    t - switch to thread view (default)
    u - show only a specific user
    V - show variables
-@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by
    ! - Skip an error that has stopped replications (at your own risk)
    L - show full queries (do not strip to terminal width)
  
@@ -307,7 +305,7 @@ index 17a87e9..e8cc902 100644
  
  This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>.
  
-@@ -1875,6 +1926,7 @@ In order for B<mytop> to function properly, you must have the
+@@ -1875,6 +1926,7 @@ In order for B<mytop> to function proper
  following:
  
    * Perl 5.005 or newer
@@ -315,7 +313,7 @@ index 17a87e9..e8cc902 100644
    * Getopt::Long
    * DBI and DBD::mysql
    * Term::ReadKey from CPAN
-@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments only have one '-'.
+@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments on
  
  =over
  
@@ -437,7 +435,7 @@ index 17a87e9..e8cc902 100644
  =head2 Shortcut Keys
  
  The following keys perform various actions while B<mytop> is
-@@ -2204,8 +2287,8 @@ running queries appear at the top of the list.
+@@ -2204,8 +2287,8 @@ running queries appear at the top of the
  
  =item B<I>
  
@@ -459,7 +457,7 @@ index 17a87e9..e8cc902 100644
  
  =head1 BUGS
  
-@@ -2292,9 +2375,6 @@ width. If you have fairly long database/user/host names the display
+@@ -2292,9 +2375,6 @@ width. If you have fairly long database/
  may appear odd. I have no good idea as to how best to deal with that
  yet. Suggestions are welcome.
  

debian/patches/remove-systemd-obsolete-target.patch

@@ -7,25 +7,21 @@ Subject: remove-systemd-obsolete-target
  support-files/mariadb@.service.in | 1 -
  2 files changed, 2 deletions(-)
 
-diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
-index 6a307b2..7f40583 100644
 --- a/support-files/mariadb.service.in
 +++ b/support-files/mariadb.service.in
-@@ -15,7 +15,6 @@
- [Unit]
- Description=MariaDB database server
+@@ -17,7 +17,6 @@ Description=MariaDB @VERSION@ database s
+ Documentation=man:mysqld(8)
+ Documentation=https://mariadb.com/kb/en/library/systemd/
  After=network.target
 -After=syslog.target
  
  [Install]
  WantedBy=multi-user.target
-diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
-index 410e743..02be006 100644
 --- a/support-files/mariadb@.service.in
 +++ b/support-files/mariadb@.service.in
-@@ -20,7 +20,6 @@
- [Unit]
- Description=MariaDB database server
+@@ -22,7 +22,6 @@ Description=MariaDB @VERSION@ database s
+ Documentation=man:mysqld(8)
+ Documentation=https://mariadb.com/kb/en/library/systemd/
  After=network.target
 -After=syslog.target
  

debian/patches/remove_rename_mariadb-server_files_in.patch

@@ -6,11 +6,9 @@ Subject: remove_rename_mariadb-server_files_in
  CMakeLists.txt | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a386549..fdfead9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -443,12 +443,6 @@ CONFIGURE_FILE(
+@@ -448,12 +448,6 @@ CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
      ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  

debian/patches/scripts__mysql_install_db.sh__no_test.patch

@@ -11,11 +11,9 @@ Subject: scripts__mysql_install_db.sh__no_test
  scripts/mysql_install_db.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
-index aad9ef5..c6f0e3c 100644
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -408,7 +408,7 @@ then
+@@ -414,7 +414,7 @@ then
  fi
  
  # Create database directories