Mercurial > mxe-octave

changeset 1546:b1ab0cbb1720

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package freetds to cvs
author Mark Brand <mabrand@mabrand.nl>
date Sat, 15 Jan 2011 11:30:26 +0100
parents 410380cbd774
children 933bb18f411e
files src/freetds-1-fastforward.patch
diffstat 1 files changed, 144 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/freetds-1-fastforward.patch	Thu Jan 13 12:10:01 2011 +0100
+++ b/src/freetds-1-fastforward.patch	Sat Jan 15 11:30:26 2011 +0100
@@ -164807,3 +164807,147 @@
  	default:
  		tdsdump_log(TDS_DBG_ERROR, "Unknown type %d\n", tds_get_conversion_type(curcol->on_server.column_type, curcol->on_server.column_size));
  		break;
+
+commit 0daf07d452dc14401f29976411fff2935f8b0bf2
+Author: freddy77 <freddy77>
+Date:   Fri Jan 14 14:18:14 2011 +0000
+
+    minor dblib results changes
+
+diff --git a/ChangeLog b/ChangeLog
+index 5c3e6ac..2c6206e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Fri Jan 14 15:15:21 CET 2011    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/dblib/bcp.c src/dblib/dblib.c: minor dblib results changes
++
+ Wed Jan 12 10:21:03 CET 2011    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* src/tds/query.c: support SQL_VARIANT passing parameters
+ 
+@@ -3139,4 +3142,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.3191 2011/01/12 09:21:11 freddy77 Exp $
++$Id: ChangeLog,v 1.3192 2011/01/14 14:18:14 freddy77 Exp $
+diff --git a/src/dblib/bcp.c b/src/dblib/bcp.c
+index 6c2dbaa..728e364 100644
+--- a/src/dblib/bcp.c
++++ b/src/dblib/bcp.c
+@@ -1,6 +1,6 @@
+ /* FreeTDS - Library of routines accessing Sybase and Microsoft databases
+  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005  Brian Bruns
+- * Copyright (C) 2010  Frediano Ziglio
++ * Copyright (C) 2010, 2011  Frediano Ziglio
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+@@ -62,7 +62,7 @@
+ #define MAX(a,b) ( (a) > (b) ? (a) : (b) )
+ #endif
+ 
+-TDS_RCSID(var, "$Id: bcp.c,v 1.195 2010/07/31 11:31:16 freddy77 Exp $");
++TDS_RCSID(var, "$Id: bcp.c,v 1.196 2011/01/14 14:18:15 freddy77 Exp $");
+ 
+ #ifdef HAVE_FSEEKO
+ typedef off_t offset_type;
+@@ -2376,7 +2376,7 @@ _bcp_null_error(TDSBCPINFO *bcpinfo, int index, int offset)
+  * \param dbproc contains all information needed by db-lib to manage communications with the server.
+  * \param bindcol 
+  * 
+- * \return SUCCEED or FAIL.
++ * \return TDS_SUCCEED or TDS_FAIL.
+  * \sa 	_bcp_add_fixed_columns, _bcp_add_variable_columns, _bcp_send_bcp_record
+  */
+ static int
+@@ -2546,8 +2546,6 @@ rtrim(char *str, int len)
+  * \brief 
+  *
+  * \param dbproc contains all information needed by db-lib to manage communications with the server.
+- * 
+- * \return SUCCEED or FAIL.
+  */
+ static void
+ _bcp_free_columns(DBPROCESS * dbproc)
+@@ -2574,7 +2572,6 @@ _bcp_free_columns(DBPROCESS * dbproc)
+  *
+  * \param dbproc contains all information needed by db-lib to manage communications with the server.
+  * 
+- * \return SUCCEED or FAIL.
+  * \sa 	bcp_done(), bcp_exec(), bcp_init()
+  */
+ static void
+@@ -2598,7 +2595,5 @@ _bcp_free_storage(DBPROCESS * dbproc)
+ 		dbproc->bcpinfo->bindinfo = NULL;
+ 		TDS_ZERO_FREE(dbproc->bcpinfo);
+ 	}
+-
+-	return;
+ }
+ 
+diff --git a/src/dblib/dblib.c b/src/dblib/dblib.c
+index f92025f..240b304 100644
+--- a/src/dblib/dblib.c
++++ b/src/dblib/dblib.c
+@@ -1,6 +1,6 @@
+ /* FreeTDS - Library of routines accessing Sybase and Microsoft databases
+  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005  Brian Bruns
+- * Copyright (C) 2006-2010  Frediano Ziglio
++ * Copyright (C) 2006-2011  Frediano Ziglio
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+@@ -75,7 +75,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: dblib.c,v 1.376 2011/01/03 20:27:54 jklowden Exp $");
++TDS_RCSID(var, "$Id: dblib.c,v 1.377 2011/01/14 14:18:15 freddy77 Exp $");
+ 
+ static RETCODE _dbresults(DBPROCESS * dbproc);
+ static int _db_get_server_type(int bindtype);
+@@ -4044,7 +4044,7 @@ dbcmdrow(DBPROCESS * dbproc)
+ 	tds = dbproc->tds_socket;
+ 	if (tds->res_info)
+ 		return SUCCEED;
+-	return TDS_FAIL;
++	return FAIL;
+ }
+ 
+ /**
+@@ -4095,7 +4095,7 @@ dbadlen(DBPROCESS * dbproc, int computeid, int column)
+ 
+ 	colinfo = dbacolptr(dbproc, computeid, column, 0);
+ 	if (!colinfo)
+-		return FAIL;
++		return -1;
+ 
+ 	len = colinfo->column_cur_size < 0? 0 : colinfo->column_cur_size;
+ 
+@@ -4125,7 +4125,7 @@ dbalttype(DBPROCESS * dbproc, int computeid, int column)
+ 
+ 	colinfo = dbacolptr(dbproc, computeid, column, 0);
+ 	if (!colinfo)
+-		return FAIL;
++		return -1;
+ 
+ 	switch (colinfo->column_type) {
+ 	case SYBVARCHAR:
+@@ -5740,7 +5740,6 @@ dbsetuserdata(DBPROCESS * dbproc, BYTE * ptr)
+ 	CHECK_PARAMETER(dbproc, SYBENULL, );
+ 
+ 	dbproc->user_data = ptr;
+-	return;
+ }
+ 
+ /**
+@@ -7105,7 +7104,7 @@ dbstrbuild(DBPROCESS * dbproc, char *charbuf, int bufsize, char *text, char *for
+ 	rc = tds_vstrbuild(charbuf, bufsize, &resultlen, text, TDS_NULLTERM, formats, TDS_NULLTERM, ap);
+ 	charbuf[resultlen] = '\0';
+ 	va_end(ap);
+-	return rc;
++	return rc == TDS_SUCCEED ? SUCCEED : FAIL;
+ }
+ 
+ static char *