From 1ef2fc08e040d77bf334ab456a6d526d37f2c6b1 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Sat, 21 Dec 2019 16:21:39 +0000 Subject: databases/mariadb103-server: Update to 10.3.21 - Fix table compression [1] - Fix link error in mariabackup [2] - Fix GNUism [3] PR: 239732 [1], 236101 [2], 240692 [3] Submitted by: [2], Mike Andrews [3] Reported by: Tao Zhou [1] --- .../files/patch-extra_mariabackup_CMakeLists.txt | 10 ++++++++++ .../files/patch-scripts_wsrep__sst__mariabackup.sh | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt create mode 100644 databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh (limited to 'databases/mariadb103-server/files') diff --git a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt new file mode 100644 index 000000000000..4a4abfc53dc0 --- /dev/null +++ b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt @@ -0,0 +1,10 @@ +--- extra/mariabackup/CMakeLists.txt.orig 2019-12-05 22:22:27 UTC ++++ extra/mariabackup/CMakeLists.txt +@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream + TARGET_LINK_LIBRARIES(mbstream + mysys + crc ++ sql + ) + ADD_DEPENDENCIES(mbstream GenError) + diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh new file mode 100644 index 000000000000..2b81b4eca7b8 --- /dev/null +++ b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -0,0 +1,11 @@ +--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC ++++ scripts/wsrep_sst_mariabackup.sh +@@ -605,7 +605,7 @@ recv_joiner() + set +e + + if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then +- if timeout --help | grep -q -- '-k';then ++ if timeout --help 2>&1 | grep -q -- '-k';then + ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" + else + ltcmd="timeout -s9 $tmt $tcmd" -- cgit v1.2.3