Changeset: 1101f2d06bb6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1101f2d06bb6
Modified Files:
configure.ag
monetdb5/extras/crackers/crackers_sortmerge.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1411 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -46,8 +46,7 @@
recommended for SQL.
sql
- The SQL server built on top of (targeted on) either MonetDB4
- or MonetDB5.
+ The SQL front-end built on top of MonetDB5.
Prerequisites
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -337,9 +337,6 @@
/* Define to 1 if you have the <perfmon/pfmlib.h> header file. */
/* #undef HAVE_PERFMON_PFMLIB_H */
-/* Define if you want TIJAH */
-#define HAVE_PFTIJAH 1
-
/* Define to 1 if you have the `pipe' function. */
#define HAVE_PIPE 1
#ifdef pipe
@@ -656,12 +653,6 @@
/* where Merovingian will store its logs by default */
/* #undef MERO_LOG */
-/* MonetDB4 config file location */
-#define MONETDB4_CONFFILE "@QXsysconfdir@@[email protected]"
-
-/* MonetDB5 config file location */
-#define MONETDB5_CONFFILE "@QXsysconfdir@@[email protected]"
-
/* The used password hash algorithm */
#define MONETDB5_PASSWDHASH "SHA512"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -261,9 +261,6 @@
!IFDEF HAVE_JAVAJDBC
HAVE_JAVAJDBC_FALSE=^#
!ENDIF
-!IFDEF HAVE_JAVAXRPC
-HAVE_JAVAXRPC_FALSE=^#
-!ENDIF
!IFDEF HAVE_LIBBZ2
HAVE_LIBBZ2_FALSE=^#
!ENDIF
@@ -317,7 +314,6 @@
"DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)" \
"HAVE_CFITSIO_FALSE=$(HAVE_CFITSIO_FALSE)" \
"HAVE_JAVAJDBC_FALSE=$(HAVE_JAVAJDBC_FALSE)" \
- "HAVE_JAVAXRPC_FALSE=$(HAVE_JAVAXRPC_FALSE)" \
"HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)" \
"HAVE_LIBBZ2_FALSE=$(HAVE_LIBBZ2_FALSE)" \
"HAVE_LIBXML2_FALSE=$(HAVE_LIBXML2_FALSE)" \
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -109,24 +109,18 @@
mv MonetDB-$SSB-SuperBall.tar.* $OLDPWD
- Build Windows installers, making sure they are all compiled with the
- correct compiler and options:
+ correct compiler, i.e., Microsoft Visual Studio 8, and options:
- + MonetDB5/SQL (MonetDB, clients, MonetDB5, sql, geom) using
- Microsoft Visual Studio 8;
- + MonetDB4/XQuery (MonetDB, clients, MonetDB4, pathfinder) using
- Intel C++ 10.1.022.
+ Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1
+ HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PHP=1 HAVE_PCRE=1
+ HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1
+ HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
- In both cases, use these ``nmake`` options for a 32 bit compile:
- ``NDEBUG=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_JAVAXRPC=1 HAVE_PYTHON=1
- HAVE_PHP=1 HAVE_PCRE=1 HAVE_MONETDB4=1 HAVE_MONETDB5=1
+ Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
+ HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1
HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1 HAVE_LIBXML2=1
HAVE_MONETDB5_XML=1``
- Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
- HAVE_MONETDB4=1 HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1
- HAVE_JAVAXRPC=1 HAVE_PYTHON=1 HAVE_PCRE=1 HAVE_PERL=1
- HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
-
- Create PGP signatures and SHA1 checksums::
rpm --addsign --define '_gpg_name 0x3DFA3C42' *.rpm
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -72,15 +72,6 @@
Ruby modules can be built separately; the PHP module does not need to
be built. This component is required.
-monetdb4
---------
-
-The deprecated (but still used) database server MonetDB4 Server. This
-component is still required for the MonetDB XQuery (pathfinder)
-component. This is the old server which uses MIL (the MonetDB
-Interface Language) as programming interface. This component is only
-required if you need MIL or if you need the MonetDB XQuery component.
-
monetdb5
--------
@@ -101,19 +92,11 @@
The geom component provides a module for the MonetDB SQL frontend.
This component is optional.
-pathfinder
-----------
-
-Also known as MonetDB XQuery, this component provides an XQuery query
-engine on top of a relational database. You can store XML documents
-in the database and query these documents using XQuery. This
-component is required if you need XML/XQuery support.
-
java
----
-Also known as MonetDB Java, this component provides both the MonetDB
-JDBC driver and the XRPC wrapper. This component is optional.
+Also known as MonetDB Java, this component provides the MonetDB JDBC
+driver. This component is optional.
testing
-------
@@ -170,10 +153,6 @@
- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers);
- Intel(R) C++ Compiler 11.1 (which also needs one of the Microsoft compilers).
-Note that the pathfinder component can currently not be compiled with
-any of the Microsoft compilers. It can be compiled with the Intel
-compiler.
-
Not supported anymore (but probably still possible) are the GNU C
Compiler gcc under Cygwin__. Using that, it (probably still) is
possible to build a version that runs using the Cygwin DLLs, but also
@@ -321,9 +300,6 @@
Libxml2__ is the XML C parser and toolkit of Gnome.
-This library is only a prerequisite for the pathfinder component,
-although the MonetDB5 component can also make use of it.
-
The home of the library is http://xmlsoft.org/. But Windows binaries
can be gotten from http://www.zlatkovic.com/libxml.en.html. Click on
Win32 Binaries on the right, and download libxml2, iconv, and zlib.
@@ -601,8 +577,7 @@
If you want to build the java component of the MonetDB suite, you need
Java__. Get Java from http://java.sun.com/, but make sure you do
*not* get the latest version. Get the Java Development Kit 1.5. Our
-current JDBC driver is not compatible with Java 1.6 yet, and the XRPC
-wrapper is not compatible with Java 1.4 or older.
+current JDBC driver is not compatible with Java 1.6 yet.
In addition to the Java Development Kit, you will also need `Apache Ant`_
which is responsible for the actual building of the driver.
@@ -743,7 +718,7 @@
set Path=C:\Program Files\PCRE\bin;%Path%
rem PHP binary
set Path=C:\Program Files\PHP;%Path%
- rem assuming we're testing MonetDB5 or SQL, else used MonetDB4:
+ rem assuming we're testing MonetDB5 or SQL:
set Path=%PREFIX%\lib\MonetDB5;%Path%
set Path=%PREFIX%\bin;%PREFIX%\lib;%Path%
rem Python module search path
@@ -770,11 +745,9 @@
- ``DEBUG=1`` - compile with extra debugging information
- ``NDEBUG=1`` - compile without extra debugging information (this is
used for creating a binary release);
-- ``HAVE_MONETDB4=1`` - include the MonetDB4 component;
- ``HAVE_MONETDB5=1`` - include the MonetDB5 component;
- ``HAVE_SQL=1`` - include the sql component;
- ``HAVE_GEOM=1`` - include the geom component;
-- ``HAVE_PATHFINDER=1`` - include the pathfinder component;
- ``HAVE_JAVA=1`` - include the java component (only use if Java and
Apache Ant are both available);
- ``HAVE_TESTING=1`` - include the testing component;
@@ -789,9 +762,7 @@
and libraries are available--also need ``HAVE_PERL=1``);
- ``HAVE_PERL_SWIG=1`` - Perl development is possible and SWIG is
available (also need ``HAVE_PERL=1``);
-- ``HAVE_PHP=1`` - PHP is available;
-- ``HAVE_PROBXML=1`` - compile in support for probabilistic XML (an
- experimental extension to the pathfinder component).
+- ``HAVE_PHP=1`` - PHP is available.
In addition, you can add a parameter which points to a file with extra
definitions for ``nmake``. This is very convenient to define where
@@ -819,13 +790,12 @@
Installers can be built either using the full-blown Visual Studio user
interface or on the command line. To use the user interface, open one
-or more of the files ``MonetDB4-XQuery-Installer.sln``,
-``MonetDB5-SQL-Installer.sln``, ``MonetDB-ODBC-Driver.sln``, and
-``MonetDB5-Geom-Module.sln`` in the installation folder and select
-``Build`` -> ``Build Solution``. To use the command line, execute one
-or more of the commands in the installation folder::
+or more of the files ``MonetDB5-SQL-Installer.sln``,
+``MonetDB-ODBC-Driver.sln``, and ``MonetDB5-Geom-Module.sln`` in the
+installation folder and select ``Build`` -> ``Build Solution``. To use
+the command line, execute one or more of the commands in the
+installation folder::
- devenv MonetDB4-XQuery-Installer.sln /build
devenv MonetDB5-SQL-Installer.sln /build
devenv MonetDB-ODBC-Driver.sln /build
devenv MonetDB5-Geom-Module.sln /build
diff --git a/clients/ChangeLog.Apr2011 b/clients/ChangeLog.Apr2011
--- a/clients/ChangeLog.Apr2011
+++ b/clients/ChangeLog.Apr2011
@@ -1,6 +1,10 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Apr 5 2011 Fabian Groffen <[email protected]>
+- Plugged a small memory leak occurring upon redirects by the server
+ (e.g. via monetdbd)
+
* Mon Feb 7 2011 Fabian Groffen <[email protected]>
- Remove XQuery related code from Ruby adapter, PHP driver and Perl Mapi
library
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2839,7 +2839,6 @@
mapi_close_handle(hdl);
/* free all redirects */
fr = mid->redirects;
- mid->redirects[0] = NULL;
while (*fr != NULL) {
free(*fr);
*fr = NULL;
@@ -2855,7 +2854,6 @@
mid->redircnt++;
/* free all redirects */
fr = mid->redirects;
- mid->redirects[0] = NULL;
while (*fr != NULL) {
free(*fr);
*fr = NULL;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -233,15 +233,6 @@
*) enable_jdbc=no;;
esac
- AC_ARG_ENABLE(xrpcwrapper,
- AS_HELP_STRING([--enable-xrpcwrapper], [build the MonetDB XRPC
wrapper]),
- enable_xrpc="$enableval",
- enable_xrpc=auto)
- case $enable_xrpc in
- yes|auto) enable_xrpc=$enable_xrpc;;
- *) enable_xrpc=no;;
- esac
-
AC_ARG_ENABLE(merocontrol,
AS_HELP_STRING([--enable-merocontrol], [build the Merovingian
control driver]),
enable_control="$enableval",
@@ -252,7 +243,6 @@
esac
else
enable_jdbc=no
- enable_xrpc=no
enable_control=no
fi
@@ -473,18 +463,14 @@
dnl switches that disable selected warnings that haven't been sorted out,
dnl yet, we set X_CFLAGS, which are added to the standard
dnl CFLAGS once configure/autoconf are done with their job,
-dnl i.e., at the end of the configure.m4 file that includes this monet.m4.
+dnl i.e., at the end of this configure[.ag] script.
dnl Only GNU (gcc) and Intel ([ie]cc/[ie]cpc on Linux) are done so far.
: ${X_CFLAGS=} # initialize to empty if not set
-NO_X_CFLAGS='_NO_X_CFLAGS_'
NO_INLINE_CFLAGS=""
GCC_BISON_CFLAGS=""
ICC_BISON_CFLAGS=""
-ICC_BISONFLAGS=""
GCC_SWIG_CFLAGS=""
ICC_SWIG_CFLAGS=""
-SUN_NOERR_CFLAGS=""
-SUN_NOOPT_CFLAGS=""
CFLAGS_NO_OPT="-O0"
if test "x$enable_strict" = xyes; then
case "$GCC-$CC-$host_os" in
@@ -548,17 +534,6 @@
dnl X_CFLAGS="$X_CFLAGS -Wunreachable-code"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
