MonetDB: default - Merge git master into default

[Jan Rittinger]

Changeset: b181da69e3ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b181da69e3ba
Modified Files:
        
Branch: default
Log Message:

Merge git master into default


diffs (28 lines):

diff -r b53471b0f293 -r b181da69e3ba 
pathfinder/compiler/algebra-m5sql/msaprint.c
--- a/pathfinder/compiler/algebra-m5sql/msaprint.c      Thu May 20 17:03:37 
2010 +0200
+++ b/pathfinder/compiler/algebra-m5sql/msaprint.c      Thu May 20 17:50:15 
2010 +0200
@@ -155,10 +155,10 @@
     
     switch (atom.type) {
         case aat_nat:
-            sprintf(ret, "%i", atom.val.nat_);
+            sprintf(ret, "%u", atom.val.nat_);
             break;
         case aat_int:
-            sprintf(ret, "%lli", atom.val.int_);
+            sprintf(ret, LLFMT, atom.val.int_);
             break;
         case aat_str:
             if (strlen(atom.val.str) >= 10) {
diff -r b53471b0f293 -r b181da69e3ba pathfinder/compiler/include/msa.h
--- a/pathfinder/compiler/include/msa.h Thu May 20 17:03:37 2010 +0200
+++ b/pathfinder/compiler/include/msa.h Thu May 20 17:50:15 2010 +0200
@@ -308,7 +308,7 @@
 /* --------------- Constructor stubs for operators --------------- */
 
 /* Constructor for nil node operator */
-PFmsa_op_t * PFmsa_op_nil_node ();
+PFmsa_op_t * PFmsa_op_nil_node (void);
 
 /* Contructor for serialize operator */
 PFmsa_op_t * PFmsa_op_serialize_rel (PFmsa_op_t *DAG, PFmsa_op_t *side_effects,
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list