Changeset: 7bf3ec35f08a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7bf3ec35f08a
Modified Files:
debian/libpf-ferry0.install
monetdb5/optimizer/Tests/dataflow4.stable.err
monetdb5/optimizer/Tests/dataflow4.stable.out
sql/backends/monet5/Makefile.ag
Branch: sciql
Log Message:
merged with default
diffs (truncated from 2622 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -239,8 +239,6 @@
%files client-perl
%defattr(-,root,root)
%{_prefix}/%{perl_libdir}/*
-%dir %{_datadir}/monetdb/perl
-%{_datadir}/monetdb/perl/*
%package client-ruby
Summary: MonetDB ruby interface
@@ -384,7 +382,6 @@
%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
-%exclude %{_libdir}/monetdb5/sql_bpm.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
@@ -536,19 +533,43 @@
%build
%{configure} \
- --enable-strict=no \
--enable-assert=no \
+ --enable-bits=%{bits} \
+ --enable-console=yes \
+ --enable-crackers=no \
+ --enable-datacell=no \
--enable-debug=no \
- --enable-optimize=yes \
- --enable-bits=%{bits} \
+ --enable-developer=no \
+ --enable-fits=no \
+ --enable-gdk=yes \
+ --enable-geom=%{?centos:no}%{!?centos:yes} \
+ --enable-instrument=no \
--enable-jdbc=no \
--enable-merocontrol=no \
+ --enable-monetdb5=yes \
+ --enable-noexpand=no \
+ --enable-odbc=yes \
+ --enable-oid32=%{?oid32:yes}%{!?oid32:no} \
+ --enable-optimize=yes \
+ --enable-profile=no \
--enable-rdf=no \
- --enable-fits=no \
+ --enable-sql=yes \
+ --enable-strict=no \
+ --enable-testing=yes \
+ --with-ant=no \
+ --with-bz2=yes \
+ --with-geos=%{?centos:no}%{!?centos:yes} \
+ --with-hwcounters=no \
+ --with-java=no \
+ --with-mseed=no \
+ --with-perl=yes \
+ --with-pthread=yes \
+ --with-python=yes \
+ --with-readline=yes \
+ --with-rubygem=yes \
+ --with-sphinxclient=no \
+ --with-unixodbc=yes \
--with-valgrind=no \
- --with-mseed=no \
- --with-geos=%{?centos:no}%{!?centos:yes}
- %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"}
make
diff --git a/buildtools/Mx/MxFcnDef.h b/buildtools/Mx/MxFcnDef.h
--- a/buildtools/Mx/MxFcnDef.h
+++ b/buildtools/Mx/MxFcnDef.h
@@ -150,7 +150,7 @@
extern void ofile_printf(_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 1, 2)));
extern void Fatal(const char *, _In_z_ _Printf_format_string_ const char *,
...)
- __attribute__((__format__(__printf__, 2, 3)));
+ __attribute__((__format__(__printf__, 2, 3), __noreturn__));
extern void Error(_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 1, 2)));
extern void Message(_In_z_ _Printf_format_string_ const char *, ...)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2350,6 +2350,9 @@
return errseen;
}
+static void usage(const char *prog, int xit)
+ __attribute__((__noreturn__));
+
static void
usage(const char *prog, int xit)
{
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -98,6 +98,8 @@
char buf[8096];
size_t len;
fd_set fds;
+ char seeneof = 0;
+ char seenflush = 0;
static struct option long_options[8] = {
{ "listen", 0, 0, 'l' },
@@ -269,16 +271,30 @@
if ((len = mnstr_read(in, buf, 1, sizeof(buf))) != 0) {
if (!write(1, buf, len))
exit(2);
+ seenflush = 0;
} else {
- /* EOF */
- break;
+ /* flush or error */
+ if (!seenflush) {
+ seenflush = 1;
+ } else {
+ break;
+ }
}
}
if (FD_ISSET(0, &fds)) {
if ((len = read(0, buf, sizeof(buf))) != 0) {
mnstr_write(out, buf, len, 1);
+ seeneof = 0;
+ } else if (len == 0) {
+ /* EOF */
+ if (!seeneof) {
+ mnstr_flush(out);
+ seeneof = 1;
+ } else {
+ break;
+ }
} else {
- /* EOF */
+ /* error */
break;
}
}
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -50,6 +50,9 @@
#include "msqldump.h"
#include "mprompt.h"
+static void usage(const char *prog, int xit)
+ __attribute__((__noreturn__));
+
static void
usage(const char *prog, int xit)
{
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1854,12 +1854,17 @@
struct icstream *ic = (struct icstream *) s->stream_data.p;
ICONV_CONST char *inbuf = (ICONV_CONST char *) buf;
size_t inbytesleft = elmsize * cnt;
+ char *bf = NULL;
/* if unconverted data from a previous call remains, add it to
the start of the new data, using temporary space */
if (ic->buflen > 0) {
- char *bf = alloca(ic->buflen + inbytesleft);
-
+ bf = malloc(ic->buflen + inbytesleft);
+ if (bf == NULL) {
+ /* cannot allocate memory */
+ s->errnr = MNSTR_WRITE_ERROR;
+ return -1;
+ }
memcpy(bf, ic->buffer, ic->buflen);
memcpy(bf + ic->buflen, buf, inbytesleft);
buf = bf;
@@ -1875,6 +1880,8 @@
case EILSEQ:
/* invalid multibyte sequence encountered */
s->errnr = MNSTR_WRITE_ERROR;
+ if (bf)
+ free(bf);
return -1;
case EINVAL:
/* incomplete multibyte sequence encountered */
@@ -1885,10 +1892,14 @@
if (inbytesleft > sizeof(ic->buffer)) {
/* ridiculously long multibyte
sequence, so return error */
s->errnr = MNSTR_WRITE_ERROR;
+ if (bf)
+ free(bf);
return -1;
}
memcpy(ic->buffer, inbuf, inbytesleft);
ic->buflen = inbytesleft;
+ if (bf)
+ free(bf);
return (ssize_t) cnt;
case E2BIG:
/* not enough space in output buffer */
@@ -1896,11 +1907,15 @@
default:
/* cannot happen (according to manual) */
s->errnr = MNSTR_WRITE_ERROR;
+ if (bf)
+ free(bf);
return -1;
}
}
mnstr_write(ic->s, ic->buffer, 1, sizeof(ic->buffer) -
outbytesleft);
}
+ if (bf)
+ free(bf);
return (ssize_t) cnt;
}
diff --git a/debian/libpf-ferry0.install b/debian/libpf-ferry0.install
deleted file mode 100644
--- a/debian/libpf-ferry0.install
+++ /dev/null
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/libpf_ferry.so.* usr/lib
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,9 +1,8 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
-debian/tmp/usr/lib/monetdb5/autoload/70_vault.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/lib_crackers.so usr/lib/monetdb5
+
debian/tmp/usr/lib/monetdb5/lib_mal_compiler.so usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
+
debian/tmp/usr/lib/monetdb5/aggr.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/alarm.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/algebra.mal usr/lib/monetdb5
@@ -32,11 +31,9 @@
debian/tmp/usr/lib/monetdb5/const.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/constraints.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/counters.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/crackers.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/factories.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/group.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/groupby.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/histogram.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/identifier.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/inet.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/inspect.mal usr/lib/monetdb5
@@ -74,6 +71,5 @@
debian/tmp/usr/lib/monetdb5/unix.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/url.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/urlbox.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/vault.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/xml.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/zorder.mal usr/lib/monetdb5
diff --git a/debian/monetdb5-server.manpages b/debian/monetdb5-server.manpages
new file mode 100644
--- /dev/null
+++ b/debian/monetdb5-server.manpages
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/man/man1/mserver5.1
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -2,7 +2,7 @@
debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/*_sql.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/sql*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/createdb/10_math.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/11_times.sql usr/lib/monetdb5/createdb
@@ -21,4 +21,3 @@
debian/tmp/usr/lib/monetdb5/createdb/24_zorder.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/25_debug.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/99_system.sql usr/lib/monetdb5/createdb
-debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
diff --git a/debian/perl-monetdb-client.install
b/debian/perl-monetdb-client.install
--- a/debian/perl-monetdb-client.install
+++ b/debian/perl-monetdb-client.install
@@ -1,2 +1,1 @@
-debian/tmp/usr/share/monetdb/perl/* usr/share/monetdb/perl
debian/tmp/usr/lib/perl5/* usr/lib/perl5
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,42 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict=no --enable-assert=no
--enable-debug=no --enable-optimize=yes --enable-java=no --enable-rdf=no
--enable-fits=no --with-valgrind=no --with-mseed=no
--with-rubygem-dir=lib/ruby/gems/1.8
+DEB_CONFIGURE_EXTRA_FLAGS := \
+ --enable-assert=no \
+ --enable-console=yes \
+ --enable-crackers=no \
+ --enable-datacell=no \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
