MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 2818e3626e7a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2818e3626e7a
Modified Files:
        geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
        geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
        testing/Mfilter.py.in
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (36 lines):

diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err 
b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
@@ -12,7 +12,7 @@ stderr of test 'X_crash.SF-1971632` in d
 # 11:50:18 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30029 
 # 11:50:18 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-21750/.s.monetdb.30182
+MAPI  = (monetdb) /var/tmp/mtest-17297/.s.monetdb.35706
 QUERY = select X(g) from geoms;
 ERROR = !GEOSGeom_getCoordSeq failed
         !Geometry must be a Point or LineString
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err 
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,7 +10,7 @@ stderr of test 'copy_into_crash.SF-19754
 # 11:37:42 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423 
 # 11:37:42 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-21750/.s.monetdb.30182
+MAPI  = (monetdb) /var/tmp/mtest-17297/.s.monetdb.35706
 QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
         45111956, 'POINT(52.0697 4.3723)'
         
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -48,7 +48,7 @@ test = (
         # potential differences, which we want to ignore
         re.compile('(?:'+')|(?:'.join([
                 # MAPI port numbers
-                    r"^MAPI  = 
(.*@.*:\d*|\((monetdb|testuser|(monet|user)_test|my_user2)\) 
/.*\.s\.monetdb\.\d+)$",
+                    r"^MAPI  = 
(.*@.*:\d*|\((monetdb|testuser|(monet|user)_test|my_user2|psm)\) 
/.*\.s\.monetdb\.\d+)$",
                 # SPHINX is optional in monetdb5/modules/mal/inspec05
                     
r'\[\s+"[^"]*",\s+"(?:command|function|pattern)",\s+"sphinx",\s+"[^"]*",\s+"[^"]*"\s+\]',
                  ])+')',  re.MULTILINE),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list