MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (12 lines):

diff -r e3d5d6145be0 -r 09c6c8d2b302 buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py     Wed Sep 08 14:26:23 2010 +0200
+++ b/buildtools/autogen/autogen/codegen.py     Wed Sep 08 17:45:44 2010 +0200
@@ -197,7 +197,7 @@
     buf = src.read()
     src.close()
     buf2 = ""
-    if code_extract.has_key(fext):
+    if ext != 'mx' and code_extract.has_key(fext):
         epat = end_code_extract[fext]
         for pat,newext in code_extract[fext]:
             if newext == "." + ext:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list