Changeset: 2210c505cd4b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2210c505cd4b Modified Files: clients/perl/DBD/Changes clients/perl/MonetDB-CLI-MapiLib/Changes clients/perl/MonetDB-CLI-MapiLib/MANIFEST clients/perl/MonetDB-CLI-MapiLib/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiLib/Makefile.PL clients/perl/MonetDB-CLI-MapiLib/MapiLib.pm clients/perl/MonetDB-CLI-MapiLib/README clients/perl/MonetDB-CLI-MapiLib/t/00use.t clients/perl/MonetDB-CLI-MapiLib/t/02cxn.t clients/perl/MonetDB-CLI-MapiLib/t/75mil.t clients/perl/MonetDB-CLI-MapiPP/Changes clients/perl/MonetDB-CLI-MapiPP/MANIFEST clients/perl/MonetDB-CLI-MapiPP/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiPP/Makefile.PL clients/perl/MonetDB-CLI-MapiPP/MapiPP.pm clients/perl/MonetDB-CLI-MapiPP/README clients/perl/MonetDB-CLI-MapiPP/t/00use.t clients/perl/MonetDB-CLI-MapiPP/t/02cxn.t clients/perl/MonetDB-CLI-MapiPP/t/75mil.t clients/perl/MonetDB-CLI-MapiXS/Changes clients/perl/MonetDB-CLI/CLI.pm clients/perl/MonetDB-CLI/Changes clients/perl/MonetDB-CLI/MANIFEST clients/perl/MonetDB-CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI/Makefile.PL clients/perl/MonetDB-CLI/README clients/perl/MonetDB-CLI/t/00use.t clients/perl/MonetDB-CLI/t/02cxn.t clients/perl/MonetDB-CLI/t/75mil.t configure.ag debian/monetdb5-server.install monetdb5/mal/mal_linker.mx Branch: default Log Message:
Merged from Mar2011 diffs (truncated from 446 to 300 lines): diff --git a/clients/perl/DBD/Changes b/clients/perl/DBD/Changes deleted file mode 100644 --- a/clients/perl/DBD/Changes +++ /dev/null @@ -1,3 +0,0 @@ -Please visit the CVS repository at SourceForge: - - http://monetdb.cvs.sourceforge.net/monetdb/MonetDB/src/mapi/clients/perl/DBD/ diff --git a/clients/perl/MonetDB-CLI-MapiLib/Changes b/clients/perl/MonetDB-CLI-MapiLib/Changes deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiLib/Changes +++ /dev/null @@ -1,3 +0,0 @@ -Please visit the CVS repository at SourceForge: - - http://monetdb.cvs.sourceforge.net/monetdb/MonetDB/src/mapi/clients/perl/MonetDB-CLI-MapiLib/ diff --git a/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag b/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag --- a/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag +++ b/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag @@ -15,10 +15,4 @@ # Copyright August 2008-2011 MonetDB B.V. # All Rights Reserved. -MTSAFE - -headers_perl = { - HEADERS = pm - DIR = $(prefix)/$(PERL_LIBDIR)/MonetDB/CLI - SOURCES = MapiLib.pm -} +SUBDIRS = MonetDB diff --git a/clients/perl/MonetDB-CLI-MapiLib/MANIFEST b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST rename from clients/perl/MonetDB-CLI-MapiLib/MANIFEST rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST diff --git a/clients/perl/MonetDB-CLI-MapiLib/MANIFEST.SKIP b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP rename from clients/perl/MonetDB-CLI-MapiLib/MANIFEST.SKIP rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP --- a/clients/perl/MonetDB-CLI-MapiLib/MANIFEST.SKIP +++ b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP @@ -4,4 +4,3 @@ ^pm_to_blib$ \.properties$ ^blib/ -\bCVS\b diff --git a/clients/perl/MonetDB-CLI-MapiLib/Makefile.PL b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL rename from clients/perl/MonetDB-CLI-MapiLib/Makefile.PL rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL diff --git a/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.ag copy from clients/perl/MonetDB-CLI-MapiLib/Makefile.ag copy to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.ag diff --git a/clients/perl/MonetDB-CLI-MapiLib/MapiLib.pm b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MapiLib.pm rename from clients/perl/MonetDB-CLI-MapiLib/MapiLib.pm rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MapiLib.pm diff --git a/clients/perl/MonetDB-CLI-MapiLib/README b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/README rename from clients/perl/MonetDB-CLI-MapiLib/README rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/README diff --git a/clients/perl/MonetDB-CLI-MapiLib/t/00use.t b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/00use.t rename from clients/perl/MonetDB-CLI-MapiLib/t/00use.t rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/00use.t diff --git a/clients/perl/MonetDB-CLI-MapiLib/t/02cxn.t b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/02cxn.t rename from clients/perl/MonetDB-CLI-MapiLib/t/02cxn.t rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/02cxn.t diff --git a/clients/perl/MonetDB-CLI-MapiLib/t/75mil.t b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/75mil.t rename from clients/perl/MonetDB-CLI-MapiLib/t/75mil.t rename to clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/75mil.t diff --git a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/Makefile.ag b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/Makefile.ag new file mode 100644 --- /dev/null +++ b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/Makefile.ag @@ -0,0 +1,18 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2011 MonetDB B.V. +# All Rights Reserved. + +SUBDIRS = CLI diff --git a/clients/perl/MonetDB-CLI-MapiPP/Changes b/clients/perl/MonetDB-CLI-MapiPP/Changes deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiPP/Changes +++ /dev/null @@ -1,3 +0,0 @@ -Please visit the CVS repository at SourceForge: - - http://monetdb.cvs.sourceforge.net/monetdb/MonetDB/src/mapi/clients/perl/MonetDB-CLI-MapiPP/ diff --git a/clients/perl/MonetDB-CLI-MapiPP/Makefile.ag b/clients/perl/MonetDB-CLI-MapiPP/Makefile.ag --- a/clients/perl/MonetDB-CLI-MapiPP/Makefile.ag +++ b/clients/perl/MonetDB-CLI-MapiPP/Makefile.ag @@ -15,10 +15,4 @@ # Copyright August 2008-2011 MonetDB B.V. # All Rights Reserved. -MTSAFE - -headers_perl = { - HEADERS = pm - DIR = $(prefix)/$(PERL_LIBDIR)/MonetDB/CLI - SOURCES = MapiPP.pm -} +SUBDIRS = MonetDB diff --git a/clients/perl/MonetDB-CLI-MapiPP/MANIFEST b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST rename from clients/perl/MonetDB-CLI-MapiPP/MANIFEST rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST diff --git a/clients/perl/MonetDB-CLI-MapiPP/MANIFEST.SKIP b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP rename from clients/perl/MonetDB-CLI-MapiPP/MANIFEST.SKIP rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP --- a/clients/perl/MonetDB-CLI-MapiPP/MANIFEST.SKIP +++ b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP @@ -4,4 +4,3 @@ ^pm_to_blib$ \.properties$ ^blib/ -\bCVS\b diff --git a/clients/perl/MonetDB-CLI-MapiPP/Makefile.PL b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.PL rename from clients/perl/MonetDB-CLI-MapiPP/Makefile.PL rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.PL diff --git a/clients/perl/MonetDB-CLI-MapiPP/Makefile.ag b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.ag copy from clients/perl/MonetDB-CLI-MapiPP/Makefile.ag copy to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.ag diff --git a/clients/perl/MonetDB-CLI-MapiPP/MapiPP.pm b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm rename from clients/perl/MonetDB-CLI-MapiPP/MapiPP.pm rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm diff --git a/clients/perl/MonetDB-CLI-MapiPP/README b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README rename from clients/perl/MonetDB-CLI-MapiPP/README rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README diff --git a/clients/perl/MonetDB-CLI-MapiPP/t/00use.t b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/00use.t rename from clients/perl/MonetDB-CLI-MapiPP/t/00use.t rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/00use.t diff --git a/clients/perl/MonetDB-CLI-MapiPP/t/02cxn.t b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/02cxn.t rename from clients/perl/MonetDB-CLI-MapiPP/t/02cxn.t rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/02cxn.t diff --git a/clients/perl/MonetDB-CLI-MapiPP/t/75mil.t b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/75mil.t rename from clients/perl/MonetDB-CLI-MapiPP/t/75mil.t rename to clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/75mil.t diff --git a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag new file mode 100644 --- /dev/null +++ b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag @@ -0,0 +1,18 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2011 MonetDB B.V. +# All Rights Reserved. + +SUBDIRS = CLI diff --git a/clients/perl/MonetDB-CLI-MapiXS/Changes b/clients/perl/MonetDB-CLI-MapiXS/Changes deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiXS/Changes +++ /dev/null @@ -1,3 +0,0 @@ -Please visit the CVS repository at SourceForge: - - http://monetdb.cvs.sourceforge.net/monetdb/MonetDB/src/mapi/clients/perl/MonetDB-CLI-MapiXS/ diff --git a/clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP b/clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP --- a/clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP +++ b/clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP @@ -4,4 +4,3 @@ ^pm_to_blib$ \.properties$ ^blib/ -\bCVS\b diff --git a/clients/perl/MonetDB-CLI/Changes b/clients/perl/MonetDB-CLI/Changes deleted file mode 100644 --- a/clients/perl/MonetDB-CLI/Changes +++ /dev/null @@ -1,3 +0,0 @@ -Please visit the CVS repository at SourceForge: - - http://monetdb.cvs.sourceforge.net/monetdb/MonetDB/src/mapi/clients/perl/MonetDB-CLI/ diff --git a/clients/perl/MonetDB-CLI/Makefile.ag b/clients/perl/MonetDB-CLI/Makefile.ag --- a/clients/perl/MonetDB-CLI/Makefile.ag +++ b/clients/perl/MonetDB-CLI/Makefile.ag @@ -15,10 +15,4 @@ # Copyright August 2008-2011 MonetDB B.V. # All Rights Reserved. -MTSAFE - -headers_perl = { - HEADERS = pm - DIR = $(prefix)/$(PERL_LIBDIR)/MonetDB - SOURCES = CLI.pm -} +SUBDIRS = MonetDB diff --git a/clients/perl/MonetDB-CLI/CLI.pm b/clients/perl/MonetDB-CLI/MonetDB/CLI.pm rename from clients/perl/MonetDB-CLI/CLI.pm rename to clients/perl/MonetDB-CLI/MonetDB/CLI.pm diff --git a/clients/perl/MonetDB-CLI/MANIFEST b/clients/perl/MonetDB-CLI/MonetDB/MANIFEST rename from clients/perl/MonetDB-CLI/MANIFEST rename to clients/perl/MonetDB-CLI/MonetDB/MANIFEST diff --git a/clients/perl/MonetDB-CLI/MANIFEST.SKIP b/clients/perl/MonetDB-CLI/MonetDB/MANIFEST.SKIP rename from clients/perl/MonetDB-CLI/MANIFEST.SKIP rename to clients/perl/MonetDB-CLI/MonetDB/MANIFEST.SKIP --- a/clients/perl/MonetDB-CLI/MANIFEST.SKIP +++ b/clients/perl/MonetDB-CLI/MonetDB/MANIFEST.SKIP @@ -4,4 +4,3 @@ ^pm_to_blib$ \.properties$ ^blib/ -\bCVS\b diff --git a/clients/perl/MonetDB-CLI/Makefile.PL b/clients/perl/MonetDB-CLI/MonetDB/Makefile.PL rename from clients/perl/MonetDB-CLI/Makefile.PL rename to clients/perl/MonetDB-CLI/MonetDB/Makefile.PL diff --git a/clients/perl/MonetDB-CLI/Makefile.ag b/clients/perl/MonetDB-CLI/MonetDB/Makefile.ag copy from clients/perl/MonetDB-CLI/Makefile.ag copy to clients/perl/MonetDB-CLI/MonetDB/Makefile.ag diff --git a/clients/perl/MonetDB-CLI/README b/clients/perl/MonetDB-CLI/MonetDB/README rename from clients/perl/MonetDB-CLI/README rename to clients/perl/MonetDB-CLI/MonetDB/README diff --git a/clients/perl/MonetDB-CLI/t/00use.t b/clients/perl/MonetDB-CLI/MonetDB/t/00use.t rename from clients/perl/MonetDB-CLI/t/00use.t rename to clients/perl/MonetDB-CLI/MonetDB/t/00use.t diff --git a/clients/perl/MonetDB-CLI/t/02cxn.t b/clients/perl/MonetDB-CLI/MonetDB/t/02cxn.t rename from clients/perl/MonetDB-CLI/t/02cxn.t rename to clients/perl/MonetDB-CLI/MonetDB/t/02cxn.t diff --git a/clients/perl/MonetDB-CLI/t/75mil.t b/clients/perl/MonetDB-CLI/MonetDB/t/75mil.t rename from clients/perl/MonetDB-CLI/t/75mil.t rename to clients/perl/MonetDB-CLI/MonetDB/t/75mil.t diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -404,12 +404,14 @@ [use 32 bits for OIDs on a 64-bit architecture]), enable_oid32=$enableval, enable_oid32=no) +AC_MSG_CHECKING(size of OIDs) case $bits-$enable_oid32 in 64-yes) AC_DEFINE(MONET_OID32, 1, [Define if the oid type should use 32 bits on a 64-bit architecture]) oids=32 ;; esac AC_SUBST(oids) +AC_MSG_RESULT($bits bits) AC_C_BIGENDIAN() @@ -2407,7 +2409,7 @@ fi if test "x$have_geos" != xno; then GEOS_INCS="`$GEOS_CONFIG --cflags`" - GEOS_LIBS="`$GEOS_CONFIG --ldflags`" + GEOS_LIBS="`$GEOS_CONFIG --libs | sed 's:geos:geos_c:'`" fi if test "x$have_geos" = xno; then if test "x$enable_geom" = xyes; then @@ -3246,3 +3248,6 @@ echo $ECHO_N " $comp is $ECHO_C" eval "if test \"x\$enable_$comp\" = xno ; then echo \"${ECHO_T}disabled\"; else echo \"${ECHO_T}enabled\"; fi" done +echo +echo "* Important options:" +echo " OID size: " ${bits} bits diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install --- a/debian/monetdb5-server.install +++ b/debian/monetdb5-server.install @@ -59,7 +59,6 @@ debian/tmp/usr/lib/monetdb5/profiler.mal usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/recycle.mal usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/remote.mal usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/replication.mal usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/run_*.mal usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/sabaoth.mal usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/sema.mal usr/lib/monetdb5 diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx --- a/monetdb5/mal/mal_instruction.mx +++ b/monetdb5/mal/mal_instruction.mx @@ -2344,31 +2344,29 @@ str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base, size_t len) { - int i, closing=0, margin = 2 * PATHLENGTH; + int i, closing = 0; str tpe; - if (p->retc > 1){ + if (p->retc > 1) { *s++ = '('; - *s=0; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
