Changeset: e052f866bf82 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e052f866bf82 Modified Files: geom/src/sql/Tests/spatial.stable.out.32bit Branch: default Log Message:
merge?? diffs (truncated from 1805 to 300 lines): diff -r eb6067006d6a -r e052f866bf82 .hgeol --- a/.hgeol Wed Jun 23 10:48:38 2010 +0200 +++ b/.hgeol Mon Jun 28 06:03:22 2010 +0200 @@ -7,6 +7,7 @@ # various binary files **.bmp = BIN **.bz2 = BIN +**.chm = BIN **.dll = BIN **.gif = BIN **.gz = BIN @@ -16,11 +17,5 @@ **.png = BIN **.zip = BIN -# Windows specific files -**.chm = BIN -**.rtf = CRLF -**.sln = CRLF -**.vdproj = CRLF - # all the rest is text ** = native diff -r eb6067006d6a -r e052f866bf82 .hgtags --- a/.hgtags Wed Jun 23 10:48:38 2010 +0200 +++ b/.hgtags Mon Jun 28 06:03:22 2010 +0200 @@ -406,3 +406,5 @@ e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 diff -r eb6067006d6a -r e052f866bf82 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB/MonetDB.spec Mon Jun 28 06:03:22 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: zlib-devel, bzip2-devel, openssl-devel @@ -106,6 +106,9 @@ %{_libdir}/libbat.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618 - Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB/debian/changelog Mon Jun 28 06:03:22 2010 +0200 @@ -1,3 +1,9 @@ +monetdb (1.38.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb (1.38.1-20100618) unstable; urgency=low * Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Mon Jun 28 06:03:22 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): shadow-utils @@ -216,6 +216,9 @@ %{_libdir}/libembeddedmil.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100618 - Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/debian/changelog Mon Jun 28 06:03:22 2010 +0200 @@ -1,3 +1,9 @@ +monetdb4-server (4.38.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb4-server (4.38.1-20100618) unstable; urgency=low * Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB4/debian/monetdb4-server.postinst --- a/MonetDB4/debian/monetdb4-server.postinst Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/debian/monetdb4-server.postinst Mon Jun 28 06:03:22 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb > /dev/null; then - adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb + adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB4 chown monetdb:monetdb /var/MonetDB4 diff -r eb6067006d6a -r e052f866bf82 MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.milS --- a/MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.milS Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.milS Mon Jun 28 06:03:22 2010 +0200 @@ -1,11 +1,13 @@ var x := new(void, int); -x.bbpname().print(); +var nx := x.bbpname(); x.rename("A"); x.bbpname().print(); x.info().find("batId").print(); # A var y := x.reverse(); -y.bbpname().print(); -y.info().find("batId").print(); # A +var ny := y.bbpname(); +if (nx.substring(4) != ny.substring(5)) print("names don't match"); +var iy := y.info().find("batId"); +if (ny != iy) print("names don't match"); y.rename("B"); y.bbpname().print(); y.info().find("batId").print(); # B diff -r eb6067006d6a -r e052f866bf82 MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.stable.out --- a/MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.stable.out Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/tests/BugTracker/Tests/names_of_reversed_BATs.SF-1964658.stable.out Mon Jun 28 06:03:22 2010 +0200 @@ -12,18 +12,17 @@ # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs; dynamically linked. # Visit http://monetdb.cwi.nl/ for further information. var x := new(void, int); -x.bbpname().print(); -[ "tmp_64" ] +var nx := x.bbpname(); x.rename("A"); x.bbpname().print(); [ "A" ] x.info().find("batId").print(); # A [ "A" ] var y := x.reverse(); -y.bbpname().print(); -[ "tmpr_64" ] -y.info().find("batId").print(); # A -[ "tmpr_64" ] +var ny := y.bbpname(); +if (nx.substring(4) != ny.substring(5)) print("names don't match"); +var iy := y.info().find("batId"); +if (ny != iy) print("names don't match"); y.rename("B"); y.bbpname().print(); [ "B" ] diff -r eb6067006d6a -r e052f866bf82 MonetDB4/tests/from_Twente/moa/Tests/list.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Mon Jun 28 06:03:22 2010 +0200 @@ -2207,9 +2207,9 @@ # t h # name # oid void # type #-----------------# -[ 4...@0, 1...@0 ] +[ 4...@0, 0...@0 ] _MMjoin_20.find(1...@0).print(); -[ 50 ] +[ 30 ] reverse(select(reverse(_MMcastnil_16),3...@0)).print(); #-------------------------# # BAT: tmp_197 # @@ -2220,9 +2220,9 @@ # t h # name # oid void # type #-----------------# -[ 2...@0, 0...@0 ] +[ 2...@0, 1...@0 ] _MMjoin_20.find(0...@0).print(); -[ 30 ] +[ 50 ] # [{ 50 }, {}, { 30 }] _MMreverse_2 := reverse(indexA); diff -r eb6067006d6a -r e052f866bf82 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010 Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010 Mon Jun 28 06:03:22 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Jun 23 2010 Sjoerd Mullender <sjo...@acm.org> +- When libxml2 is available, the XML module is automatically loaded. + diff -r eb6067006d6a -r e052f866bf82 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Mon Jun 28 06:03:22 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}} @@ -213,6 +213,9 @@ %{_libdir}/*.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100618 - Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB5/configure.ag --- a/MonetDB5/configure.ag Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/configure.ag Mon Jun 28 06:03:22 2010 +0200 @@ -332,8 +332,10 @@ AC_PATH_PROG(CFITSIO_CONFIG,pkg-config,,$XPATH) if test "x$CFITSIO_CONFIG" != x; then - CFITSIO_CFLAGS="`$CFITSIO_CONFIG cfitsio --cflags`" - CFITSIO_LIBS="`$CFITSIO_CONFIG cfitsio --libs`" + if `$CFITSIO_CONFIG --exists cfitsio` ; then + CFITSIO_CFLAGS="`$CFITSIO_CONFIG cfitsio --cflags`" + CFITSIO_LIBS="`$CFITSIO_CONFIG cfitsio --libs`" + fi else case "$have_cfitsio" in auto|yes) diff -r eb6067006d6a -r e052f866bf82 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/debian/changelog Mon Jun 28 06:03:22 2010 +0200 @@ -1,3 +1,9 @@ +monetdb5-server (5.20.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb5-server (5.20.1-20100618) unstable; urgency=low * Rebuilt. diff -r eb6067006d6a -r e052f866bf82 MonetDB5/debian/control --- a/MonetDB5/debian/control Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/debian/control Mon Jun 28 06:03:22 2010 +0200 @@ -3,8 +3,8 @@ Priority: extra Maintainer: MonetDB BV <mo...@cwi.nl> Build-Depends: debhelper (>= 5), autotools-dev, libpcre3-dev, libssl-dev, libraptor1-dev, libxml2-dev, libmonetdb-dev, libmonetdb-client-dev, cdbs +Standards-Version: 3.8.0 -Standards-Version: 3.8.0 Package: monetdb5-server Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb5-server5, adduser diff -r eb6067006d6a -r e052f866bf82 MonetDB5/debian/libmonetdb5-server5.install --- a/MonetDB5/debian/libmonetdb5-server5.install Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/debian/libmonetdb5-server5.install Mon Jun 28 06:03:22 2010 +0200 @@ -1,3 +1,4 @@ debian/tmp/usr/lib/lib*.so.* usr/lib debian/tmp/usr/lib/MonetDB5/lib/lib*.so* usr/lib/MonetDB5/lib debian/tmp/usr/lib/MonetDB5/*.mal usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/autoload/*.mal usr/lib/MonetDB5/autoload diff -r eb6067006d6a -r e052f866bf82 MonetDB5/debian/monetdb5-server.postinst --- a/MonetDB5/debian/monetdb5-server.postinst Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/debian/monetdb5-server.postinst Mon Jun 28 06:03:22 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb > /dev/null; then - adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb + adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB5 chown monetdb:monetdb /var/MonetDB5 diff -r eb6067006d6a -r e052f866bf82 MonetDB5/src/mal/Tests/pithole.stable.out --- a/MonetDB5/src/mal/Tests/pithole.stable.out Wed Jun 23 10:48:38 2010 +0200 +++ b/MonetDB5/src/mal/Tests/pithole.stable.out Mon Jun 28 06:03:22 2010 +0200 @@ -16,7 +16,7 @@ #challenge the runtime stack protection user.main(); end main; -!MALException:mal.interpreter:Recursive call limit reached. +!MALException:mal.interpreter:Running out of stack space. # 14:45:52 > # 14:45:52 > Done. diff -r eb6067006d6a -r e052f866bf82 MonetDB5/src/mal/Tests/tst450.stable.out.Windows --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Mon Jun 28 06:03:22 2010 +0200 @@ -0,0 +1,539 @@ +stdout of test 'tst450` in directory 'src/mal` itself: + _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
