Mercurial > mxe-octave
changeset 1712:9b89021c4418
upgrade package freetds to cvs
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sun, 27 Mar 2011 21:54:53 +0200 |
| parents | 39f91df0fd34 |
| children | 318f6b6153bd |
| files | src/freetds-1-fastforward.patch |
| diffstat | 1 files changed, 77 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetds-1-fastforward.patch Sun Mar 27 20:58:31 2011 +0200 +++ b/src/freetds-1-fastforward.patch Sun Mar 27 21:54:53 2011 +0200 @@ -178308,3 +178308,80 @@ if((colinfo->bcp_terminator = malloc(termlen)) == NULL) { dbperror(dbproc, SYBEMEM, errno); return FAIL; + +commit 8ff71bacd4413441c34861a323dafe70a2c51678 +Author: jklowden <jklowden> +Date: Sun Mar 27 16:36:53 2011 +0000 + + src/dblib/dblib.c src/tds/config.c src/tds/login.c Support DBSETLDBNAME + +diff --git a/ChangeLog b/ChangeLog +index 7efbb19..79e2ed8 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++Sun Mar 27 12:34:23 EDT 2011 JK Lowden <jklowden@freetds.org> ++ * include/sybdb.h include/tds.h ++ - src/dblib/dblib.c src/tds/config.c src/tds/login.c ++ - Support DBSETLDBNAME ++ + Tue Mar 22 13:51:32 EDT 2011 JK Lowden <jklowden@freetds.org> + * autogen.sh neater output + * src/apps/tsql.c spell Kerberos correctly +@@ -3188,4 +3193,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.3203 2011/03/22 17:54:04 jklowden Exp $ ++$Id: ChangeLog,v 1.3204 2011/03/27 16:36:53 jklowden Exp $ +diff --git a/include/sybdb.h b/include/sybdb.h +index 63be6a2..99fe81a 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.99 2011/02/17 15:55:36 jklowden Exp $"; ++static const char rcsid_sybdb_h[] = "$Id: sybdb.h,v 1.100 2011/03/27 16:36:53 jklowden Exp $"; + static const void *const no_unused_sybdb_h_warn[] = { rcsid_sybdb_h, no_unused_sybdb_h_warn }; + + #ifdef FALSE +@@ -1165,6 +1165,8 @@ RETCODE dbsetlversion (LOGINREC * login, BYTE version); + #define DBSETLABELED 13 + #define DBSETLLABELED(x,y) dbsetlbool((x), (y), DBSETLABELED) + #define BCP_SETLABELED(x,y) dbsetlbool((x), (y), DBSETLABELED) ++#define DBSETDBNAME 14 ++#define DBSETLDBNAME(x,y) dbsetlname((x), (y), DBSETDBNAME) + #define DBSETLVERSION(login, version) dbsetlversion((login), (version)) + + RETCODE bcp_init(DBPROCESS * dbproc, const char *tblname, const char *hfile, const char *errfile, int direction); +diff --git a/include/tds.h b/include/tds.h +index 026b6e3..a0ebb12 100644 +--- a/include/tds.h ++++ b/include/tds.h +@@ -21,7 +21,7 @@ + #ifndef _tds_h_ + #define _tds_h_ + +-/* $Id: tds.h,v 1.350 2011/02/17 15:55:36 jklowden Exp $ */ ++/* $Id: tds.h,v 1.351 2011/03/27 16:36:53 jklowden Exp $ */ + + #include <stdarg.h> + #include <stdio.h> +@@ -844,6 +844,7 @@ typedef struct tds_login + TDS_INT query_timeout; + unsigned char capabilities[TDS_MAX_CAPABILITY]; + DSTR client_charset; ++ DSTR database; + unsigned int bulk_copy:1; + unsigned int suppress_language:1; + } TDSLOGIN; +@@ -1468,6 +1469,7 @@ void tds_set_library(TDSLOGIN * tds_login, const char *library); + void tds_set_server(TDSLOGIN * tds_login, const char *server); + void tds_set_client_charset(TDSLOGIN * tds_login, const char *charset); + void tds_set_language(TDSLOGIN * tds_login, const char *language); ++void tds_set_database_name(TDSLOGIN * tds_login, const char *dbname); + void tds_set_version(TDSLOGIN * tds_login, TDS_TINYINT major_ver, TDS_TINYINT minor_ver); + void tds_set_capabilities(TDSLOGIN * tds_login, unsigned char *capabilities, int size); + int tds_connect_and_login(TDSSOCKET * tds, TDSCONNECTION * connection);