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 1FE0C1382C5 for ; Wed, 14 Feb 2018 00:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23D0DE0977; Wed, 14 Feb 2018 00:43:40 +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 F37A8E0977 for ; Wed, 14 Feb 2018 00:43:39 +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 B9477335C38 for ; Wed, 14 Feb 2018 00:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AE8A1F1 for ; Wed, 14 Feb 2018 00:43:36 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1518567872.bb6f2115f03bcc765a2b1958016cbc1c6c9918c9.whissi@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20030_all_mysql-5.5-fix-client-mysql-type.patch X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: bb6f2115f03bcc765a2b1958016cbc1c6c9918c9 X-VCS-Branch: master Date: Wed, 14 Feb 2018 00:43:36 +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: 09ee7753-d639-4dc0-93f1-938d534b91e2 X-Archives-Hash: c7f94ef78f84fa21136e9d2eda09cb95 commit: bb6f2115f03bcc765a2b1958016cbc1c6c9918c9 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Feb 14 00:05:17 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Feb 14 00:24:32 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=bb6f2115 Add patch to fix invalid type in MySQL 5.5 Bug: https://bugs.gentoo.org/645894 00000_index.txt | 6 +++++ 20030_all_mysql-5.5-fix-client-mysql-type.patch | 29 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index 19fb8a1..b5d3ee4 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -926,3 +926,9 @@ @pn mysql @pn mariadb @@ Fix tests for Perl 5.26+ compatibility + +@patch 20030_all_mysql-5.5-fix-client-mysql-type.patch +@ver 5.05.58.00 to 5.05.99.99 +@pn mysql +@@ Fix type in mysql client +@@ Bug 645894 diff --git a/20030_all_mysql-5.5-fix-client-mysql-type.patch b/20030_all_mysql-5.5-fix-client-mysql-type.patch new file mode 100644 index 0000000..b62e192 --- /dev/null +++ b/20030_all_mysql-5.5-fix-client-mysql-type.patch @@ -0,0 +1,29 @@ +From https://github.com/MariaDB/server/commit/7338d3f221e33042dfcf5c1a245317aa7cb015a7 +From: Daniel Black +Date: Fri, 14 Jul 2017 13:37:37 +1000 +Subject: [PATCH] client: mysql - fix type + +field_names[x][y] is a pointer + +client/mysql.cc: In function 'void build_completion_hash(bool, bool)': +client/mysql.cc:2855:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] + field_names[i][num_fields*2]= '\0'; + +Bug: https://bugs.gentoo.org/645894 +--- + client/mysql.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/mysql.cc b/client/mysql.cc +index a965ced89c65..ca586a5590fb 100644 +--- a/client/mysql.cc ++++ b/client/mysql.cc +@@ -2852,7 +2852,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); + mysql_free_result(fields); + break; + } +- field_names[i][num_fields*2]= '\0'; ++ field_names[i][num_fields*2]= NULL; + j=0; + while ((sql_field=mysql_fetch_field(fields))) + {