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
Samuel Thibault
mariadb-10.1
Commits
7790163b
Commit
7790163b
authored
Aug 08, 2018
by
Otto Kekäläinen
Browse files
Update changelog and refresh patches after 10.1.35 import
parent
c6117eed
Changes
5
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
7790163b
mariadb
-
10.1
(
10.1.3
4
-
0
+
deb9u1
)
stretch
-
security
;
urgency
=
medium
mariadb
-
10.1
(
10.1.3
5
-
0
+
deb9u1
)
stretch
-
security
;
urgency
=
medium
[
Otto
Kek
ä
l
ä
inen
]
*
SECURITY
UPDATE
:
New
upstream
release
10.1.3
4
.
Includes
fixes
for
*
SECURITY
UPDATE
:
New
upstream
release
10.1.3
5
.
Includes
fixes
for
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
security
vulnerabilities
:
-
CVE
-
2018
-
2819
...
...
@@ -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
*
Disable
disks
.
disks
test
--
Otto
Kek
ä
l
ä
inen
<
otto
@
debian
.
org
>
Thu
,
0
2
Aug
2018
1
6
:
21
:
4
6
+
0
8
00
--
Otto
Kek
ä
l
ä
inen
<
otto
@
debian
.
org
>
Wed
,
0
8
Aug
2018
1
9
:
32
:
4
1
+
0
3
00
mariadb
-
10.1
(
10.1.26
-
0
+
deb9u1
)
stretch
-
security
;
urgency
=
high
...
...
debian/patches/0026-Mroonga-fix-ice-arm64.patch
deleted
100644 → 0
View file @
c6117eed
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. */
debian/patches/remove_rename_mariadb-server_files_in.patch
View file @
7790163b
...
...
@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4
48
,12 +4
48
,6 @@
CONFIGURE_FILE(
@@ -4
50
,12 +4
50
,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
View file @
7790163b
...
...
@@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -41
4
,7 +41
4
,7 @@
then
@@ -41
9
,7 +41
9
,7 @@
then
fi
# Create database directories
...
...
debian/patches/series
View file @
7790163b
...
...
@@ -21,4 +21,3 @@ kFreeBSD-gettid.patch
mips-innobase-atomic.patch
mytop-merge_src:mytop_improvements.patch
Add_default_ExecStartPre_to_mariadb@.service.patch
0026-Mroonga-fix-ice-arm64.patch
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