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

Update changelog and refresh patches after 10.1.41 import

parent 40efc7c1
mariadb-10.1 (1:10.1.41-0ubuntu0.18.04.1) bionic-security; urgency=medium
* SECURITY UPDATE: New upstream version 10.1.41. Includes fixes for the
following security vulnerabilities (LP: #1837770):
- CVE-2019-2737
- CVE-2019-2739
- CVE-2019-2740
- CVE-2019-2805
-- Otto Kekäläinen <otto@debian.org> Fri, 02 Aug 2019 18:10:23 +0100
mariadb-10.1 (1:10.1.40-0ubuntu0.18.04.1) bionic-security; urgency=medium mariadb-10.1 (1:10.1.40-0ubuntu0.18.04.1) bionic-security; urgency=medium
* SECURITY UPDATE: New upstream version 10.1.40. Includes previous * SECURITY UPDATE: New upstream version 10.1.40. Includes previous
......
...@@ -53,7 +53,7 @@ Subject: c11_atomics ...@@ -53,7 +53,7 @@ Subject: c11_atomics
+++ b/include/atomic/gcc_builtins.h +++ b/include/atomic/gcc_builtins.h
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
along with this program; if not, write to the Free Software 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) +#if defined (HAVE_GCC_ATOMIC_BUILTINS)
#define make_atomic_add_body(S) \ #define make_atomic_add_body(S) \
...@@ -83,7 +83,7 @@ Subject: c11_atomics ...@@ -83,7 +83,7 @@ Subject: c11_atomics
--- a/include/atomic/nolock.h --- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h +++ b/include/atomic/nolock.h
@@ -17,7 +17,7 @@ @@ -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__) \ #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
- || defined(HAVE_GCC_ATOMIC_BUILTINS) \ - || defined(HAVE_GCC_ATOMIC_BUILTINS) \
......
...@@ -8,7 +8,7 @@ Subject: kFreeBSD-gettid ...@@ -8,7 +8,7 @@ Subject: kFreeBSD-gettid
--- a/storage/tokudb/PerconaFT/portability/portability.cc --- a/storage/tokudb/PerconaFT/portability/portability.cc
+++ b/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); return syscall(SYS_gettid);
#elif defined(HAVE_PTHREAD_GETTHREADID_NP) #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
return pthread_getthreadid_np(); return pthread_getthreadid_np();
......
...@@ -95,7 +95,7 @@ Subject: mips-connect-unaligned ...@@ -95,7 +95,7 @@ Subject: mips-connect-unaligned
CheckType(pv) CheckType(pv)
TYPE *lp = ((TYPBLK*)pv)->Typp; 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]; - Typp[i] = lp[i];
+ memcpy(Typp + k, lp + k, sizeof(TYPE) * n); + memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
......
...@@ -14,7 +14,7 @@ Subject: mysql-test__db_test ...@@ -14,7 +14,7 @@ Subject: mysql-test__db_test
--- a/mysql-test/mysql-test-run.pl --- a/mysql-test/mysql-test-run.pl
+++ b/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", mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
......
...@@ -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
@@ -465,12 +465,6 @@ CONFIGURE_FILE( @@ -467,12 +467,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)
......
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