Commit c4205839 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update changelog and refresh patches after 10.1.37 import

parent ad335237
mariadb-10.1 (10.1.35-0+deb9u1) stretch-security; urgency=medium
[ Otto Kekäläinen ]
* SECURITY UPDATE: New upstream release 10.1.35. Includes fixes for
the security vulnerabilities from previous releases.
mariadb-10.1 (10.1.37-0+deb9u1) stretch-security; urgency=medium
* SECURITY UPDATE: New upstream release 10.1.37. Includes fixes for
the security vulnerabilities from previous releases as well.
- 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-2018-3066
- CVE-2018-3064
- CVE-2018-3063
......
......@@ -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);
......
......@@ -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)
......
......@@ -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,7 +24,7 @@ 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")
......@@ -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)
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment