Update to MySQL Connector-ODBC 5.3.2.

pkgsrc change: add 56 to MYSQL_VERSIONS_ACCEPTED

5.3.2

  Functionality added or changed:
  * Support of ODBCINSTGetProperties in MyODBC Driver (WL #7577)
  * Add DFLT_BIGINT_BIND_STR option to Connector/ODBC GUI (Windows and Linux)
    (WL#7579)
  * Accessibility features in Connector/ODBC Linux GUI (WL #7635)

  Bugs fixed:
  * Connect crash if the catalog name given to SQLSetConnectAttr is invalid
    (Bug #17587913)
  * Driver returns wrong length for output parameter streams
    (Bug #17814768/70946)
  * Assert failure in case of prepared statments and SQLDESCRIBECOL() called
    with column number given larger then actual parameter marker in query.
    (Bug #17311065)
  * SQLFOREIGNKEYS WITH FLAG_NO_INFORMATION_SCHEMA OPTION RETURNS BAD RESULTS
    (Bug #16920750)
  * SQLFetch() crashing when execute using UnixODBC 2.3.2 (Bug #17857204)
  * Segmentation fault in SQLSpecialColumns if table name is invalid
    (Bug# 17854697)
  * Invalid order of free() functions can cause crash (Bug# 17992912)
  * Crash in ODBC Driver with CHARSET=WRONGCHARSET (Bug# 17999659)
  * Driver and myodbc-installer crash with long option names (>100) and
    values (>255) (Bug# 17966018)
  * ODBCManageDataSourcesQ4 cannot run MyODBC GUI setup to edit an existing
    DSN (Bug# 18046123)
  * SQLGetData returning error being called after SQLParamData (Bug #17842966)
  * Valgrind: jump or move depends on uninitialised value error from
    myodbc-installer (Bug# 18046120)
  * Memory leak in sqlexecute() when connection is killed from another thread
    (Bug#17587617)
  * Data corruption in SQLBulkOperations because of buffer overrun.
    (Bug #17714172)
  * Segfault in SQLBulkOperations() for SQL_UPDATE_BY_BOOKMARK when select
    returns 0 records. (Bug# 17714358)
  * MS Access crashed when sorting a column (Bug# 17071780/69550)
  * Empty query giving segmentation fault in myodbc_casecmp (Bug# 17085344)
  * Uninitialized variable free_value can set wrong error in SQLDescribeCol
    (Bug# 17588101)
  * ODBC 5.2.5 DMG installer fails on OSX 10.8.5 (Bug #17512040/70422)
  * Bulk insert on time column with hour value > 99 gives error (Bug#17613161)
  * Concurrent execution of SQLEndTran() with SQL_HANDLE_ENV results in
    SEG FAULT (Bug #18166331)
  * Workaround to GTK bug in GtkComboBox and GtkComboBoxEntry (WL #7637)
  * ODBC Driver GUI in Windows has wrong order of controls selection
    (Bug# 18240696)
  * Wrong installation library directory on some 64bit system other than x86_64.
    (Bug# 68848)
  * SQLNumResultCols() with NULL parameter results in Segmentation Fault
    (Bug# 18165197)
  * SQLBULKOPERATIONS(SQL_FETCH_BOOKMARK) RETURNS SQL_NO_DATA ERROR
    (Bug# 18287216)
  * Segmentation Fault in SQLExecute() while executing test file "my_types"
    (Bug# 18303978)
  * Segmentation fault in SQLParamOptions() in Solaris platform (Bug# 18325878)
  * Segmentation fault in SQLForeignKeys() when number of columns in the table
    is more (Bug# 18286366)
  * Valgrind memory leak in SQLForeignKeys when NO_I_S=1 (Bug# 18286007)
  * Valgrind memory leak in when SQLPrepare used with SQLParamData/SQLPutData for
    NO_I_S=1 (Bug#18295317)
  * The password is getting saved when creating FileDSN using SQLDriverConnect
    (Bug# 18310873)
  * Passing NULL pointer to SQLSetDescField, SQLGetDiagField and SQLGetDiagRec
    results in a crash (Bug# 18431088)

----

5.3.1(20-Nov-2013)

  Functionality added or changed:
  * Support of SQL_ATTR_RESET_CONNECTION connection attribute (WL #7274)

  Bugs fixed:
  * Memory leak using 5.2.6 ODBC Connector (Bug #17653461/70662)

  * MySQL ODBC driver incorrectly quotes TableName when calling SQLPrimaryKeys
    (Bug# 16952531/69448)
  * Bad memory access when get out params (Bug #17640929/70642)
  * Setting Unix Socket using ODBCManageDataSourcesQ4 sets NAMED_PIPE=1
    (Bug# 17586452)
  * Segmentation Fault in SQLBulkOperations() (Bug #17714290)
  * Segmentation fault when SQLColumns table or column argument are provided
    more then 256 and 129 respectively (Bug #17358838)
  * Memory leak in SQLSetStmtAttr() as statement deallocation was missing
    (Bug #17441507)
  * Memory leak is happening in SQLProcedureColumns when returning empty results.
    (Bug #17298721)
  * Memory leak in SQLConnect() called after SQLSetConnectAttr() (Bug #17586844)

  Built using MySQL 5.6.14.

----

5.3.0(19-Oct-2013)

  Functionality added or changed:
  * Support for File Data Sources. (WL #6583, Bug #11746219/24581)
  * Bookmark support added in myodbc (WL #7039)
  * Added new variable in cmake config files ODBCCP32_LIB for odbccpp32.lib path,
    and MYSQLCLIENT_LIB_NAME for linking mysqlclient statically or dynamically by
    specifying mysqlclient library (libmysql.*, mysqlclient.*, libmysqlclient_r.*,
    libmysqlclient.*) to be used. Mysql CPP linkage for mysql version >= 5.6.4
    (WL #6738)
  * Added a new test module for crash bugs (my_crash.c)
  * Added GUI dialog for Linux
  * Support of ODBC 3.8 standard - driver self identification, input/output
    stream parameters (WL #6584)

  Bugs fixed:
  * With utf8 byte string for mysql server version < 5.5.3, insert fails
    with error message "Server does not support 4-byte encoded UTF8
    characters." (Bug #14838690)
  * Driver use the char ';' as separator in attributes string instead
    of the '\0' (Bug #15940689/66548)
  * DSN connection parameters override those specified in the connection
    string (Bug #11760574/52996)
  * Non-compliant behavior of SQLMoreResults (Bug #16101282/67920)
  * MSSQL linked server connected to MySQL 5.1.9 driver causes hard crash
    (Bug #16604346/63386)
  * MySQL ODBC drivers incorrectly returns TIME columns, where value > '99:59:59'
    (Bug #16176981/67793)
  * Conversion of Time field data to Timestamp type may produce incorrect result
    (Bug #17016839/69545)
  * Need to add a lock to access connections member in ENV structure
    (Bug #17240611/69864)
  * Visual Studio 2010 crashes when reading rows from any table in Server
    Explorer (Bug #17304031/69950)
  * Corrected MYSQL_NUM_VERSION calculation error in FindMysql.cmake.
    MYSQL_LIB_DIR, MYSQL_INCLUDE_DIR, MYSQL_LINK_FLAGS and MYSQL_CXXFLAGS will
    be obtained from mysql_config only when they are not provided using cmake
    options.
  * Memory leak in SQLPrepare with queries that use parameters
    (Bug #17400483/70113)
  * Valgrind error, simple loop fix (Bug #17397596/64105)
  * Wrong pointer type can cause crash in convert_c_type2str()
    (Bug #17421620/69733)
  * Memory leak in SQLMoreResults() as deallocation of result_bind buffer
    required before calling mysql_stmt_free_result() (Bug# 17441296)
  * FileDSN is created evein if the connection credentials are wrong
    (Bug #17508006)
  * Error with iodbc in SQLAllocHandle with handle type SQL_HANDLE_DBC
    as odbc_ver is unset.

  Built using MySQL 5.6.14.

----

5.2.5(04-Apr-2013)

  Functionality added or changed:
  * MSI package installs both ANSI and Unicode drivers. (WL#6793)

  Bugs fixed:
  * query_print will cause core dump in 32-bit application
    (Bug #16367440/68201)
  * Microsoft Access Crashes when Bit field updates (Bug# 16287859/68243)
  * Datetime and timestamp second fractions need removing the trailing
    zeros (Bug# 16294197/65418)
  * Binding string to decimal parameter always uses system locale setting
    (Bug# 11766369/59469)
  * Added CLEARTEXT authentication connection option ENABLE_CLEARTEXT_PLUGIN.
   (Bug#16445091)
  * Crash in SQLSetConnectAttr(SQL_ATTR_CURRENT_CATALOG) (Bug# 16526604/63844)

  Built using MySQL 5.6.11.

----

5.2.4 (16-Jan-2013)

  Functionality added or changed:
  * Support of expired passwords. Added conenction string option CAN_HANDLE_EXP_PWD.
    (WL#6786)
  * Add new reserved words from MySQL 5.6 in SQLGetInfo (WL#6704)

  Bugs fixed:
  * While retrieving data from a field, BLOB to CHAR conversion is done only for
    fields having BLOB_FLAG, BINARY_FLAG and binary character set(63) (Bug #11746572)

  Built using MySQL 5.6.10.

----

5.2.3 (19-Dec-2012)

  Bugs fixed:
  * Memory leak in 5.2.2(w) ODBC driver causes Prepared_stmt_count to grow
    (Bug# 67340/14812778)
  * Version 5.1 exports symbols SQLInstallDriverEx and SQLInstallDriverExW
    (Bug# 11766724/59900)
  * Corrected calculation for length indicator descriptor field (Bug# 11766437)
  * is_minimum_version() function does not work correctly (Bug# 15926340)
  * Problem with BIT columns in MS Access (Bug# 15997361/67702)

  Built using MySQL 5.5.27.

6 files changed, 45 insertions, 45 deletions

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index f7676499fbf..9ffcf90f629 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2013/10/10 00:04:15 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2014/07/02 03:41:51 jnemeth Exp $
 
-DISTNAME=	mysql-connector-odbc-5.2.2-src
+DISTNAME=	mysql-connector-odbc-5.3.2-src
 PKGNAME=	${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
-PKGREVISION=	7
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/5.2/}
+MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mysql.com/
@@ -22,7 +21,7 @@ INSTALLATION_DIRS+=	share/mysql-connector-odbc/test
 
 .include "options.mk"
 
-MYSQL_VERSIONS_ACCEPTED=	55 51
+MYSQL_VERSIONS_ACCEPTED=	56 55 51
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST
index fda004f58e0..d4fce860d53 100644
--- a/databases/myodbc/PLIST
+++ b/databases/myodbc/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2012/11/22 10:01:10 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/07/02 03:41:51 jnemeth Exp $
 bin/myodbc-installer
 ${PLIST.gui}lib/libmyodbc5S.so
+lib/libmyodbc5a.so
 lib/libmyodbc5w.so
 share/doc/mysql-connector-odbc/COPYING
 share/doc/mysql-connector-odbc/ChangeLog
@@ -13,7 +14,9 @@ share/mysql-connector-odbc/test/my_basics
 share/mysql-connector-odbc/test/my_blob
 share/mysql-connector-odbc/test/my_bug13766
 share/mysql-connector-odbc/test/my_bulk
-share/mysql-connector-odbc/test/my_catalog
+share/mysql-connector-odbc/test/my_catalog1
+share/mysql-connector-odbc/test/my_catalog2
+share/mysql-connector-odbc/test/my_crash
 share/mysql-connector-odbc/test/my_curext
 share/mysql-connector-odbc/test/my_cursor
 share/mysql-connector-odbc/test/my_datetime
@@ -22,11 +25,15 @@ share/mysql-connector-odbc/test/my_dyn_cursor
 share/mysql-connector-odbc/test/my_error
 share/mysql-connector-odbc/test/my_info
 share/mysql-connector-odbc/test/my_keys
+share/mysql-connector-odbc/test/my_nodma
 share/mysql-connector-odbc/test/my_param
+share/mysql-connector-odbc/test/my_pooling
 share/mysql-connector-odbc/test/my_prepare
 share/mysql-connector-odbc/test/my_relative
-share/mysql-connector-odbc/test/my_result
+share/mysql-connector-odbc/test/my_result1
+share/mysql-connector-odbc/test/my_result2
 share/mysql-connector-odbc/test/my_scroll
+share/mysql-connector-odbc/test/my_setup
 share/mysql-connector-odbc/test/my_tran
 share/mysql-connector-odbc/test/my_types
 share/mysql-connector-odbc/test/my_unicode
diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo
index ebea82cdd65..af74095df9c 100644
--- a/databases/myodbc/distinfo
+++ b/databases/myodbc/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2013/03/24 17:03:14 joerg Exp $
+$NetBSD: distinfo,v 1.11 2014/07/02 03:41:51 jnemeth Exp $
 
-SHA1 (mysql-connector-odbc-5.2.2-src.tar.gz) = f289c1127a67e15d6b179eea3b202a00044624b9
-RMD160 (mysql-connector-odbc-5.2.2-src.tar.gz) = f4485a76be39e4534dcdfceb6b5c92a8a812d171
-Size (mysql-connector-odbc-5.2.2-src.tar.gz) = 573157 bytes
-SHA1 (patch-CMakeLists.txt) = 584d003286c190e03e16a69ebf546587795e55eb
-SHA1 (patch-driver_myutil.h) = af9eda7430c9eea44695e568c93fdbff539080db
-SHA1 (patch-test_CMakeLists.txt) = 8d02fccbac6e09d97618ea188320fe2d35dbf00b
+SHA1 (mysql-connector-odbc-5.3.2-src.tar.gz) = 5507903fb14aadf6b7c14f7142eef2c9fff1250c
+RMD160 (mysql-connector-odbc-5.3.2-src.tar.gz) = 0fb1343c1a1754e6c88f2ee8af480a839c7c769b
+Size (mysql-connector-odbc-5.3.2-src.tar.gz) = 655634 bytes
+SHA1 (patch-CMakeLists.txt) = 95c05823ef706fe9344eae4606306d3abc9ab519
+SHA1 (patch-test_CMakeLists.txt) = 7d004271310243f8ccca1bfe8f7b1e8333f6ffdc
diff --git a/databases/myodbc/patches/patch-CMakeLists.txt b/databases/myodbc/patches/patch-CMakeLists.txt
index 78c8c08f38f..90c11d6448b 100644
--- a/databases/myodbc/patches/patch-CMakeLists.txt
+++ b/databases/myodbc/patches/patch-CMakeLists.txt
@@ -1,17 +1,17 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2014/07/02 03:41:51 jnemeth Exp $
 
---- CMakeLists.txt.orig	2012-09-18 10:56:28.000000000 +0000
+--- CMakeLists.txt.orig	2014-03-26 21:20:55.000000000 +0000
 +++ CMakeLists.txt
-@@ -232,6 +232,8 @@ IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR 
-   SET(LIB_SUBDIR "lib64")
- ENDIF()
+@@ -257,6 +257,8 @@ ENDIF()
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
  
 +SET(DOC_SUBDIR "share/doc/mysql-connector-odbc")
 +
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
  
  ADD_SUBDIRECTORY(util)
-@@ -329,18 +331,18 @@ IF(WIN32)
+@@ -382,18 +384,18 @@ IF(WIN32)
  
  ELSE(WIN32)
  
diff --git a/databases/myodbc/patches/patch-driver_myutil.h b/databases/myodbc/patches/patch-driver_myutil.h
deleted file mode 100644
index 7a8f23bdd14..00000000000
--- a/databases/myodbc/patches/patch-driver_myutil.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-driver_myutil.h,v 1.1 2013/03/24 17:03:15 joerg Exp $
-
---- driver/myutil.h.orig	2013-03-23 16:08:29.000000000 +0000
-+++ driver/myutil.h
-@@ -338,7 +338,7 @@ char * add_to_buffer(NET *net,char *to,c
- MY_LIMIT_CLAUSE find_position4limit(CHARSET_INFO* cs, char *query,
-                                     char * query_end);
- BOOL myodbc_isspace(CHARSET_INFO* cs, const char * begin, const char *end);
--BOOL got_out_parameters(stmt);
-+BOOL got_out_parameters(STMT *stmt);
- 
- /* handle.c*/
- BOOL          allocate_param_bind(DYNAMIC_ARRAY **param_bind, uint elements);
diff --git a/databases/myodbc/patches/patch-test_CMakeLists.txt b/databases/myodbc/patches/patch-test_CMakeLists.txt
index d2afde2c4e7..913497e0b51 100644
--- a/databases/myodbc/patches/patch-test_CMakeLists.txt
+++ b/databases/myodbc/patches/patch-test_CMakeLists.txt
@@ -1,21 +1,29 @@
-$NetBSD: patch-test_CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $
+$NetBSD: patch-test_CMakeLists.txt,v 1.2 2014/07/02 03:41:51 jnemeth Exp $
 
---- test/CMakeLists.txt.orig	2012-09-18 10:56:28.000000000 +0000
+--- test/CMakeLists.txt.orig	2014-03-26 21:20:55.000000000 +0000
 +++ test/CMakeLists.txt
-@@ -44,7 +44,7 @@ FOREACH(T my_basics my_blob my_bulk my_c
- 		my_types my_unicode my_unixodbc my_use_result my_bug13766)
- 	ADD_EXECUTABLE(${T} ${T}.c)
+@@ -55,7 +55,7 @@ FOREACH(T my_basics my_blob my_bulk my_c
+           COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}")
+   ENDIF(MYSQL_CXX_LINKAGE)
  
--    INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests)
-+    INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
+-  INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests)
++  INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
+   SET_TARGET_PROPERTIES(${T} PROPERTIES 
+       LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}")
  
- 	IF(WIN32)
- 	  TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB})
-@@ -59,6 +59,6 @@ INSTALL(FILES
+@@ -102,7 +102,7 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
+               COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}")
+       ENDIF(MYSQL_CXX_LINKAGE)
+ 
+-      INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests)
++      INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
+       SET_TARGET_PROPERTIES(${T} PROPERTIES 
+           LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}")
+ 
+@@ -130,5 +130,5 @@ INSTALL(FILES
  	${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake
  	${CMAKE_CURRENT_BINARY_DIR}/odbc.ini
  	${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini
 -        DESTINATION test COMPONENT tests)
 +        DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
  
-