Attachment #145547 for bug #192448

View | Details | Raw Unified | Return to bug 192448
Collapse All | Expand All

Lines 2-11 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD: head/databases/mysql-connector-odbc/Makefile 353029 2014-05-05 16:24:00Z bapt $	2	# $FreeBSD: head/databases/mysql-connector-odbc/Makefile 353029 2014-05-05 16:24:00Z bapt $
3		3
4	PORTNAME= mysql-connector-odbc	4	PORTNAME= mysql-connector-odbc
5	PORTVERSION= 5.1.9	5	PORTVERSION= 5.2.7
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= ${MASTER_SITE_MYSQL}	7	MASTER_SITES= ${MASTER_SITE_MYSQL}
8	MASTER_SITE_SUBDIR= Connector-ODBC/5.1	8	MASTER_SITE_SUBDIR= Connector-ODBC/5.2
		9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
		10	DISTFILES= ${DISTNAME}.tar.gz
9	PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}	11	PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}
10		12
11	MAINTAINER= sergey@network-asp.biz	13	MAINTAINER= sergey@network-asp.biz
Lines 13-19 Link Here
13		15
14	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
15	USE_MYSQL= yes	17	USE_MYSQL= yes
16	DEFAULT_MYSQL_VER= 51
17	USES= cmake	18	USES= cmake
18		19
19	PLIST_SUB= VER=${PORTVERSION}	20	PLIST_SUB= VER=${PORTVERSION}
Lines 21-26 Link Here
21	PORTDOCS= ChangeLog INSTALL \	22	PORTDOCS= ChangeLog INSTALL \
22	README README.debug COPYING Licenses_for_Third-Party_Components.txt	23	README README.debug COPYING Licenses_for_Third-Party_Components.txt
23		24
		25	LDFLAGS+= -L${LOCALBASE}/lib
24	LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC	26	LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
25	BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC	27	BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
26	CMAKE_ARGS += -DWITH_UNIXODBC=1	28	CMAKE_ARGS += -DWITH_UNIXODBC=1

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mysql-connector-odbc-5.1.9.tar.gz) = d14a0d5ca0f0bc4fc4bbd8609c4e7fde56c70d8b3ae56eb2c3687ce794990ee9	1	SHA256 (mysql-connector-odbc-5.2.7-src.tar.gz) = 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9
2	SIZE (mysql-connector-odbc-5.1.9.tar.gz) = 542281	2	SIZE (mysql-connector-odbc-5.2.7-src.tar.gz) = 606472

Lines 1-2 Link Here

(-)pkg-plist (-1 / +2 lines)
1	bin/myodbc-installer	1	bin/myodbc-installer
2	lib/libmyodbc5.so	2	lib/libmyodbc5a.so
		3	lib/libmyodbc5w.so




--- driver/execute.c.orig	2014-08-07 13:59:09.000000000 +0400
+++ driver/execute.c	2014-08-07 14:01:45.000000000 +0400
@@ -540,11 +540,19 @@
         *res= buff;
         break;
     case SQL_C_SBIGINT:
+#ifdef MARIADB_BASE_VERSION
+        *length= longlong2str(*((longlong*) *res),buff, -10, 1) - buff;
+#else
         *length= longlong2str(*((longlong*) *res), buff, -10) - buff;
+#endif
         *res= buff;
         break;
     case SQL_C_UBIGINT:
+#ifdef MARIADB_BASE_VERSIONA
+        *length= longlong2str(*((ulonglong*) *res), buff, 10, 1) - buff;
+#else
         *length= longlong2str(*((ulonglong*) *res), buff, 10) - buff;
+#endif
         *res= buff;
         break;
     case SQL_C_FLOAT:

Return to bug 192448

Lines 1-22 Link Here

(-)files/patch-driver__execute.c (-17 / +17 lines)
1	--- driver/execute.c.orig 2011-10-04 23:19:00.000000000 +0300	1	--- driver/execute.c.orig 2014-08-07 13:59:09.000000000 +0400
2	+++ driver/execute.c 2011-10-15 12:07:45.000000000 +0300	2	+++ driver/execute.c 2014-08-07 14:01:45.000000000 +0400
3	@@ -424,11 +424,19 @@	3	@@ -540,11 +540,19 @@
4	data= buff;	4	*res= buff;
5	break;	5	break;
6	case SQL_C_SBIGINT:	6	case SQL_C_SBIGINT:
7	+#ifdef MARIADB_BASE_VERSION	7	+#ifdef MARIADB_BASE_VERSION
8	+ length= longlong2str(((longlong) data),buff, -10, 1) - buff;	8	+ length= longlong2str(((longlong) res),buff, -10, 1) - buff;
9	+#else	9	+#else
10	length= longlong2str(((longlong) data),buff, -10) - buff;	10	length= longlong2str(((longlong) res), buff, -10) - buff;
11	+#endif	11	+#endif
12	data= buff;	12	*res= buff;
13	break;	13	break;
14	case SQL_C_UBIGINT:	14	case SQL_C_UBIGINT:
15	+#ifdef MARIADB_BASE_VERSION	15	+#ifdef MARIADB_BASE_VERSIONA
16	+ length= longlong2str(((ulonglong) data),buff, 10, 1) - buff;	16	+ length= longlong2str(((ulonglong) res), buff, 10, 1) - buff;
17	+#else	17	+#else
18	length= longlong2str(((ulonglong) data),buff, 10) - buff;	18	length= longlong2str(((ulonglong) res), buff, 10) - buff;
19	+#endif	19	+#endif
20	data= buff;	20	*res= buff;
21	break;	21	break;
22	case SQL_C_FLOAT:	22	case SQL_C_FLOAT: