Changeset: 20b099b71b81 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20b099b71b81 Modified Files: Branch: sciql Log Message:
Merge with default diffs (truncated from 28807 to 300 lines): diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/mclient--help.stable.err --- a/clients/mapiclient/Tests/mclient--help.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/mclient--help.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'mclient--help` in directory 'src/mapiclient` itself: +stderr of test 'mclient--help` in directory 'mapiclient` itself: # 16:36:12 > diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/mclient--help.stable.out --- a/clients/mapiclient/Tests/mclient--help.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/mclient--help.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'mclient--help` in directory 'src/mapiclient` itself: +stdout of test 'mclient--help` in directory 'mapiclient` itself: # 16:36:12 > diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/msqldump--help.stable.err --- a/clients/mapiclient/Tests/msqldump--help.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/msqldump--help.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'msqldump--help` in directory 'src/mapiclient` itself: +stderr of test 'msqldump--help` in directory 'mapiclient` itself: # 16:36:12 > diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/msqldump--help.stable.out --- a/clients/mapiclient/Tests/msqldump--help.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/msqldump--help.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'msqldump--help` in directory 'src/mapiclient` itself: +stdout of test 'msqldump--help` in directory 'mapiclient` itself: # 16:36:12 > diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/stethoscope--help.stable.err --- a/clients/mapiclient/Tests/stethoscope--help.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/stethoscope--help.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'stethoscope--help` in directory 'src/mapiclient` itself: +stderr of test 'stethoscope--help` in directory 'mapiclient` itself: # 11:43:47 > diff -r acad95626fed -r 20b099b71b81 clients/mapiclient/Tests/stethoscope--help.stable.out --- a/clients/mapiclient/Tests/stethoscope--help.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/clients/mapiclient/Tests/stethoscope--help.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'stethoscope--help` in directory 'src/mapiclient` itself: +stdout of test 'stethoscope--help` in directory 'mapiclient` itself: # 11:43:47 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/basic.stable.err --- a/geom/sql/Tests/basic.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/basic.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'basic` in directory 'src/sql` itself: +stderr of test 'basic` in directory 'sql` itself: # 09:07:40 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/basic.stable.out --- a/geom/sql/Tests/basic.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/basic.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'basic` in directory 'src/sql` itself: +stdout of test 'basic` in directory 'sql` itself: # 20:49:35 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/example.stable.err --- a/geom/sql/Tests/example.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/example.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'example` in directory 'src/sql` itself: +stderr of test 'example` in directory 'sql` itself: # 10:10:09 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/example.stable.out --- a/geom/sql/Tests/example.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/example.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'example` in directory 'src/sql` itself: +stdout of test 'example` in directory 'sql` itself: # 10:10:09 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom.stable.err --- a/geom/sql/Tests/geom.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom` in directory 'src/sql` itself: +stderr of test 'geom` in directory 'sql` itself: # 21:15:12 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom.stable.out --- a/geom/sql/Tests/geom.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom` in directory 'src/sql` itself: +stdout of test 'geom` in directory 'sql` itself: # 21:15:12 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_curve.stable.err --- a/geom/sql/Tests/geom_curve.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_curve.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_curve` in directory 'src/sql` itself: +stderr of test 'geom_curve` in directory 'sql` itself: # 21:15:14 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_curve.stable.out --- a/geom/sql/Tests/geom_curve.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_curve.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_curve` in directory 'src/sql` itself: +stdout of test 'geom_curve` in directory 'sql` itself: # 20:50:33 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_geometry.stable.err --- a/geom/sql/Tests/geom_geometry.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_geometry.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_geometry` in directory 'src/sql` itself: +stderr of test 'geom_geometry` in directory 'sql` itself: # 21:15:13 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_geometry.stable.out --- a/geom/sql/Tests/geom_geometry.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_geometry.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_geometry` in directory 'src/sql` itself: +stdout of test 'geom_geometry` in directory 'sql` itself: # 20:49:34 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_linestring.stable.err --- a/geom/sql/Tests/geom_linestring.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_linestring.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_linestring` in directory 'src/sql` itself: +stderr of test 'geom_linestring` in directory 'sql` itself: # 21:15:14 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_linestring.stable.out --- a/geom/sql/Tests/geom_linestring.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_linestring.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_linestring` in directory 'src/sql` itself: +stdout of test 'geom_linestring` in directory 'sql` itself: # 20:49:34 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_mbr.stable.err --- a/geom/sql/Tests/geom_mbr.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_mbr.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_mbr` in directory 'src/sql` itself: +stderr of test 'geom_mbr` in directory 'sql` itself: # 21:15:16 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_mbr.stable.out --- a/geom/sql/Tests/geom_mbr.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_mbr.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_mbr` in directory 'src/sql` itself: +stdout of test 'geom_mbr` in directory 'sql` itself: # 18:34:07 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_multi.stable.err --- a/geom/sql/Tests/geom_multi.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_multi.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_multi` in directory 'src/sql` itself: +stderr of test 'geom_multi` in directory 'sql` itself: # 13:49:29 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_multi.stable.out --- a/geom/sql/Tests/geom_multi.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_multi.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_multi` in directory 'src/sql` itself: +stdout of test 'geom_multi` in directory 'sql` itself: # 18:34:06 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_point.stable.err --- a/geom/sql/Tests/geom_point.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_point.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_point` in directory 'src/sql` itself: +stderr of test 'geom_point` in directory 'sql` itself: # 21:15:12 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_point.stable.out --- a/geom/sql/Tests/geom_point.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_point.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_point` in directory 'src/sql` itself: +stdout of test 'geom_point` in directory 'sql` itself: # 20:49:33 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_polygon.stable.err --- a/geom/sql/Tests/geom_polygon.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_polygon.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_polygon` in directory 'src/sql` itself: +stderr of test 'geom_polygon` in directory 'sql` itself: # 21:15:16 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_polygon.stable.out --- a/geom/sql/Tests/geom_polygon.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_polygon.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_polygon` in directory 'src/sql` itself: +stdout of test 'geom_polygon` in directory 'sql` itself: # 20:49:34 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_surface.stable.err --- a/geom/sql/Tests/geom_surface.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_surface.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'geom_surface` in directory 'src/sql` itself: +stderr of test 'geom_surface` in directory 'sql` itself: # 21:15:15 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/geom_surface.stable.out --- a/geom/sql/Tests/geom_surface.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/geom_surface.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'geom_surface` in directory 'src/sql` itself: +stdout of test 'geom_surface` in directory 'sql` itself: # 20:49:34 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/relation.stable.err --- a/geom/sql/Tests/relation.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/relation.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'relation` in directory 'src/sql` itself: +stderr of test 'relation` in directory 'sql` itself: # 22:42:46 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/relation.stable.out --- a/geom/sql/Tests/relation.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/relation.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'relation` in directory 'src/sql` itself: +stdout of test 'relation` in directory 'sql` itself: # 22:42:46 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/spatial.stable.err --- a/geom/sql/Tests/spatial.stable.err Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/spatial.stable.err Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stderr of test 'spatial` in directory 'src/sql` itself: +stderr of test 'spatial` in directory 'sql` itself: # 22:58:03 > diff -r acad95626fed -r 20b099b71b81 geom/sql/Tests/spatial.stable.out --- a/geom/sql/Tests/spatial.stable.out Sun Jan 16 01:31:32 2011 +0100 +++ b/geom/sql/Tests/spatial.stable.out Sun Jan 16 14:12:02 2011 +0100 @@ -1,4 +1,4 @@ -stdout of test 'spatial` in directory 'src/sql` itself: +stdout of test 'spatial` in directory 'sql` itself: # 20:49:36 > diff -r acad95626fed -r 20b099b71b81 monetdb4/conf/MonetDB.conf.in --- a/monetdb4/conf/MonetDB.conf.in Sun Jan 16 01:31:32 2011 +0100 +++ b/monetdb4/conf/MonetDB.conf.in Sun Jan 16 14:12:02 2011 +0100 @@ -24,7 +24,7 @@ # ----------------------------------------------------------- # # Please keep the comments below aligned with the defaults in # -# MonetDB/src/common/monet_options.mx # +# common/options/monet_options.mx # # ----------------------------------------------------------- # # Where MonetDB is installed _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
