Mercurial > mxe-octave
changeset 1459:4ea0fa948ced
upgrade package freetds to cvs
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 30 Nov 2010 16:09:39 +0100 |
| parents | 4b3fc437b181 |
| children | 8d3d9c28aaa2 |
| files | src/freetds-1-fastforward.patch |
| diffstat | 1 files changed, 50 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetds-1-fastforward.patch Tue Nov 30 00:03:40 2010 +0100 +++ b/src/freetds-1-fastforward.patch Tue Nov 30 16:09:39 2010 +0100 @@ -160279,3 +160279,53 @@ } /* pass the lock */ + +commit 39c001f0e204c2cc0b21765fc0832afb58d14d55 +Author: freddy77 <freddy77> +Date: Tue Nov 30 10:55:43 2010 +0000 + + fix problem with ct_connect if server not set (reported by Peter C. Norton) + +diff --git a/ChangeLog b/ChangeLog +index 8e6216f..2cd446f 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++Tue Nov 30 11:55:20 CET 2010 Frediano Ziglio <freddy77_A_gmail_D_com> ++ * src/tds/login.c: ++ - fix problem with ct_connect if server not set (reported by Peter ++ C. Norton) ++ + Sun Nov 28 15:15:25 CET 2010 Frediano Ziglio <freddy77_A_gmail_D_com> + * src/tds/ptw32_MCS_lock.c: remove a warning + +@@ -3037,4 +3042,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.3165 2010/11/28 14:15:45 freddy77 Exp $ ++$Id: ChangeLog,v 1.3166 2010/11/30 10:55:43 freddy77 Exp $ +diff --git a/src/tds/login.c b/src/tds/login.c +index ea8d6f1..9cdb942 100644 +--- a/src/tds/login.c ++++ b/src/tds/login.c +@@ -51,7 +51,7 @@ + #include <dmalloc.h> + #endif + +-TDS_RCSID(var, "$Id: login.c,v 1.200 2010/11/26 08:41:26 freddy77 Exp $"); ++TDS_RCSID(var, "$Id: login.c,v 1.201 2010/11/30 10:55:43 freddy77 Exp $"); + + static int tds_send_login(TDSSOCKET * tds, TDSCONNECTION * connection); + static int tds8_do_login(TDSSOCKET * tds, TDSCONNECTION * connection); +@@ -140,8 +140,8 @@ tds_set_server(TDSLOGIN * tds_login, const char *server) + } + } + #endif +- assert(server); +- tds_dstr_copy(&tds_login->server_name, server); ++ if (server) ++ tds_dstr_copy(&tds_login->server_name, server); + } + + void