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 EDD06138334 for ; Tue, 5 Mar 2019 20:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3187E08E0; Tue, 5 Mar 2019 20:22:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 90DCCE08E0 for ; Tue, 5 Mar 2019 20:22:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4F8D8335D04 for ; Tue, 5 Mar 2019 20:22:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EC63266 for ; Tue, 5 Mar 2019 20:22:27 +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: <1551817311.54bb710131c1656d295a016c04e5a85b031e5013.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mariadb-10.1.16-without-clientlibs-tools.patch 20018_all_mariadb-10.2.16-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 54bb710131c1656d295a016c04e5a85b031e5013 X-VCS-Branch: master Date: Tue, 5 Mar 2019 20:22:27 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aad468e1-e9fc-4289-a90f-9691200bdc14 X-Archives-Hash: dce037324b1d304c8a913d37ad15d65e commit: 54bb710131c1656d295a016c04e5a85b031e5013 Author: Brian Evans gentoo org> AuthorDate: Tue Mar 5 20:21:51 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Mar 5 20:21:51 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=54bb7101 Fix ordering of galera SST my_print_defaults location Signed-off-by: Brian Evans gentoo.org> 20018_all_mariadb-10.1.16-without-clientlibs-tools.patch | 11 ++++++++--- 20018_all_mariadb-10.2.16-without-clientlibs-tools.patch | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch index 8e1a30d..2664529 100644 --- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch @@ -136,12 +136,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh if [ -x "$CLIENT_DIR/mysql" ]; then MYSQL_CLIENT="$CLIENT_DIR/mysql" -@@ -165,6 +166,8 @@ +@@ -165,10 +166,12 @@ + MYSQLDUMP=$(which mysqldump) + fi + ++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then ++ MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults" +-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then ++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" -+elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then -+ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults" else MY_PRINT_DEFAULTS=$(which my_print_defaults) fi diff --git a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch index e844046..1c61475 100644 --- a/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch @@ -213,12 +213,17 @@ diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh if [ -x "$CLIENT_DIR/mysql" ]; then MYSQL_CLIENT="$CLIENT_DIR/mysql" -@@ -165,6 +166,8 @@ +@@ -165,10 +166,12 @@ + MYSQLDUMP=$(which mysqldump) + fi + ++if [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then ++ MY_PRINT_DEFAULTS="$LIBEXEC_DIR/my_print_defaults" +-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then ++elif [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" -+elif [ -x "$LIBEXEC_DIR/my_print_defaults" ]; then -+ MY_PRINT_DEFAULTS="LIBEXEC_DIR/my_print_defaults" else MY_PRINT_DEFAULTS=$(which my_print_defaults) fi