mysql51-client: Build fix from upstream and limit to C++03.

This commit is contained in:
jperkin 2018-02-01 23:14:55 +00:00
parent 87d168073e
commit dd37529e87
3 changed files with 19 additions and 3 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.36 2017/09/03 08:53:05 wiz Exp $
# $NetBSD: Makefile.common,v 1.37 2018/02/01 23:14:55 jperkin Exp $
#
# used by databases/mysql51-client/Makefile
# used by databases/mysql51-server/Makefile
@ -102,7 +102,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
USE_LANGUAGES= c c++03
USE_TOOLS+= autoconf bash autoheader gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.29 2017/04/13 13:44:49 mef Exp $
$NetBSD: distinfo,v 1.30 2018/02/01 23:14:55 jperkin Exp $
SHA1 (mysql-5.1.73.tar.gz) = 6cb1c547dec873a0afda825c83fd8e5a32b9a619
RMD160 (mysql-5.1.73.tar.gz) = ceee36663abbf135d3ddbebe52ebc537ecba25a6
@ -28,4 +28,5 @@ SHA1 (patch-av) = b8fb1065d7e71522374a16d759d2f3ab5227f590
SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
SHA1 (patch-client_mysql.cc) = 206914bcaac3ecb67968f27260a69634edc2e788
SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909

View file

@ -0,0 +1,15 @@
$NetBSD: patch-client_mysql.cc,v 1.1 2018/02/01 23:14:55 jperkin Exp $
Compilation warning fix from upstream.
--- client/mysql.cc.orig 2013-11-04 18:52:27.000000000 +0000
+++ client/mysql.cc
@@ -2684,7 +2684,7 @@ You can turn off this feature to get a q
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)))
{