summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2019-01-20 19:21:46 -0500
committerBrian Evans <grknight@gentoo.org>2019-01-20 19:21:46 -0500
commit8a2e3eaf446f2ceff0d3406d00995a8fcc5ddbe4 (patch)
treeaf228338cabd9a2377b43ffc6705480fac6fe111 /dev-db/mysql-cluster/files
parentsys-apps/portage: version bump to 2.3.57 (diff)
downloadgentoo-8a2e3eaf446f2ceff0d3406d00995a8fcc5ddbe4.tar.gz
gentoo-8a2e3eaf446f2ceff0d3406d00995a8fcc5ddbe4.tar.bz2
gentoo-8a2e3eaf446f2ceff0d3406d00995a8fcc5ddbe4.zip
dev-db/mysql-cluster: Version bumps
Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'dev-db/mysql-cluster/files')
-rw-r--r--dev-db/mysql-cluster/files/7.2.34-client.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/dev-db/mysql-cluster/files/7.2.34-client.patch b/dev-db/mysql-cluster/files/7.2.34-client.patch
new file mode 100644
index 000000000000..fbf163bf250b
--- /dev/null
+++ b/dev-db/mysql-cluster/files/7.2.34-client.patch
@@ -0,0 +1,25 @@
+From b6c038d4366d003ae00120c96e39a892e5d675c1 Mon Sep 17 00:00:00 2001
+From: Tor Didriksen <tor.didriksen@oracle.com>
+Date: Wed, 18 Jul 2018 10:22:21 +0200
+Subject: [PATCH] Fix build break with modern compilers:
+
+client/mysql.cc: In function void build_completion_hash(bool, bool):
+client/mysql.cc:2674:37: error: invalid conversion from char to char* [-fpermissive]
+ field_names[i][num_fields*2]= '\0';
+---
+ client/mysql.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/mysql.cc b/client/mysql.cc
+index 8510361a54e..bc32a58f37e 100644
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -2671,7 +2671,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)))
+ {