Changeset: b4f21e435a83 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4f21e435a83
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/exports.stable.out
configure.ag
debian/rules
geom/RunMtest.bat.in
geom/RunMtest.in
java/build.xml
sql/RunMtest.bat.in
sql/RunMtest.in
Branch: Jul2012
Log Message:
backout commit 03b12e1f3b57, it included unexpected changes
diffs (188 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -583,6 +583,7 @@ developer, but if you do want to test, t
--enable-assert=no \
--enable-bits=%{bits} \
--enable-console=yes \
+ --enable-crackers=no \
--enable-datacell=no \
--enable-debug=no \
--enable-developer=no \
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4657,6 +4657,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE011B8A794D4FD9B01C9F53B7BEA736"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\opt_joinselect.mal"
+ "TargetName" = "8:opt_joinselect.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE3A46CB8049461DBE1B9679A0EA00A6"
{
"SourcePath" = "8:lib\\monetdb5\\parts.sql"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -3537,6 +3537,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_940272B052F94B0796FF71C95F5AAE34"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\opt_joinselect.mal"
+ "TargetName" = "8:opt_joinselect.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_95017BEFC85A4CD395F10E3F4C324982"
{
"SourcePath" = "8:lib\\monetdb5\\opt_remoteQueries.mal"
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2235,6 +2235,7 @@ str OPThistory(Client cntxt, MalBlkPtr m
str OPTinline(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTisAlias(InstrPtr p);
str OPTjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str OPTjoinselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTlegAdvice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int OPTlegAdviceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str OPTmacro(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -165,6 +165,13 @@ AC_ARG_ENABLE(rdf,
enable_rdf=$enableval,
enable_rdf=$dft_rdf)
+dft_crackers=no
+AC_ARG_ENABLE(crackers,
+ AS_HELP_STRING([--enable-crackers],
+ [enable database cracking components [experimental/unsupported]
(default=no)]),
+ enable_crackers=$enableval,
+ enable_crackers=$dft_crackers)
+
dft_datacell=no
AC_ARG_ENABLE(datacell,
AS_HELP_STRING([--enable-datacell],
@@ -2020,6 +2027,8 @@ if test "x$enable_rdf" != xno; then
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
+AM_CONDITIONAL(ENABLE_CRACKERS, test x"$enable_crackers" != xno)
+
AM_CONDITIONAL(ENABLE_DATACELL, test x"$enable_datacell" != xno)
PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
@@ -3069,6 +3078,7 @@ for comp in \
geom \
fits \
rdf \
+ crackers \
datacell \
odbc \
jdbc \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ include /usr/share/cdbs/1/class/autotool
DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-assert=no \
--enable-console=yes \
+ --enable-crackers=no \
--enable-datacell=no \
--enable-debug=no \
--enable-developer=no \
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -46,6 +46,7 @@ set PATH=%buildbase%\monetdb5\tools;%PAT
rem modules (lib_*.dll and *.mal)
set MOD_PATH=%buildbase%\geom\monetdb5
set MOD_PATH=%buildbase%\monetdb5\extras\compiler;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\extras\crackers;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\atoms;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\kernel;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\mal;%MOD_PATH%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -58,7 +58,7 @@ mkdir -p ${buildbase}/geom/monetdb5/crea
cp ${srcdir}/geom/sql/[0-9][0-9]_*.sql ${buildbase}/geom/monetdb5/createdb
2>/dev/null
# where compiled monetdb5 modules are to be found
-for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/compiler
+for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/compiler
do
[ -d "${buildbase}/monetdb5/$d/.libs" ] &&
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -236,8 +236,9 @@ All Rights Reserved.
</target>
<!--
- This generates MonetDriver.java from its ".java.in" equivalents. It's
- required for importing the driver version properties.
+ This generates MonetDriver.java and MonetDBDatabase.java from their
+ ".java.in" equivalents. It's required for importing the driver
+ version properties.
-->
<target name="driver" depends="prepare" unless="uptodate.drivers">
<tstamp>
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -43,6 +43,7 @@ set PATH=%buildbase%\monetdb5\tools;%PAT
rem modules (lib_*.dll and *.mal)
set MOD_PATH=%buildbase%\geom\monetdb5
set MOD_PATH=%buildbase%\monetdb5\extras\compiler;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\extras\crackers;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\atoms;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\kernel;%MOD_PATH%
set MOD_PATH=%buildbase%\monetdb5\modules\mal;%MOD_PATH%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -58,7 +58,7 @@ mkdir -p ${buildbase}/geom/monetdb5/crea
cp ${srcdir}/geom/sql/[0-9][0-9]_*.sql ${buildbase}/geom/monetdb5/createdb
2>/dev/null
# where compiled monetdb5 modules are to be found
-for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/compiler
+for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/compiler
do
[ -d "${buildbase}/monetdb5/$d/.libs" ] &&
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
