# HG changeset patch # User Mark Brand # Date 1297435715 -3600 # Node ID 50512a53b7ad16628489e299db36e2aede4399d5 # Parent 438c1a3de867cbb6f5272fd58559f844ac55ce38 upgrade package freetds to cvs diff -r 438c1a3de867 -r 50512a53b7ad src/freetds-1-fastforward.patch --- a/src/freetds-1-fastforward.patch Wed Feb 09 11:06:42 2011 +0100 +++ b/src/freetds-1-fastforward.patch Fri Feb 11 15:48:35 2011 +0100 @@ -165417,3 +165417,112 @@ } /** + +commit 7e6172f05370929a94a1f61eb437b7bddb318f3e +Author: jklowden +Date: Tue Jan 25 06:18:53 2011 +0000 + + remove use and reference to sqlfront.h. + +diff --git a/ChangeLog b/ChangeLog +index b90e1c3..b261a2f 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++Tue Jan 25 00:52:04 EST 2011 JK Lowden ++ * doc/userguide.sgml include/sybdb.h ++ - remove use and reference to sqlfront.h. ++ + Sat Jan 22 15:04:21 EST 2011 JK Lowden + * src/tds/iconv.c tds_canonical_charset_name cannot return NULL + +@@ -3149,4 +3153,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden + * ChangeLog-0.82 added because of release + + $FreeTDS$ +-$Id: ChangeLog,v 1.3194 2011/01/22 20:11:27 jklowden Exp $ ++$Id: ChangeLog,v 1.3195 2011/01/25 06:18:53 jklowden Exp $ +diff --git a/doc/userguide.sgml b/doc/userguide.sgml +index 2d9971d..641ef39 100644 +--- a/doc/userguide.sgml ++++ b/doc/userguide.sgml +@@ -9,8 +9,8 @@ + ]> + + +- $Date: 2010/12/31 04:12:07 $ +- $Revision: 1.131 $ ++ $Date: 2011/01/25 06:18:53 $ ++ $Revision: 1.132 $ + &freetds; User Guide + A Guide to Installing, Configuring, and Running &freetds; + +@@ -62,9 +62,9 @@ This guide is here for you, and we hope that you will be here for it, that other + The version you're reading is: + + +-$Revision: 1.131 $ +-$Date: 2010/12/31 04:12:07 $ +-CVS control number $Id: userguide.sgml,v 1.131 2010/12/31 04:12:07 jklowden Exp $. ++$Revision: 1.132 $ ++$Date: 2011/01/25 06:18:53 $ ++CVS control number $Id: userguide.sgml,v 1.132 2011/01/25 06:18:53 jklowden Exp $. + + + can be found on the &freetds; +@@ -610,7 +610,7 @@ url="http://www.madgoat.com">www.madgoat.com). + + + OS X® +- As of this writing ($Date: 2010/12/31 04:12:07 $), the regular distribution compiles on OS X. Releases prior to 0.63 either did not compile or required patching. ++ As of this writing ($Date: 2011/01/25 06:18:53 $), the regular distribution compiles on OS X. Releases prior to 0.63 either did not compile or required patching. + + + Alternative build procedure +@@ -3538,7 +3538,7 @@ the extent to which it is implemented. The Status field may be: + #include + ]]> + +-#include <sqlfront.h> /* sqlfront.h always comes first */ ++#include <sybfront.h> /* sybfront.h always comes first */ + #include <sybdb.h> /* sybdb.h is the only other file you need */ + + int err_handler(DBPROCESS*, int, int, int, char*, char*); +diff --git a/include/sybdb.h b/include/sybdb.h +index 6c6ab2b..24901d5 100644 +--- a/include/sybdb.h ++++ b/include/sybdb.h +@@ -42,7 +42,7 @@ extern "C" + #define TDS_STATIC_CAST(type, a) ((type)(a)) + #endif + +-static const char rcsid_sybdb_h[] = "$Id: sybdb.h,v 1.97 2010/12/30 14:53:12 freddy77 Exp $"; ++static const char rcsid_sybdb_h[] = "$Id: sybdb.h,v 1.98 2011/01/25 06:18:53 jklowden Exp $"; + static const void *const no_unused_sybdb_h_warn[] = { rcsid_sybdb_h, no_unused_sybdb_h_warn }; + + #ifdef FALSE +@@ -173,8 +173,12 @@ enum + #define SYBDATETIME SYBDATETIME + SYBBIT = 50, /* 0x32 */ + #define SYBBIT SYBBIT ++ SYBBITN = 104, /* 0x68 */ ++#define SYBBITN SYBBITN + SYBTEXT = 35, /* 0x23 */ + #define SYBTEXT SYBTEXT ++ SYBNTEXT = 99, /* 0x63 */ ++#define SYBNTEXT SYBNTEXT + SYBIMAGE = 34, /* 0x22 */ + #define SYBIMAGE SYBIMAGE + SYBMONEY4 = 122, /* 0x7A */ +@@ -199,8 +203,10 @@ enum + #define SYBFLTN SYBFLTN + SYBMONEYN = 110, /* 0x6E */ + #define SYBMONEYN SYBMONEYN +- SYBDATETIMN = 111 /* 0x6F */ ++ SYBDATETIMN = 111, /* 0x6F */ + #define SYBDATETIMN SYBDATETIMN ++ SYBNVARCHAR = 103 /* 0x67 */ ++#define SYBNVARCHAR SYBNVARCHAR + }; + + #define SYBAOPCNT 0x4b