Update changelog and refresh patches after 10.1.38 import

debian/changelog

+mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.1) bionic-security; urgency=medium
+
+  * SECURITY UPDATE: New upstream release 10.1.38. Includes fixes for
+    the following security vulnerabilities (LP: #1814258):
+    - CVE-2019-2537
+    - CVE-2019-2529
+  * Previous upstream version 10.1.37 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-3282
+    - CVE-2018-3251
+    - CVE-2018-3174
+    - CVE-2018-3156
+    - CVE-2018-3143
+    - CVE-2016-9843
+  * Previous upstream version 10.1.35 included fixes for the following
+    security vulnerabilities:
+    - CVE-2019-2503
+  * Previous upstream version 10.1.35 included fixes for the following
+    security vulnerabilities:
+    - CVE-2018-3066
+    - CVE-2018-3064
+    - CVE-2018-3063
+    - CVE-2018-3058
+
+ -- Otto Kekäläinen <otto@debian.org>  Wed, 06 Feb 2019 07:53:10 +0200
+
 mariadb-10.1 (1:10.1.34-0ubuntu0.18.04.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: New upstream release 10.1.34. Includes fixes for

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

@@ -10,7 +10,7 @@ Subject: Change the default optimization from -O3 to -O2 in
 
 --- a/cmake/build_configurations/mysql_release.cmake
 +++ b/cmake/build_configurations/mysql_release.cmake
-@@ -156,12 +156,12 @@ IF(UNIX)
+@@ -155,12 +155,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}")
@@ -25,7 +25,7 @@ Subject: Change the default optimization from -O3 to -O2 in
    ENDIF()
  
    # IBM Z flags
-@@ -210,8 +210,8 @@ IF(UNIX)
+@@ -209,8 +209,8 @@ IF(UNIX)
        ENDIF()
        SET(CMAKE_C_FLAGS_DEBUG            "${COMMON_C_FLAGS}")
        SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
@@ -36,7 +36,7 @@ Subject: Change the default optimization from -O3 to -O2 in
        SET(WITH_SSL no)
      ENDIF()
    ENDIF()
-@@ -220,12 +220,12 @@ IF(UNIX)
+@@ -219,12 +219,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,7 +53,7 @@ Subject: Change the default optimization from -O3 to -O2 in
    # Solaris flags
 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
 +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
-@@ -121,10 +121,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE
+@@ -124,10 +124,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
@@ -68,7 +68,7 @@ Subject: Change the default optimization from -O3 to -O2 in
  else ()
    if (APPLE)
      set(FLTO_OPTS "-fwhole-program")
-@@ -132,10 +132,10 @@ else ()
+@@ -135,10 +135,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/armhf_mroonga_storage_fail.patch

@@ -6,11 +6,9 @@ Subject: armhf_mroonga_storage_fail
  storage/mroonga/lib/mrn_multiple_column_key_codec.cpp | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
-index 0038a7f..5213da8 100644
 --- a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
 +++ b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
-@@ -621,9 +621,10 @@ namespace mrn {
+@@ -623,9 +623,10 @@ namespace mrn {
      long long int long_long_value;
      mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size);
      int max_bit = (grn_key_size * 8 - 1);

debian/patches/c11_atomics.patch

@@ -102,7 +102,7 @@ Subject: c11_atomics
  #      include "x86-gcc.h"
 --- a/mysys/CMakeLists.txt
 +++ b/mysys/CMakeLists.txt
-@@ -78,6 +78,10 @@ IF(HAVE_BFD_H)
+@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
    TARGET_LINK_LIBRARIES(mysys bfd)  
  ENDIF(HAVE_BFD_H)
  

debian/patches/libmariadbclient-rename.patch

@@ -15,7 +15,7 @@ Subject: libmariadbclient-rename
 
 --- a/client/CMakeLists.txt
 +++ b/client/CMakeLists.txt
-@@ -32,7 +32,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+@@ -33,7 +33,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
  ADD_DEFINITIONS(${SSL_DEFINES})
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                             ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
@@ -24,12 +24,12 @@ Subject: libmariadbclient-rename
  IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
-@@ -40,39 +40,39 @@ ENDIF(UNIX)
+@@ -41,39 +41,39 @@ ENDIF(UNIX)
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
-+TARGET_LINK_LIBRARIES(mysqltest mariadbclient pcre pcreposix)
+-TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
++TARGET_LINK_LIBRARIES(mysqltest mariadbclient pcreposix pcre)
  SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
  
  
@@ -74,7 +74,7 @@ Subject: libmariadbclient-rename
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -81,7 +81,7 @@ ENDIF(WIN32)
+@@ -82,7 +82,7 @@ ENDIF(WIN32)
  
  # async_example is just a code example, do not install it.
  ADD_EXECUTABLE(async_example async_example.c)

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
-@@ -3222,6 +3222,10 @@ sub mysql_install_db {
+@@ -3225,6 +3225,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

@@ -170,7 +170,7 @@ Subject: mytop-merge_src:mytop_improvements
  
 -          printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n",
 +          printf(" Sorts: %6.0f qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n",
- 		 ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta, 
+ 		 ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta,
                   ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
                   ( # slow now (qps)
 @@ -1020,7 +1062,7 @@ sub GetData()
@@ -211,7 +211,7 @@ Subject: mytop-merge_src:mytop_improvements
  	if (defined($data->{Master_Host}))
          {
  	    if (defined($data->{Seconds_Behind_Master}))
-@@ -1210,6 +1252,11 @@ sub GetData()
+@@ -1211,6 +1253,11 @@ sub GetData()
  #	    my $host = $thread->{Host};
  	    my $host = gethostbyaddr(inet_aton($thread->{Host}), AF_INET);
  #            $host =~ s/^([^.]+).*/$1/;
@@ -223,7 +223,7 @@ Subject: mytop-merge_src:mytop_improvements
              $thread->{Host} = $host;
          }
  
-@@ -1233,18 +1280,19 @@ sub GetData()
+@@ -1234,18 +1281,19 @@ sub GetData()
          ## break EXPLAIN if you try to explain a mangled query.  It
          ## may be re-enabled later as an option.
  
@@ -250,7 +250,7 @@ Subject: mytop-merge_src:mytop_improvements
          ## stow it in the cache
  
          $qcache{$thread->{Id}}  = $thread->{Info};
-@@ -1371,7 +1419,7 @@ sub GetInnoDBStatus()
+@@ -1372,7 +1420,7 @@ sub GetInnoDBStatus()
          }
      }
  
@@ -259,7 +259,7 @@ Subject: mytop-merge_src:mytop_improvements
  
      open P, "|$config{pager}" or die "$!";
      print keys %{$data[0]};
-@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by
+@@ -1723,7 +1771,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
@@ -268,7 +268,7 @@ Subject: mytop-merge_src:mytop_improvements
    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
+@@ -1738,7 +1786,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
@@ -277,7 +277,7 @@ Subject: mytop-merge_src:mytop_improvements
    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
+@@ -1746,7 +1794,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)
  
@@ -286,7 +286,7 @@ Subject: mytop-merge_src:mytop_improvements
  This version comes as part of the ${GREEN}MariaDB${RESET} distribution.
  ];
  
-@@ -1805,6 +1853,9 @@ sub Hashes($)
+@@ -1806,6 +1854,9 @@ sub Hashes($)
  sub Execute($)
  {
      my $sql = shift;
@@ -296,7 +296,7 @@ Subject: mytop-merge_src:mytop_improvements
      my $sth = $dbh->prepare($sql);
  
      if (not $sth) { ReadMode($RM_RESET); die $DBI::errstr; }
-@@ -1861,7 +1912,7 @@ B<mytop> [options]
+@@ -1862,7 +1913,7 @@ B<mytop> [options]
  
  =head1 AVAILABILITY
  
@@ -305,7 +305,7 @@ Subject: mytop-merge_src:mytop_improvements
  
  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 proper
+@@ -1876,6 +1927,7 @@ In order for B<mytop> to function proper
  following:
  
    * Perl 5.005 or newer
@@ -313,7 +313,7 @@ Subject: mytop-merge_src:mytop_improvements
    * Getopt::Long
    * DBI and DBD::mysql
    * Term::ReadKey from CPAN
-@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments on
+@@ -2017,46 +2069,49 @@ have two dashes `--'. Short arguments on
  
  =over
  
@@ -375,7 +375,7 @@ Subject: mytop-merge_src:mytop_improvements
  
  If you're running B<mytop> on the same host as MariaDB, you may wish to
  have it use the MariaDB socket directly rather than a standard TCP/IP
-@@ -2070,7 +2125,7 @@ Default: none.
+@@ -2071,7 +2126,7 @@ Default: none.
  
  =item B<--header> or B<--noheader>
  
@@ -384,7 +384,7 @@ Subject: mytop-merge_src:mytop_improvements
  with the B<h> key while B<mytop> is running.
  
  Default: header.
-@@ -2096,7 +2151,7 @@ Default: idle.
+@@ -2097,7 +2152,7 @@ Default: idle.
  Specify if you want to be prompted to type in your database password.
  This provides a little bit more security since it not only prevents
  the password from viewable in a process list, but also doesn't require
@@ -393,7 +393,7 @@ Subject: mytop-merge_src:mytop_improvements
  You will B<only> be prompted if a password has not been specified in
  your config file or through another command line option.
  
-@@ -2110,6 +2165,27 @@ with hostnames but toggling this option.
+@@ -2111,6 +2166,27 @@ with hostnames but toggling this option.
  
  Default: noresolve
  
@@ -421,7 +421,7 @@ Subject: mytop-merge_src:mytop_improvements
  =back
  
  Command-line arguments will always take precedence over config file
-@@ -2153,6 +2229,13 @@ you want them to, of course).
+@@ -2154,6 +2230,13 @@ you want them to, of course).
  You may have white space on either side of the C<=> in lines of the
  config file.
  
@@ -435,7 +435,7 @@ Subject: mytop-merge_src:mytop_improvements
  =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
+@@ -2205,8 +2288,8 @@ running queries appear at the top of the
  
  =item B<I>
  
@@ -446,7 +446,7 @@ Subject: mytop-merge_src:mytop_improvements
  summarize that data rather than producing raw output.
  
  =item B<k>
-@@ -2258,8 +2341,8 @@ Show only threads owned by a giver user.
+@@ -2259,8 +2342,8 @@ Show only threads owned by a giver user.
  
  The B<s> key has a command-line counterpart: B<-s>.
  
@@ -457,7 +457,7 @@ Subject: mytop-merge_src:mytop_improvements
  
  =head1 BUGS
  
-@@ -2292,9 +2375,6 @@ width. If you have fairly long database/
+@@ -2293,9 +2376,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.
  
@@ -467,7 +467,7 @@ Subject: mytop-merge_src:mytop_improvements
  You should be able to specify the columns you'd like to see in the
  display and the order in which they appear. If you only have one
  username that connects to your database, it's probably not worth
-@@ -2411,12 +2491,12 @@ terminals don't freak out.
+@@ -2412,12 +2492,12 @@ terminals don't freak out.
  
  =item jon r. luini <falcon@chime.com>
  

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
-@@ -448,12 +448,6 @@ CONFIGURE_FILE(
+@@ -456,12 +456,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

@@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test
 
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -414,7 +414,7 @@ then
+@@ -429,7 +429,7 @@ then
  fi
  
  # Create database directories