GA 1.1.8:

- Add connect options MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
  MYSQL_OPT_TLS_VERSION and MYSQL_OPT_SSL_MODE
- Fix Visual Studio 2015 build.
- Fix segmentation fault when inserting a large string
- Fix Compilation Failure with PRE-5.7 C API

4 files changed, 16 insertions, 45 deletions

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 1ff3a9be170..023ce3656c6 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2016/03/08 15:40:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/12 12:24:09 adam Exp $
 
-DISTNAME=	mysql-connector-c++-1.1.7
+DISTNAME=	mysql-connector-c++-1.1.8
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-C++/}
 
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index 29166b87e09..752c235345b 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2016/03/08 15:40:02 wiz Exp $
+$NetBSD: distinfo,v 1.7 2017/01/12 12:24:09 adam Exp $
 
-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
+SHA1 (mysql-connector-c++-1.1.8.tar.gz) = 7ddd5437f16f8f656c10317891cfa3d848dc2d8e
+RMD160 (mysql-connector-c++-1.1.8.tar.gz) = 2469ebacb4885af3d22e45d9ca64c410b176d9ec
+SHA512 (mysql-connector-c++-1.1.8.tar.gz) = c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d
+Size (mysql-connector-c++-1.1.8.tar.gz) = 528954 bytes
+SHA1 (patch-driver_mysql__resultbind.cpp) = 77842cd61dd3a57956dcc5e3f382270d2e218ec1
diff --git a/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp b/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp
index 6fe30511517..a4cf1c37585 100644
--- a/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp
+++ b/databases/mysql-connector-c++/patches/patch-driver_mysql__resultbind.cpp
@@ -1,16 +1,16 @@
-$NetBSD: patch-driver_mysql__resultbind.cpp,v 1.1 2016/03/08 15:40:02 wiz Exp $
+$NetBSD: patch-driver_mysql__resultbind.cpp,v 1.2 2017/01/12 12:24:09 adam 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.orig	2016-12-14 09:58:54.000000000 +0000
 +++ driver/mysql_resultbind.cpp
-@@ -86,7 +86,9 @@ static struct st_buffer_size_type
-     case MYSQL_TYPE_BLOB:
-     case MYSQL_TYPE_STRING:
+@@ -88,8 +88,8 @@ static struct st_buffer_size_type
      case MYSQL_TYPE_VAR_STRING:
-+#ifdef MYSQL_TYPE_JSON
+ #if LIBMYSQL_VERSION_ID > 50700
      case MYSQL_TYPE_JSON:
-+#endif
-       return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
+-      return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
+ #endif //LIBMYSQL_VERSION_ID > 50700
++      return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
  
      case MYSQL_TYPE_DECIMAL:
+     case MYSQL_TYPE_NEWDECIMAL:
diff --git a/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp b/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp
deleted file mode 100644
index 9b48e8dcd4a..00000000000
--- a/databases/mysql-connector-c++/patches/patch-driver_mysql__util.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$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";
-   }