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

Update changelog and refresh patches after 10.1.35 import

parent c6117eed
mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium mariadb-10.1 (10.1.35-0+deb9u1) stretch-security; urgency=medium
[ Otto Kekäläinen ] [ Otto Kekäläinen ]
* SECURITY UPDATE: New upstream release 10.1.34. Includes fixes for * SECURITY UPDATE: New upstream release 10.1.35. Includes fixes for
the security vulnerabilities from previous releases. the security vulnerabilities from previous releases.
- CVE-2018-3066
- CVE-2018-3064
- CVE-2018-3063
- CVE-2018-3058
* Previous upstream version 10.1.33 included fixes for the following * Previous upstream version 10.1.33 included fixes for the following
security vulnerabilities: security vulnerabilities:
- CVE-2018-2819 - CVE-2018-2819
...@@ -57,7 +61,7 @@ mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium ...@@ -57,7 +61,7 @@ mariadb-10.1 (10.1.34-0+deb9u1) stretch-security; urgency=medium
* Extend libmariadbclient-rename.patch to cover TokuDB as well * Extend libmariadbclient-rename.patch to cover TokuDB as well
* Disable disks.disks test * Disable disks.disks test
-- Otto Kekäläinen <otto@debian.org> Thu, 02 Aug 2018 16:21:46 +0800 -- Otto Kekäläinen <otto@debian.org> Wed, 08 Aug 2018 19:32:41 +0300
mariadb-10.1 (10.1.26-0+deb9u1) stretch-security; urgency=high mariadb-10.1 (10.1.26-0+deb9u1) stretch-security; urgency=high
......
From: Vicentiu Ciorbaru <cvicentiu@gmail.com>
Subject: Workaround for ICE in mroonga on Arm64 architecture
Details: There seems to be a bug in gcc-6.3.0 on arm64 where it fails
to compile a file which makes use of the not_equal_float function.
A basic logic workaround solves the problem by calling the equal_float
function instead.
--- a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
+++ b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
@@ -562,7 +562,7 @@ inline static grn_ts_bool
grn_ts_op_not_equal_float(grn_ts_float lhs, grn_ts_float rhs)
{
/* To suppress warnings, "lhs != rhs" is not used. */
- return (lhs < rhs) || (lhs > rhs);
+ return !grn_ts_op_equal_float(lhs, rhs);
}
/* grn_ts_op_not_equal_time() returns lhs != rhs. */
...@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in ...@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -448,12 +448,6 @@ CONFIGURE_FILE( @@ -450,12 +450,6 @@ CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
......
...@@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test ...@@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test
--- a/scripts/mysql_install_db.sh --- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh
@@ -414,7 +414,7 @@ then @@ -419,7 +419,7 @@ then
fi fi
# Create database directories # Create database directories
......
...@@ -21,4 +21,3 @@ kFreeBSD-gettid.patch ...@@ -21,4 +21,3 @@ kFreeBSD-gettid.patch
mips-innobase-atomic.patch mips-innobase-atomic.patch
mytop-merge_src:mytop_improvements.patch mytop-merge_src:mytop_improvements.patch
Add_default_ExecStartPre_to_mariadb@.service.patch Add_default_ExecStartPre_to_mariadb@.service.patch
0026-Mroonga-fix-ice-arm64.patch
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