Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Faustin Lammler
mariadb-10.1
Commits
c4205839
Commit
c4205839
authored
Nov 06, 2018
by
Otto Kekäläinen
Browse files
Update changelog and refresh patches after 10.1.37 import
parent
ad335237
Changes
5
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
c4205839
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
...
...
debian/patches/armhf_mroonga_storage_fail.patch
View file @
c4205839
...
...
@@ -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
@@ -62
1
,9 +62
1
,10 @@
namespace mrn {
@@ -62
3
,9 +62
3
,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
View file @
c4205839
...
...
@@ -102,7 +102,7 @@ Subject: c11_atomics
# include "x86-gcc.h"
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -7
8
,6 +7
8
,10 @@
IF(HAVE_BFD_H)
@@ -7
9
,6 +7
9
,10 @@
IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H)
...
...
debian/patches/libmariadbclient-rename.patch
View file @
c4205839
...
...
@@ -15,7 +15,7 @@ Subject: libmariadbclient-rename
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -3
2
,7 +3
2
,7 @@
COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -3
3
,7 +3
3
,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)
@@ -4
0
,39 +4
0
,39 @@
ENDIF(UNIX)
@@ -4
1
,39 +4
1
,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)
@@ -8
1
,7 +8
1
,7 @@
ENDIF(WIN32)
@@ -8
2
,7 +8
2
,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
View file @
c4205839
...
...
@@ -14,7 +14,7 @@ Subject: mysql-test__db_test
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -322
2
,6 +322
2
,10 @@
sub mysql_install_db {
@@ -322
5
,6 +322
5
,10 @@
sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment