[master] type mismatch in ODBC DLZ driver

3732.	[contrib]	Fixed a type mismatch causing the ODBC DLZ
			driver to dump core on 64-bit systems. [RT #35324]

diff --git a/CHANGES b/CHANGES
index c596182538ef07825ac58be534f50fa6298f653a..f71fb1e14d73b88f78b0b7db2771573b2ea318f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3732.  [contrib]       Fixed a type mismatch causing the ODBC DLZ
+                       driver to dump core on 64-bit systems. [RT #35324]
+
 3731.  [func]          Added a "no-case-compress" ACL, which causes
                        named to use case-insensitive compression
                        (disabling change #3645) for specified

diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c
index 283998d85eb2486b01a51476054a27d279a858ec..75ac3ca3c81a6fac245a6d775737c339a3eca2e3 100644 (file)
--- a/contrib/dlz/drivers/dlz_odbc_driver.c
+++ b/contrib/dlz/drivers/dlz_odbc_driver.c
@@ -734,7 +734,7 @@ odbc_get_resultset(const char *zone, const char *record,
 static isc_result_t
 odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) {
 
-       SQLINTEGER size;
+       SQLLEN size;
 
        REQUIRE(data != NULL && *data == NULL);
 
@@ -763,7 +763,7 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField,
                   SQLSMALLINT endField, char **retData) {
 
        isc_result_t result;
-       SQLINTEGER size;
+       SQLLEN size;
        int totSize = 0;
        SQLSMALLINT i;
        int j = 0;