Changeset: 9ca574e6f9bb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ca574e6f9bb Modified Files: MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit MonetDB5/src/modules/mal/mal_mapi.mx clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora12.64bit clients/conf/Tests/monetdb-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-conds.stable.out.Fedora12.64bit clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora12.32bit clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora12.64bit geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora12.32bit geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora12.64bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora12.32bit pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora12.64bit sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora12.32bit sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora12.64bit sql/src/backends/monet5/merovingian/daemon/proxy.c sql/src/backends/monet5/sql.mx sql/src/backends/monet5/sql_result.mx sql/src/server/rel_bin.c sql/src/server/rel_dump.c sql/src/server/rel_schema.c sql/src/server/rel_select.c sql/src/server/sql_mvc.c sql/src/server/sql_semantic.c sql/src/server/sql_semantic.h sql/src/storage/store.c sql/src/test/BugTracker-2010/Tests/All template/conf/Tests/monetdb-template-conds.stable.out.Fedora12.32bit template/conf/Tests/monetdb-template-conds.stable.out.Fedora12.64bit Branch: default Log Message:
Merge with Oct2010 branch. Hopefully I fixed all conflicts in sql correctly... diffs (truncated from 2525 to 300 lines): diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit --- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit Mon Dec 13 09:07:55 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -stdout of test 'monetdb4-conds` in directory 'conf` itself: - - -# 20:30:38 > -# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds -# 20:30:38 > - - -# 20:30:38 > -# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds -# 20:30:38 > - -BITS32=# -BITS64= -DOCTOOLS=# -HAVE_BUILDTOOLS=# -HAVE_CLIENTS=# -HAVE_EXTRA_MK= -HAVE_MONETDB=# -HAVE_PCRE=# -HAVE_PERL_DEVEL=# -HAVE_PERL=# -HAVE_PERL_SWIG=# -HAVE_PYTHON=# -HAVE_RUBYGEM=# -HAVE_SWIG=# -LINK_STATIC= -NATIVE_WIN32= -NEED_MX=# -NOT_WIN32=# -PROFILING= -CROSS_COMPILING= -HAVE_NETCDF= - -# 20:30:38 > -# 20:30:38 > Done. -# 20:30:38 > - diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit --- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit Mon Dec 13 09:07:55 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -stdout of test 'monetdb4-conds` in directory 'conf` itself: - - -# 20:30:38 > -# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds -# 20:30:38 > - - -# 20:30:38 > -# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds -# 20:30:38 > - -BITS32= -BITS64=# -DOCTOOLS=# -HAVE_BUILDTOOLS=# -HAVE_CLIENTS=# -HAVE_EXTRA_MK= -HAVE_MONETDB=# -HAVE_PCRE=# -HAVE_PERL_DEVEL=# -HAVE_PERL=# -HAVE_PERL_SWIG=# -HAVE_PYTHON=# -HAVE_RUBYGEM=# -HAVE_SWIG=# -LINK_STATIC= -NATIVE_WIN32= -NEED_MX=# -NOT_WIN32=# -PROFILING= -CROSS_COMPILING= -HAVE_NETCDF= - -# 20:30:38 > -# 20:30:38 > Done. -# 20:30:38 > - diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.32bit --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.32bit Mon Dec 13 09:54:53 2010 +0100 @@ -0,0 +1,38 @@ +stdout of test 'monetdb4-conds` in directory 'conf` itself: + + +# 20:30:38 > +# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds +# 20:30:38 > + + +# 20:30:38 > +# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds +# 20:30:38 > + +BITS32=# +BITS64= +DOCTOOLS=# +HAVE_BUILDTOOLS=# +HAVE_CLIENTS=# +HAVE_EXTRA_MK= +HAVE_MONETDB=# +HAVE_PCRE=# +HAVE_PERL_DEVEL=# +HAVE_PERL=# +HAVE_PERL_SWIG=# +HAVE_PYTHON=# +HAVE_RUBYGEM=# +HAVE_SWIG=# +LINK_STATIC= +NATIVE_WIN32= +NEED_MX=# +NOT_WIN32=# +PROFILING= +CROSS_COMPILING= +HAVE_NETCDF= + +# 20:30:38 > +# 20:30:38 > Done. +# 20:30:38 > + diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.64bit --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.64bit Mon Dec 13 09:54:53 2010 +0100 @@ -0,0 +1,38 @@ +stdout of test 'monetdb4-conds` in directory 'conf` itself: + + +# 20:30:38 > +# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds +# 20:30:38 > + + +# 20:30:38 > +# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds +# 20:30:38 > + +BITS32= +BITS64=# +DOCTOOLS=# +HAVE_BUILDTOOLS=# +HAVE_CLIENTS=# +HAVE_EXTRA_MK= +HAVE_MONETDB=# +HAVE_PCRE=# +HAVE_PERL_DEVEL=# +HAVE_PERL=# +HAVE_PERL_SWIG=# +HAVE_PYTHON=# +HAVE_RUBYGEM=# +HAVE_SWIG=# +LINK_STATIC= +NATIVE_WIN32= +NEED_MX=# +NOT_WIN32=# +PROFILING= +CROSS_COMPILING= +HAVE_NETCDF= + +# 20:30:38 > +# 20:30:38 > Done. +# 20:30:38 > + diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit --- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit Mon Dec 13 09:07:55 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -stdout of test 'monetdb5-conds` in directory 'conf` itself: - - -# 20:30:38 > -# 20:30:38 > ./monetdb5-conds.sh monetdb5-conds -# 20:30:38 > - - -# 20:30:38 > -# 20:30:38 > Mtimeout -timeout 60 monetdb5-config --conds -# 20:30:38 > - -BITS32=# -BITS64= -DOCTOOLS=# -HAVE_BUILDTOOLS=# -HAVE_CLIENTS=# -HAVE_EXTRA_MK= -HAVE_MONETDB=# -HAVE_PCRE=# -HAVE_PERL_DEVEL=# -HAVE_PERL=# -HAVE_PERL_SWIG=# -HAVE_PYTHON=# -HAVE_RUBYGEM=# -HAVE_SWIG=# -LINK_STATIC= -NATIVE_WIN32= -NEED_MX=# -NOT_WIN32=# -PROFILING= -HAVE_LIBXML2=# -HAVE_RAPTOR=# - -# 20:30:38 > -# 20:30:38 > Done. -# 20:30:38 > - diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit --- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit Mon Dec 13 09:07:55 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -stdout of test 'monetdb5-conds` in directory 'conf` itself: - - -# 20:30:38 > -# 20:30:38 > ./monetdb5-conds.sh monetdb5-conds -# 20:30:38 > - - -# 20:30:38 > -# 20:30:38 > Mtimeout -timeout 60 monetdb5-config --conds -# 20:30:38 > - -BITS32= -BITS64=# -DOCTOOLS=# -HAVE_BUILDTOOLS=# -HAVE_CLIENTS=# -HAVE_EXTRA_MK= -HAVE_MONETDB=# -HAVE_PCRE=# -HAVE_PERL_DEVEL=# -HAVE_PERL=# -HAVE_PERL_SWIG=# -HAVE_PYTHON=# -HAVE_RUBYGEM=# -HAVE_SWIG=# -LINK_STATIC= -NATIVE_WIN32= -NEED_MX=# -NOT_WIN32=# -PROFILING= -HAVE_LIBXML2=# -HAVE_RAPTOR=# - -# 20:30:38 > -# 20:30:38 > Done. -# 20:30:38 > - diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.32bit --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.32bit Mon Dec 13 09:54:53 2010 +0100 @@ -0,0 +1,38 @@ +stdout of test 'monetdb5-conds` in directory 'conf` itself: + + +# 20:30:38 > +# 20:30:38 > ./monetdb5-conds.sh monetdb5-conds +# 20:30:38 > + + +# 20:30:38 > +# 20:30:38 > Mtimeout -timeout 60 monetdb5-config --conds +# 20:30:38 > + +BITS32=# +BITS64= +DOCTOOLS=# +HAVE_BUILDTOOLS=# +HAVE_CLIENTS=# +HAVE_EXTRA_MK= +HAVE_MONETDB=# +HAVE_PCRE=# +HAVE_PERL_DEVEL=# +HAVE_PERL=# +HAVE_PERL_SWIG=# +HAVE_PYTHON=# +HAVE_RUBYGEM=# +HAVE_SWIG=# +LINK_STATIC= +NATIVE_WIN32= +NEED_MX=# +NOT_WIN32=# +PROFILING= +HAVE_LIBXML2=# +HAVE_RAPTOR=# + +# 20:30:38 > +# 20:30:38 > Done. +# 20:30:38 > + diff -r 809466d117c1 -r 9ca574e6f9bb MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.64bit --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.64bit Mon Dec 13 09:54:53 2010 +0100 @@ -0,0 +1,38 @@ +stdout of test 'monetdb5-conds` in directory 'conf` itself: + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
