Changeset: f47a1ec07769 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f47a1ec07769
Modified Files:
MonetDB/conf/monetdb-config.bat.in
MonetDB/conf/monetdb-config.in
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.32bit
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.64bit
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.32bit
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.64bit
MonetDB5/src/optimizer/opt_support.mx
clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora14.32bit
clients/conf/Tests/monetdb-clients-conds.stable.out.Fedora14.64bit
clients/conf/Tests/monetdb-conds.stable.out.Fedora14.32bit
clients/conf/Tests/monetdb-conds.stable.out.Fedora14.64bit
clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora14.32bit
clients/conf/Tests/monetdb-testing-conds.stable.out.Fedora14.64bit
geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora14.32bit
geom/conf/Tests/monetdb-geom-conds.stable.out.Fedora14.64bit
pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora14.32bit
pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Fedora14.64bit
sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora14.32bit
sql/conf/Tests/monetdb-sql-conds.stable.out.Fedora14.64bit
sql/configure.ag
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_scenario.mx
sql/src/common/sql_backend.c
sql/src/common/sql_backend.h
sql/src/server/rel_select.c
sql/src/server/rel_updates.c
sql/src/server/sql_psm.c
sql/src/test/BugTracker-2010/Tests/All
template/conf/Tests/monetdb-template-conds.stable.out.Fedora14.32bit
template/conf/Tests/monetdb-template-conds.stable.out.Fedora14.64bit
Branch: default
Log Message:
Merged from Oct2010, hopefully I did the merge correctly
diffs (truncated from 2281 to 300 lines):
diff -r 8a201f0b70a1 -r f47a1ec07769 MonetDB/conf/monetdb-config.bat.in
--- a/MonetDB/conf/monetdb-config.bat.in Mon Dec 13 17:09:38 2010 +0100
+++ b/MonetDB/conf/monetdb-config.bat.in Tue Dec 14 13:04:25 2010 +0100
@@ -59,7 +59,6 @@
:conds
echo bits...@bits32_false@
echo bits...@bits64_false@
- echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
echo have_libb...@have_libbz2_false@
diff -r 8a201f0b70a1 -r f47a1ec07769 MonetDB/conf/monetdb-config.in
--- a/MonetDB/conf/monetdb-config.in Mon Dec 13 17:09:38 2010 +0100
+++ b/MonetDB/conf/monetdb-config.in Tue Dec 14 13:04:25 2010 +0100
@@ -131,7 +131,6 @@
--conds)
echo bits...@bits32_false@
echo bits...@bits64_false@
- echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_extra_...@have_extra_mk_false@
echo have_libb...@have_libbz2_false@
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.32bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.32bit Mon Dec 13
17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.32bit Tue Dec 14
13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=#
BITS64=
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit Mon Dec 13
17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit Tue Dec 14
13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit.STATIC
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit.STATIC Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.64bit.STATIC Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Darwin.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Darwin.64bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Darwin.64bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.32bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.32bit Mon Dec
13 17:09:38 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 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora14.64bit Mon Dec
13 17:09:38 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 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.RedHat4WS.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.RedHat4WS.64bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.RedHat4WS.64bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.32bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.32bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.32bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=#
BITS64=
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.64bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.SunOS5.11.64bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.32bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.32bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.32bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=#
BITS64=
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.64bit
--- a/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.64bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Windows.64bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769 MonetDB4/conf/monetdb4-config.bat.in
--- a/MonetDB4/conf/monetdb4-config.bat.in Mon Dec 13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/monetdb4-config.bat.in Tue Dec 14 13:04:25 2010 +0100
@@ -59,7 +59,6 @@
:conds
echo bits...@bits32_false@
echo bits...@bits64_false@
- echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_clien...@have_clients_false@
echo have_extra_...@have_extra_mk_false@
diff -r 8a201f0b70a1 -r f47a1ec07769 MonetDB4/conf/monetdb4-config.in
--- a/MonetDB4/conf/monetdb4-config.in Mon Dec 13 17:09:38 2010 +0100
+++ b/MonetDB4/conf/monetdb4-config.in Tue Dec 14 13:04:25 2010 +0100
@@ -146,7 +146,6 @@
--conds)
echo bits...@bits32_false@
echo bits...@bits64_false@
- echo doctoo...@doctools_false@
echo have_buildtoo...@have_buildtools_false@
echo have_clien...@have_clients_false@
echo have_extra_...@have_extra_mk_false@
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB5/conf/Tests/monetdb5-conds.stable.out.32bit
--- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.32bit Mon Dec 13
17:09:38 2010 +0100
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.32bit Tue Dec 14
13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=#
BITS64=
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB5/conf/Tests/monetdb5-conds.stable.out.64bit
--- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.64bit Mon Dec 13
17:09:38 2010 +0100
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.64bit Tue Dec 14
13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Darwin.64bit
--- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Darwin.64bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Darwin.64bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=
BITS64=#
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Debian4.0.32bit
--- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Debian4.0.32bit Mon Dec
13 17:09:38 2010 +0100
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Debian4.0.32bit Tue Dec
14 13:04:25 2010 +0100
@@ -12,7 +12,6 @@
BITS32=#
BITS64=
-DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
HAVE_EXTRA_MK=
diff -r 8a201f0b70a1 -r f47a1ec07769
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.32bit
--- a/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora14.32bit Mon Dec
13 17:09:38 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=#
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
