Update changelog after 10.1.41 import

debian/changelog

-mariadb-10.1 (10.1.40-0+deb9u1) stretch; urgency=medium
-
-  * SECURITY UPDATE: New upstream version 10.1.40. Previous release 10.1.39
+mariadb-10.1 (10.1.41-0+deb9u1) stretch; urgency=medium
+
+  * SECURITY UPDATE: New upstream version 10.1.41. Includes fixes for the
+    following security vulnerabilities:
+    - CVE-2019-2737
+    - CVE-2019-2739
+    - CVE-2019-2740
+    - CVE-2019-2805
+  * Previous release 10.1.39
     includes fixes for the following security vulnerabilities:
     - CVE-2019-2627
     - CVE-2019-2614
   * Amend previous changelog entries to include newly released CVE numbers.
+  * Gitlab-CI: Sync latest version from Debian Sid but with Stretch adaptions
 
- -- Otto Kekäläinen <otto@debian.org>  Sun, 19 May 2019 20:08:36 +0300
+ -- Otto Kekäläinen <otto@debian.org>  Fri, 02 Aug 2019 18:10:23 +0100
 
 mariadb-10.1 (10.1.38-0+deb9u1) stretch; urgency=medium
 

debian/patches/c11_atomics.patch

@@ -53,7 +53,7 @@ Subject: c11_atomics
 +++ b/include/atomic/gcc_builtins.h
 @@ -16,6 +16,7 @@
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
  
 +#if defined (HAVE_GCC_ATOMIC_BUILTINS)
  #define make_atomic_add_body(S)                     \
@@ -83,7 +83,7 @@ Subject: c11_atomics
 --- a/include/atomic/nolock.h
 +++ b/include/atomic/nolock.h
 @@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
  
  #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
 -    || defined(HAVE_GCC_ATOMIC_BUILTINS) \

debian/patches/kFreeBSD-gettid.patch

@@ -8,7 +8,7 @@ Subject: kFreeBSD-gettid
 
 --- a/storage/tokudb/PerconaFT/portability/portability.cc
 +++ b/storage/tokudb/PerconaFT/portability/portability.cc
-@@ -118,6 +118,10 @@ toku_os_gettid(void) {
+@@ -120,6 +120,10 @@ toku_os_gettid(void) {
      return syscall(SYS_gettid);
  #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
      return pthread_getthreadid_np();

debian/patches/mips-compilation-failure-__bss_start-symbol-miss.patch

@@ -20,7 +20,7 @@ and will correctly detect if __bss_start will be available or not.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -333,6 +333,8 @@ ELSE()
+@@ -335,6 +335,8 @@ ELSE()
    SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
  ENDIF()
  
@@ -29,7 +29,7 @@ and will correctly detect if __bss_start will be available or not.
  # Run platform tests
  INCLUDE(configure.cmake)
  
-@@ -365,8 +367,6 @@ CHECK_JEMALLOC()
+@@ -367,8 +369,6 @@ CHECK_JEMALLOC()
  
  CHECK_PCRE()
  

debian/patches/mips-connect-unaligned.patch

@@ -7,8 +7,6 @@ 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
@@ -97,7 +95,7 @@ index 018c7ee..d32f804 100644
    CheckType(pv)
    TYPE *lp = ((TYPBLK*)pv)->Typp;
  
--  for (register int i = k; i < n; i++)          // TODO
+-  for (int i = k; i < n; i++)          // TODO
 -    Typp[i] = lp[i];
 +  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
  
@@ -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

@@ -14,7 +14,7 @@ Subject: mysql-test__db_test
 
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3227,6 +3227,10 @@ sub mysql_install_db {
+@@ -3230,6 +3230,10 @@ sub mysql_install_db {
        mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
             $bootstrap_sql_file);
  

debian/patches/remove_rename_mariadb-server_files_in.patch

@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -465,12 +465,6 @@ CONFIGURE_FILE(
+@@ -467,12 +467,6 @@ CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
      ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)