Changeset: 5d43d6bdd31e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d43d6bdd31e
Modified Files:
buildtools/conf/mock/fedora-13-i386-monetdb.cfg
buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg
buildtools/conf/mock/fedora-14-i386-monetdb.cfg
buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg
buildtools/conf/mock/logging.ini
buildtools/conf/mock/site-defaults.cfg
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
gdk/gdk.h
Branch: headless
Log Message:
Merge with default
diffs (truncated from 5871 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -434,3 +434,4 @@
491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1
be8749b7640878f829575ef9daa995810d6fe25d Oct2010_3
3dc7b6687e454fc31ce9d3887aa01e457de4e9f2 Mar2011_root
+e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,7 +1,6 @@
%define name MonetDB
%define version 11.2.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
-%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
# groups of related archs
%define all_x86 i386 i586 i686
@@ -12,6 +11,13 @@
%define bits 64
%endif
+# only add .oidXX suffix if oid size differs from bit size
+%if %{bits} == 64 && %{?oid32:1}%{!?oid32:0}
+%define oidsuf .oid32
+%endif
+
+%define release %{buildno}%{?dist}%{?oidsuf:.oidsuf}
+
Name: %{name}
Version: %{version}
Release: %{release}
@@ -21,11 +27,11 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source:
http://dev.monetdb.org/downloads/sources/Oct2010/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Mar2011/%{name}-%{version}.tar.gz
BuildRequires: bison
BuildRequires: bzip2-devel
-BuildRequires: cfitsio-devel
+# BuildRequires: cfitsio-devel
BuildRequires: flex
BuildRequires: geos-devel >= 2.2.0
BuildRequires: libcurl-devel
@@ -376,7 +382,7 @@
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/sql_bpm.mal
%{_libdir}/monetdb5/*.mal
-%{_libdir}/monetdb5/autoload/*_fits.mal
+# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
%exclude %{_libdir}/monetdb5/lib_geom.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
@@ -527,6 +533,7 @@
--enable-bits=%{bits} \
--enable-java=no \
--enable-rdf=no \
+ --enable-fits=no \
--with-valgrind=no \
--with-mseed=no \
%{?oid32:--enable-oid32} \
@@ -567,6 +574,76 @@
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Mar 17 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317
+- Rebuilt.
+
+* Tue Mar 15 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- geom: Set endianness for wkb en/decoding.
+
+* Sat Mar 05 2011 Stefan de Konink <[email protected]> - 11.1.1-20110317
+- monetdb5: sphinx module: update, adding limit/max_results support
+
+* Mon Feb 14 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317
+- clients: Fixed bug 2677: SQL_DESC_OCTET_LENGTH should give the size in bytes
+ required to copy the data.
+
+* Mon Jan 24 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Disable timer functionality for non-XQuery languages since it is
+ incorrect, bug #2705
+
+* Mon Jan 24 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- sql: Fix bug #2648, do not allow restarting a sequence with NULL via the
+ result of a sub-query.
+
+* Fri Jan 14 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- gdk: MonetDB/src/gdk was moved to gdk
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Added mapi_get_uri function to retrieve mapi URI for the connection
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- merovingian: Allow use of globs with all commands that accept database names
as
+ their parameters
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- java: PreparedStatements now free the server-side resources attached to them
+ when closed. This implements bug #2720
+
+* Tue Jan 4 2011 Niels Nes <[email protected]> - 11.1.1-20110317
+- sql: Allow clients to release prepared handles using Xrelease commands
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Allow to dump table data using INSERT INTO statements, rather than
COPY
+ INTO + CSV data using the -N/--inserts flag of mclient and msqldump.
+ Bug #2727
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Added support for \dn to list schemas or describe a specific one
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Added support for \df to list functions or describe a specific one
+- clients: Added support for \ds to list sequences or describe a specific one
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: Added support for wildcards * and ? in object names given to \d
+ commands, such that pattern matching is possible, e.g. \d my*
+- clients: Added support for \dS that lists also system tables
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- clients: object names given to \d are now lowercased, unless quoted by either
+ single or double quotes
+- clients: Strip any trailing whitespace with the \d command
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- merovingian: merovingian has been renamed into monetdbd. Internally,
monetdbd keeps
+ referring to merovingian for e.g. settings and logfiles. Merovingian
+ has been renamed to make the process more recognisable as part of the
+ MonetDB suite.
+
+* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
+- monetdb5: Improve the performance of remote.put for BAT arguments. The put
+ speed is now roughly equal to the speed of get on a BAT.
+
* Tue Jan 4 2011 Sjoerd Mullender <[email protected]> - 11.0.0-0
- Created top-level bootstrap/configure/make with new version numbers.
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -70,7 +70,6 @@
break;
case Cdef:
case Csrc:
- case CCsrc:
case Clex:
case Cyacc:
case Prolog:
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -295,7 +295,6 @@
case Pimpl:
case Cdef:
case Csrc:
- case CCsrc:
case Cyacc:
case Clex:
case Prolog:
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -164,9 +164,6 @@
case Pspec:
PrCodeDisplay(d, "spec");
break;
- case CCsrc:
- PrCodeDisplay(d, "cc");
- break;
case Csrc:
PrCodeDisplay(d, "c");
break;
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -66,13 +66,12 @@
Message("\t-T <string>\tDefine default hide text <string>");
Message("\t-l\t\tNo #line and alike statements");
Message("\t-n\t\tNon changed files won't be touched");
- Message("\t-+\t\tTreat @c (C code) as @C (C++ code)");
}
int
main(int argc, char **argv)
{
- int i, k;
+ int i;
if (argc == 1) {
usage();
@@ -83,7 +82,7 @@
/* Preprocess the arguments.
*/
- while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln+")) != EOF) {
+ while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln")) != EOF) {
switch (i) {
case 'i':
textmode = M_TEXI;
@@ -131,13 +130,6 @@
case 'n':
notouch = 1;
break;
- case '+':
- k = 0;
- do {
- if (str2dir[k].code == Csrc)
- str2dir[k].ext = MX_CXX_SUFFIX;
- } while (str2dir[k++].code != Nop);
- break;
default:
Error("Unknown flag:%c", i);
usage();
@@ -183,7 +175,6 @@
{"+", Section, "",},
{"-", Subsection, "",},
{".", Paragraph, "",},
- {"C", CCsrc, MX_CXX_SUFFIX,},
{"i", Pimpl, "impl",},
{"s", Pspec, "spec",},
{"h", Cdef, "h",},
@@ -251,7 +242,6 @@
};
static struct comments comments[] = {
- { CCsrc, NULL, "//", NULL},
{ Cdef, "/*", " *", " */"},
{ Csrc, "/*", " *", " */"},
{ Cyacc, "/*", " *", " */"},
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -67,7 +67,7 @@
Bfile, Efile, Ofile, Mxmacro, Ifdef, Ifndef, Endif,
Title, Author, Version, Date, InHide, OutHide, Comment,
Module, Section, Subsection, Paragraph, Qcode, Continue,
- Pspec, Pimpl, Cdef, Csrc, CCsrc, ODLspec, SQL,
+ Pspec, Pimpl, Cdef, Csrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, MALcode,
Qnap, HTML, Java,
ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
diff --git a/buildtools/Mx/disclaimer.c b/buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c
+++ b/buildtools/Mx/disclaimer.c
@@ -133,15 +133,13 @@
const char *comment_prefix;
const char *comment_end;
} suffixes[] = {
- {
- "c", "/*", " * ", " */",}, {
- "h", "/*", " * ", " */",}, {
- MX_CXX_SUFFIX, "/*", " * ", " */",}, {
- "html", "<!--", "", " -->",}, {
- "tex", "", "% ", "",}, {
- "mal", "", "# ", "",}, {
- "mx", "", "@' ", ""}, {
- 0, 0, 0, 0}, /* sentinel */
+ {"c", "/*", " * ", " */",},
+ {"h", "/*", " * ", " */",},
+ {"html", "<!--", "", " -->",},
+ {"tex", "", "% ", "",},
+ {"mal", "", "# ", "",},
+ {"mx", "", "@' ", ""},
+ {0, 0, 0, 0}, /* sentinel */
};
#define DISC_SUFFIXES (sizeof(suffixes)/sizeof(siffixes[0]))
diff --git a/buildtools/conf/Makefile.ag b/buildtools/conf/Makefile.ag
--- a/buildtools/conf/Makefile.ag
+++ b/buildtools/conf/Makefile.ag
@@ -51,5 +51,3 @@
}
EXTRA_DIST = rules.mk
-
-EXTRA_DIST_DIR = mock
diff --git a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg
b/buildtools/conf/mock/fedora-13-i386-monetdb.cfg
deleted file mode 100644
--- a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-config_opts['root'] = 'fedora-13-i386'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
