From owner-svn-ports-all@freebsd.org Sun Jan 24 09:08:16 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04409A8FD78; Sun, 24 Jan 2016 09:08:16 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D45FF1F9C; Sun, 24 Jan 2016 09:08:15 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0O98EAC069363; Sun, 24 Jan 2016 09:08:14 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0O98EVd069360; Sun, 24 Jan 2016 09:08:14 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201601240908.u0O98EVd069360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Sun, 24 Jan 2016 09:08:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407091 - in head/databases/mysql-connector-c++: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2016 09:08:16 -0000 Author: mi Date: Sun Jan 24 09:08:14 2016 New Revision: 407091 URL: https://svnweb.freebsd.org/changeset/ports/407091 Log: Upgrade from 1.1.6 to 1.1.7. The changes are listed as: GA 1.1.7 - - Add JSON support - Allow building without server flags (Bug#21391025) - Correct relative() not seeking after changing position.(Bug#21152054) The first item is only available if the mysql-client is recent enough (version 5.7). For older client-libraries the new patch is required. Added: head/databases/mysql-connector-c++/files/patch-optional-json (contents, props changed) Deleted: head/databases/mysql-connector-c++/files/patch-CMakeLists.txt Modified: head/databases/mysql-connector-c++/Makefile head/databases/mysql-connector-c++/distinfo Modified: head/databases/mysql-connector-c++/Makefile ============================================================================== --- head/databases/mysql-connector-c++/Makefile Sun Jan 24 07:35:34 2016 (r407090) +++ head/databases/mysql-connector-c++/Makefile Sun Jan 24 09:08:14 2016 (r407091) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql-connector-c++ -PORTVERSION= 1.1.6 +PORTVERSION= 1.1.7 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C++ Modified: head/databases/mysql-connector-c++/distinfo ============================================================================== --- head/databases/mysql-connector-c++/distinfo Sun Jan 24 07:35:34 2016 (r407090) +++ head/databases/mysql-connector-c++/distinfo Sun Jan 24 09:08:14 2016 (r407091) @@ -1,2 +1,2 @@ -SHA256 (mysql-connector-c++-1.1.6.tar.gz) = ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 -SIZE (mysql-connector-c++-1.1.6.tar.gz) = 522236 +SHA256 (mysql-connector-c++-1.1.7.tar.gz) = 5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763 +SIZE (mysql-connector-c++-1.1.7.tar.gz) = 518469 Added: head/databases/mysql-connector-c++/files/patch-optional-json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql-connector-c++/files/patch-optional-json Sun Jan 24 09:08:14 2016 (r407091) @@ -0,0 +1,36 @@ +The newly-added JSON-support may not be available in the older +version of MySQL client-library against which this connector may +be building. Fortunately, that's easy to detect at compile time... + + -mi + +--- driver/mysql_resultbind.cpp 2016-01-12 13:42:38.000000000 -0500 ++++ driver/mysql_resultbind.cpp 2016-01-24 03:58:18.451886000 -0500 +@@ -87,5 +87,7 @@ + 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); + +--- driver/mysql_util.cpp 2016-01-12 13:42:38.000000000 -0500 ++++ driver/mysql_util.cpp 2016-01-24 04:01:04.499990000 -0500 +@@ -432,6 +432,8 @@ + 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; +@@ -646,6 +648,8 @@ + case MYSQL_TYPE_GEOMETRY: + return "GEOMETRY"; ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: + return "JSON"; ++#endif + default: + return "UNKNOWN";