summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-02-11 14:48:35 (GMT)
committerMark Brand <mabrand@mabrand.nl>2011-02-11 14:48:35 (GMT)
commitf27913e014e6c3ea06e58e82b519efc410dc7729 (patch)
treeb8dc8af99cb5049614b751458b63ff06ce435c7e /src
parent1cfa92eb45eb7eedeec6ae37e03170004ac3d7ca (diff)
downloadmxe-f27913e014e6c3ea06e58e82b519efc410dc7729.zip
mxe-f27913e014e6c3ea06e58e82b519efc410dc7729.tar.gz
mxe-f27913e014e6c3ea06e58e82b519efc410dc7729.tar.bz2
upgrade package freetds to cvs
Diffstat (limited to 'src')
-rw-r--r--src/freetds-1-fastforward.patch109
1 files changed, 109 insertions, 0 deletions
diff --git a/src/freetds-1-fastforward.patch b/src/freetds-1-fastforward.patch
index 6daa9cc..82f0d63 100644
--- a/src/freetds-1-fastforward.patch
+++ b/src/freetds-1-fastforward.patch
@@ -165417,3 +165417,112 @@ index 98d1479..773958f 100644
}
/**
+
+commit 7e6172f05370929a94a1f61eb437b7bddb318f3e
+Author: jklowden <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 <jklowden@freetds.org>
++ * doc/userguide.sgml include/sybdb.h
++ - remove use and reference to sqlfront.h.
++
+ Sat Jan 22 15:04:21 EST 2011 JK Lowden <jklowden@freetds.org>
+ * 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 <jklowden@freetds.org>
+ * 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 @@
+ ]>
+ <book>
+ <bookinfo>
+- <date>$Date: 2010/12/31 04:12:07 $</date>
+- <releaseinfo>$Revision: 1.131 $</releaseinfo>
++ <date>$Date: 2011/01/25 06:18:53 $</date>
++ <releaseinfo>$Revision: 1.132 $</releaseinfo>
+ <title>&freetds; User Guide</title>
+ <subtitle>A Guide to Installing, Configuring, and Running &freetds;</subtitle>
+ <author>
+@@ -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:
+ </para>
+ <simplelist type='vert'>
+-<member>$Revision: 1.131 $</>
+-<member>$Date: 2010/12/31 04:12:07 $</>
+-<member>CVS control number $Id: userguide.sgml,v 1.131 2010/12/31 04:12:07 jklowden Exp $.</>
++<member>$Revision: 1.132 $</>
++<member>$Date: 2011/01/25 06:18:53 $</>
++<member>CVS control number $Id: userguide.sgml,v 1.132 2011/01/25 06:18:53 jklowden Exp $.</>
+ </simplelist>
+ </footnote>
+ can be found on the &freetds;
+@@ -610,7 +610,7 @@ url="http://www.madgoat.com">www.madgoat.com</ulink>).</para>
+ </sect3>
+ </sect2>
+ <sect2 id="osx"><title>OS X&reg;</title>
+- <para>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. </para>
++ <para>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. </para>
+
+ <sect3 id="OSX.Build.Update">
+ <title>Alternative build procedure</title>
+@@ -3538,7 +3538,7 @@ the extent to which it is implemented. The <emphasis>Status</> field may be:
+ #include <libgen.h>
+ ]]>
+
+-#include &lt;sqlfront.h&gt; <lineannotation>/* <filename>sqlfront.h</> always comes first */</lineannotation>
++#include &lt;sybfront.h&gt; <lineannotation>/* <filename>sybfront.h</> always comes first */</lineannotation>
+ #include &lt;sybdb.h&gt; <lineannotation>/* <filename>sybdb.h</> is the only other file you need */</lineannotation>
+
+ 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