Update mysql-connector-c++ to 1.1.7:

GA  1.1.7 -
- Add JSON support
- Allow building without server flags (Bug#21391025)
- Correct relative() not seeking after changing position.(Bug#21152054)

4 files changed, 53 insertions, 7 deletions

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 73612a54aa2..1ff3a9be170 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/08/01 09:35:52 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/03/08 15:40:02 wiz Exp $
 
-DISTNAME=	mysql-connector-c++-1.1.6
+DISTNAME=	mysql-connector-c++-1.1.7
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-C++/}
 
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index 15d070c4542..29166b87e09 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:56:15 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/03/08 15:40:02 wiz Exp $
 
-SHA1 (mysql-connector-c++-1.1.6.tar.gz) = a28a90bc04797df0d2fefe147eab8735a340afb4
-RMD160 (mysql-connector-c++-1.1.6.tar.gz) = 70be3edd02a7cb3fa3d46195ad1582ba3d06f232
-SHA512 (mysql-connector-c++-1.1.6.tar.gz) = e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7
-Size (mysql-connector-c++-1.1.6.tar.gz) = 522236 bytes
+SHA1 (mysql-connector-c++-1.1.7.tar.gz) = 34dc477c79d9c4125f7ee0d3d640dc0ac7bd2da1
+RMD160 (mysql-connector-c++-1.1.7.tar.gz) = a9c4c91a036013b0d1c9d59e862beb4a5dfcd677
+SHA512 (mysql-connector-c++-1.1.7.tar.gz) = ae3a4884e6d0323e35c121a9ea649dffb352e9ec563c8828267405464e897e614bd2145340220338c4c784f9808476e91a12376d11df492680095f2dc02e19a0
+Size (mysql-connector-c++-1.1.7.tar.gz) = 518469 bytes
+SHA1 (patch-driver_mysql__resultbind.cpp) = 1fe2db8a444d9f3ed3762887af82694164ba6bd3
+SHA1 (patch-driver_mysql__util.cpp) = cc886d477fa3ebd706944d884fe59689c138ce52
diff --git a/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp b/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp
new file mode 100644
index 00000000000..6fe30511517
--- /dev/null
+++ b/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-driver_mysql__resultbind.cpp,v 1.1 2016/03/08 15:40:02 wiz Exp $
+
+https://bugs.mysql.com/bug.php?id=80539
+
+--- driver/mysql_resultbind.cpp.orig	2016-01-12 18:42:38.000000000 +0000
++++ driver/mysql_resultbind.cpp
+@@ -86,7 +86,9 @@ static struct st_buffer_size_type
+     case MYSQL_TYPE_BLOB:
+     case MYSQL_TYPE_STRING:
+     case MYSQL_TYPE_VAR_STRING:
++#ifdef MYSQL_TYPE_JSON
+     case MYSQL_TYPE_JSON:
++#endif
+       return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
+ 
+     case MYSQL_TYPE_DECIMAL:
diff --git a/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp b/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp
new file mode 100644
index 00000000000..9b48e8dcd4a
--- /dev/null
+++ b/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-driver_mysql__util.cpp,v 1.1 2016/03/08 15:40:02 wiz Exp $
+
+https://bugs.mysql.com/bug.php?id=80539
+
+--- driver/mysql_util.cpp.orig	2016-01-12 18:42:38.000000000 +0000
++++ driver/mysql_util.cpp
+@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD
+       return sql::DataType::SET;
+     case MYSQL_TYPE_GEOMETRY:
+       return sql::DataType::GEOMETRY;
++#ifdef MYSQL_TYPE_JSON
+     case MYSQL_TYPE_JSON:
+       return sql::DataType::JSON;
++#endif
+     default:
+       return sql::DataType::UNKNOWN;
+   }
+@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD *
+       return "SET";
+     case MYSQL_TYPE_GEOMETRY:
+       return "GEOMETRY";
++#ifdef MYSQL_TYPE_JSON
+     case MYSQL_TYPE_JSON:
+       return "JSON";
++#endif
+     default:
+       return "UNKNOWN";
+   }