head	1.2;
access;
symbols
	pkgsrc-2016Q4:1.1.0.8
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.6
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2
	pkgsrc-2016Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2017.01.12.12.24.09;	author adam;	state dead;
branches;
next	1.1;
commitid	IlWX8eUUT4QbXFBz;

1.1
date	2016.03.08.15.40.02;	author wiz;	state Exp;
branches;
next	;
commitid	kZJTHA70hVFc0RXy;


desc
@@


1.2
log
@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
@
text
@$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";
   }
@


1.1
log
@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)
@
text
@d1 1
a1 1
$NetBSD$
@