MonetDB: default - Merge with Oct2010 branch.

[Stefan Manegold]

Changeset: a856cb5aa0cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a856cb5aa0cd
Modified Files:
        MonetDB5/src/scheduler/run_octopus.mx
        pathfinder/compiler/algebra/algebra.c
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (66 lines):

diff -r 779a223278cd -r a856cb5aa0cd MonetDB5/src/scheduler/run_octopus.mx
--- a/MonetDB5/src/scheduler/run_octopus.mx     Tue Dec 07 19:51:38 2010 +0100
+++ b/MonetDB5/src/scheduler/run_octopus.mx     Tue Dec 07 19:52:28 2010 +0100
@@ -244,8 +244,8 @@
        BUN p,q;
        str msg = MAL_SUCCEED;
        BATiter bi;
+       int i;
        char buf[BUFSIZ]= "*/octopus", *s= buf;
-       int i;
 
        nrworkers = 0;
        octopusLocal = 0;
diff -r 779a223278cd -r a856cb5aa0cd clients/src/odbc/driver/ODBCGlobal.h
--- a/clients/src/odbc/driver/ODBCGlobal.h      Tue Dec 07 19:51:38 2010 +0100
+++ b/clients/src/odbc/driver/ODBCGlobal.h      Tue Dec 07 19:52:28 2010 +0100
@@ -148,8 +148,8 @@
 #define LENFMT         "%I64d"
 #define ULENFMT                "%I64u"
 #else
-#define LENFMT         "%lld"
-#define ULENFMT                "%llu"
+#define LENFMT         "%ld"
+#define ULENFMT                "%lu"
 #endif
 #endif
 
diff -r 779a223278cd -r a856cb5aa0cd pathfinder/compiler/algebra/algebra.c
--- a/pathfinder/compiler/algebra/algebra.c     Tue Dec 07 19:51:38 2010 +0100
+++ b/pathfinder/compiler/algebra/algebra.c     Tue Dec 07 19:52:28 2010 +0100
@@ -955,7 +955,7 @@
 PFalg_col_t
 PFcol_ori_name (PFalg_col_t unq, PFalg_col_t free)
 {
-    switch (unq & (col_iter | col_pos | col_item || col_score)) {
+    switch (unq & (col_iter | col_pos | col_item | col_score)) {
         case col_iter:
             if (free & col_iter)   return col_iter;
             if (free & col_iter1)  return col_iter1;
diff -r 779a223278cd -r a856cb5aa0cd pathfinder/compiler/debug/abssynprint.c
--- a/pathfinder/compiler/debug/abssynprint.c   Tue Dec 07 19:51:38 2010 +0100
+++ b/pathfinder/compiler/debug/abssynprint.c   Tue Dec 07 19:52:28 2010 +0100
@@ -535,7 +535,7 @@
                 } break;
 
             case p_replace:
-                PFprettyprintf (n->sem.tru ? "" : "value of");
+                PFprettyprintf ("%s", n->sem.tru ? "" : "value of");
                 break;
 
             default:
diff -r 779a223278cd -r a856cb5aa0cd pathfinder/runtime/ll_staircasejoin.mx
--- a/pathfinder/runtime/ll_staircasejoin.mx    Tue Dec 07 19:51:38 2010 +0100
+++ b/pathfinder/runtime/ll_staircasejoin.mx    Tue Dec 07 19:52:28 2010 +0100
@@ -372,8 +372,9 @@
 @
 
 @= ll_return
-{   if (del) BBPreclaim(del);
-    if (res && (@1 == GDK_FAIL))
+{   int rtrn = @1;
+    if (del) BBPreclaim(del);
+    if (res && (rtrn == GDK_FAIL))
         BBP_unfix_reclaim(res);
     return @1; }
 @c
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list