From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 290D61382C5 for ; Thu, 8 Mar 2018 19:38:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FE25E096D; Thu, 8 Mar 2018 19:38:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51402E096D for ; Thu, 8 Mar 2018 19:38:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DA13335C2A for ; Thu, 8 Mar 2018 19:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1395243 for ; Thu, 8 Mar 2018 19:38:22 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1520537712.0a55720a55f21363de137e2389ba8196e40471bb.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20032_all_mariadb-10.2.12-fix-address-resolve.patch 20033_all_mariadb-10.1.31-xtradb-sst.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 0a55720a55f21363de137e2389ba8196e40471bb X-VCS-Branch: master Date: Thu, 8 Mar 2018 19:38:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 40b8d436-db02-4f20-a7cf-0b72802ba687 X-Archives-Hash: c6171635a9639b993abf6518e4a6467c commit: 0a55720a55f21363de137e2389ba8196e40471bb Author: Brian Evans gentoo org> AuthorDate: Thu Mar 8 19:35:12 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Mar 8 19:35:12 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=0a55720a Add new upstream patches Fix MDEV-15254 10.1.31 does not join an existing cluster with SST Fix MDEV-15345 Compilation fails to build my_addr_resolve.c ...2_all_mariadb-10.2.12-fix-address-resolve.patch | 29 +++++++++++++++++ 20033_all_mariadb-10.1.31-xtradb-sst.patch | 36 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/20032_all_mariadb-10.2.12-fix-address-resolve.patch b/20032_all_mariadb-10.2.12-fix-address-resolve.patch new file mode 100644 index 0000000..13dbfd5 --- /dev/null +++ b/20032_all_mariadb-10.2.12-fix-address-resolve.patch @@ -0,0 +1,29 @@ +From 8ea4f7e4eebefa5daa98f0098b031095b98a1918 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Thu, 22 Feb 2018 15:58:07 +0100 +Subject: [PATCH] MDEV-15345 Compilation fails to build my_addr_resolve.c + +fix the compilation error. +no support for plugins yet. +--- + mysys/my_addr_resolve.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c +index 10f8552f226b..84bff47d1a93 100644 +--- a/mysys/my_addr_resolve.c ++++ b/mysys/my_addr_resolve.c +@@ -49,6 +49,13 @@ static const char *strip_path(const char *s) + static bfd *bfdh= 0; + static asymbol **symtable= 0; + ++#if defined(HAVE_LINK_H) && defined(HAVE_DLOPEN) ++#include ++static ElfW(Addr) offset= 0; ++#else ++#define offset 0 ++#endif ++ + /** + finds a file name, a line number, and a function name corresponding to addr. + diff --git a/20033_all_mariadb-10.1.31-xtradb-sst.patch b/20033_all_mariadb-10.1.31-xtradb-sst.patch new file mode 100644 index 0000000..50d1fa7 --- /dev/null +++ b/20033_all_mariadb-10.1.31-xtradb-sst.patch @@ -0,0 +1,36 @@ +From 4e6dab94d0931eafba502f5a91da29a54e75bb33 Mon Sep 17 00:00:00 2001 +From: Daniel Black +Date: Wed, 21 Feb 2018 19:38:57 +0530 +Subject: [PATCH] MDEV-10.1.31 does not join an existing cluster with SST + xtrabackup-v2 + +Analysis:- The problem is the change in the implementation of wait_for_listen +in wsrep_sst_xtrabackup-v2.sh. The new script uses lsof which will always +exit with an error code if it can't find all the items, and because the +script has the -e option set in the hashbang line (#!/bin/bash -ue), the +script will abort right after running lsof if lsof can't find even a single +item among all the items listed in its arguments. This will happen even if +socat is running and listening, because it can't find nc. The loop in +wait_for_listen will therefore always quit after one iteration without +writing the "ready" line to signal the parent. + +Solution:- We will or the lsof with true. + +Patch Credit :Daniel Black and David Wang +--- + scripts/wsrep_sst_xtrabackup-v2.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh +index 64dd182e2f2f..9104daf19bc3 100644 +--- a/scripts/wsrep_sst_xtrabackup-v2.sh ++++ b/scripts/wsrep_sst_xtrabackup-v2.sh +@@ -644,7 +644,7 @@ wait_for_listen() + + for i in {1..300} + do +- LSOF_OUT=$(lsof -sTCP:LISTEN -i TCP:${PORT} -a -c nc -c socat -F c) ++ LSOF_OUT=$(lsof -sTCP:LISTEN -i TCP:${PORT} -a -c nc -c socat -F c 2> /dev/null || :) + [ -n "${LSOF_OUT}" ] && break + sleep 0.2 + done