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
40c756f4
Commit
40c756f4
authored
Aug 02, 2019
by
Otto Kekäläinen
Browse files
Update changelog and refresh patches after 10.1.41 import
parent
40efc7c1
Changes
6
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
40c756f4
mariadb
-
10.1
(
1
:
10.1.41
-
0u
buntu0
.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
-
0u
buntu0
.18.04.1
)
bionic
-
security
;
urgency
=
medium
*
SECURITY
UPDATE
:
New
upstream
version
10.1.40
.
Includes
previous
...
...
debian/patches/c11_atomics.patch
View file @
40c756f4
...
...
@@ -53,7 +53,7 @@ Subject: c11_atomics
+++ b/include/atomic/gcc_builtins.h
@@ -16,6 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-13
01
USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-13
35
USA */
+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
#define make_atomic_add_body(S) \
...
...
@@ -83,7 +83,7 @@ Subject: c11_atomics
--- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-13
01
USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-13
35
USA */
#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
- || defined(HAVE_GCC_ATOMIC_BUILTINS) \
...
...
debian/patches/kFreeBSD-gettid.patch
View file @
40c756f4
...
...
@@ -8,7 +8,7 @@ Subject: kFreeBSD-gettid
--- a/storage/tokudb/PerconaFT/portability/portability.cc
+++ b/storage/tokudb/PerconaFT/portability/portability.cc
@@ -1
18
,6 +1
18
,10 @@
toku_os_gettid(void) {
@@ -1
20
,6 +1
20
,10 @@
toku_os_gettid(void) {
return syscall(SYS_gettid);
#elif defined(HAVE_PTHREAD_GETTHREADID_NP)
return pthread_getthreadid_np();
...
...
debian/patches/mips-connect-unaligned.patch
View file @
40c756f4
...
...
@@ -95,7 +95,7 @@ Subject: mips-connect-unaligned
CheckType(pv)
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];
+ memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
...
...
debian/patches/mysql-test__db_test.patch
View file @
40c756f4
...
...
@@ -14,7 +14,7 @@ Subject: mysql-test__db_test
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -32
27
,6 +32
27
,10 @@
sub mysql_install_db {
@@ -32
30
,6 +32
30
,10 @@
sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
...
...
debian/patches/remove_rename_mariadb-server_files_in.patch
View file @
40c756f4
...
...
@@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46
5
,12 +46
5
,6 @@
CONFIGURE_FILE(
@@ -46
7
,12 +46
7
,6 @@
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
...
...
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