MonetDB: default - Merge git master into default

[Jan Rittinger]

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

Merge git master into default


diffs (23 lines):

diff -r 7839a8fd547c -r 6b3a60a20d94 
pathfinder/compiler/algebra-m5sql/msaprint.c
--- a/pathfinder/compiler/algebra-m5sql/msaprint.c      Fri May 21 08:43:31 
2010 +0200
+++ b/pathfinder/compiler/algebra-m5sql/msaprint.c      Fri May 21 09:51:08 
2010 +0200
@@ -179,7 +179,7 @@
             sprintf(ret, "%s", atom.val.bln ? "true" : "false");
             break;
         case aat_qname:
-            sprintf(ret, "%i", atom.val.qname);
+            sprintf(ret, "%s", PFqname_str (atom.val.qname));
             break;
         default:
             break;
diff -r 7839a8fd547c -r 6b3a60a20d94 pathfinder/compiler/include/Makefile.ag
--- a/pathfinder/compiler/include/Makefile.ag   Fri May 21 08:43:31 2010 +0200
+++ b/pathfinder/compiler/include/Makefile.ag   Fri May 21 09:51:08 2010 +0200
@@ -69,6 +69,7 @@
        milprint.h \
        milprint_summer.h \
         msa.h \
+        msa_mnemonic.h \
         msaprint.h \
        normalize.h \
        ns.h \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list