Author: freetz Date: Thu Jul 27 21:02:22 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- for 1.2.x from ubuntu
---- Files affected:
SOURCES:
libgda-freetds063.patch (NONE -> 1.1) (NEW), libgda-sqlite.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/libgda-freetds063.patch
diff -u /dev/null SOURCES/libgda-freetds063.patch:1.1
--- /dev/null Thu Jul 27 23:02:22 2006
+++ SOURCES/libgda-freetds063.patch Thu Jul 27 23:02:17 2006
@@ -0,0 +1,45 @@
+diff -urN libgda-1.2.3.orig/providers/freetds/gda-freetds-provider.c
libgda-1.2.3/providers/freetds/gda-freetds-provider.c
+--- libgda-1.2.3.orig/providers/freetds/gda-freetds-provider.c 2006-02-12
16:09:22.000000000 -0200
++++ libgda-1.2.3/providers/freetds/gda-freetds-provider.c 2006-02-12
18:31:16.000000000 -0200
+@@ -357,7 +357,9 @@
+ tds_cnc->database = NULL;
+ }
+ if (tds_cnc->config) {
+-#ifdef HAVE_FREETDS_VER0_6X
++#ifdef HAVE_FREETDS_VER0_63
++ tds_free_connection (tds_cnc->config);
++#elif defined(HAVE_FREETDS_VER0_6X)
+ tds_free_connect (tds_cnc->config);
+ #else
+ tds_free_config(tds_cnc->config);
+@@ -802,7 +804,9 @@
+ }
+
+ /* there should not be any result tokens */
+-#ifdef HAVE_FREETDS_VER0_6X
++#if defined(HAVE_FREETDS_VER0_63)
++ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
&tds_cnc->result_type, NULL))
++#elif defined(HAVE_FREETDS_VER0_6X)
+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
&tds_cnc->result_type))
+ #else
+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds))
+diff -urN libgda-1.2.3.orig/providers/freetds/gda-freetds-recordset.c
libgda-1.2.3/providers/freetds/gda-freetds-recordset.c
+--- libgda-1.2.3.orig/providers/freetds/gda-freetds-recordset.c
2006-02-12 16:09:22.000000000 -0200
++++ libgda-1.2.3/providers/freetds/gda-freetds-recordset.c 2006-02-12
19:23:13.000000000 -0200
+@@ -339,7 +339,15 @@
+ recset->priv->tds_cnc = tds_cnc;
+ recset->priv->res = tds_cnc->tds->res_info;
+
+-#ifdef HAVE_FREETDS_VER0_6X
++#ifdef HAVE_FREETDS_VER0_63
++ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
++ &tds_cnc->result_type, NULL))
++ == TDS_SUCCEED) {
++ if (tds_cnc->result_type == TDS_ROW_RESULT) {
++ gint row_type, compute_id;
++
++ while ((tds_cnc->rc =
tds_process_row_tokens(tds_cnc->tds, &row_type, &compute_id))
++#elif defined(HAVE_FREETDS_VER0_6X)
+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
+ &tds_cnc->result_type))
+ == TDS_SUCCEED) {
================================================================
Index: SOURCES/libgda-sqlite.patch
diff -u /dev/null SOURCES/libgda-sqlite.patch:1.1
--- /dev/null Thu Jul 27 23:02:22 2006
+++ SOURCES/libgda-sqlite.patch Thu Jul 27 23:02:17 2006
@@ -0,0 +1,12 @@
+diff -urN libgda-1.2.2.orig/providers/sqlite/gda-sqlite-provider.c
libgda-1.2.2/providers/sqlite/gda-sqlite-provider.c
+--- libgda-1.2.2.orig/providers/sqlite/gda-sqlite-provider.c 2005-09-07
15:50:16.000000000 -0300
++++ libgda-1.2.2/providers/sqlite/gda-sqlite-provider.c 2005-10-08
22:03:08.000000000 -0300
+@@ -261,7 +261,7 @@
+
+ while ((next = (const gchar *) strchr (next, ';')) != NULL) {
+ gchar *tmp = g_strndup (remainder, next - remainder + 1);
+- if (sqlite_complete (tmp)) {
++ if (sqlite3_complete (tmp)) {
+ string_list = g_slist_prepend (string_list, tmp);
+ n++;
+ remainder = (const gchar *) (next + 1);
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
