Changeset: 1680743af067 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1680743af067
Modified Files:
MonetDB5/src/optimizer/opt_mitosis.mx
clients/debian/python-monetdb-client.install
pathfinder/debian/libpf_ferry0.install
sql/src/backends/monet5/merovingian/control.c
sql/src/backends/monet5/merovingian/control.h
sql/src/backends/monet5/merovingian/database.c
sql/src/backends/monet5/merovingian/database.h
sql/src/backends/monet5/merovingian/glob.c
sql/src/backends/monet5/merovingian/glob.h
sql/src/backends/monet5/merovingian/merovingian.1.in
sql/src/backends/monet5/merovingian/merovingian.c
sql/src/backends/monet5/merovingian/merovingian_client.c
sql/src/backends/monet5/merovingian/merovingian_connections.c
sql/src/backends/monet5/merovingian/merovingian_controlrunner.c
sql/src/backends/monet5/merovingian/merovingian_discoveryrunner.c
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
sql/src/backends/monet5/merovingian/merovingian_handlers.c
sql/src/backends/monet5/merovingian/merovingian_proxy.c
sql/src/backends/monet5/merovingian/monetdb.1.in
sql/src/backends/monet5/merovingian/monetdb.c
sql/src/backends/monet5/merovingian/properties.c
sql/src/backends/monet5/merovingian/properties.h
sql/src/backends/monet5/merovingian/utils.c
sql/src/backends/monet5/merovingian/utils.h
sql/src/common/sql_backend.mx
sql/src/common/sql_changeset.mx
sql/src/common/sql_keyword.mx
sql/src/common/sql_list.mx
sql/src/common/sql_mem.mx
sql/src/common/sql_string.mx
sql/src/common/sql_types.mx
sql/src/server/bin_optimizer.mx
sql/src/server/rel_bin.mx
sql/src/server/rel_dump.mx
sql/src/server/rel_exp.mx
sql/src/server/rel_optimizer.mx
sql/src/server/rel_prop.mx
sql/src/server/rel_schema.mx
sql/src/server/rel_select.mx
sql/src/server/rel_semantic.mx
sql/src/server/rel_sequence.mx
sql/src/server/rel_subquery.mx
sql/src/server/rel_trans.mx
sql/src/server/rel_updates.mx
sql/src/server/rel_xml.mx
sql/src/server/sql_atom.mx
sql/src/server/sql_datetime.mx
sql/src/server/sql_decimal.mx
sql/src/server/sql_env.mx
sql/src/server/sql_mvc.mx
sql/src/server/sql_privileges.mx
sql/src/server/sql_psm.mx
sql/src/server/sql_qc.mx
sql/src/server/sql_rel2bin.mx
sql/src/server/sql_scan.mx
sql/src/server/sql_schema.mx
sql/src/server/sql_semantic.mx
sql/src/server/sql_statement.mx
sql/src/server/sql_symbol.mx
sql/src/storage/bat/bat_logger.mx
sql/src/storage/bat/bat_storage.mx
sql/src/storage/bat/bat_table.mx
sql/src/storage/bat/bat_utils.mx
sql/src/storage/bat/res_table.mx
sql/src/storage/bpm/bpm_distribution.mx
sql/src/storage/bpm/bpm_logger.mx
sql/src/storage/bpm/bpm_storage.mx
sql/src/storage/bpm/bpm_table.mx
sql/src/storage/m4/bpm.mx
sql/src/storage/restrict/restrict_logger.mx
sql/src/storage/restrict/restrict_storage.mx
sql/src/storage/restrict/restrict_table.mx
sql/src/storage/sql_catalog.mx
sql/src/storage/store.mx
sql/src/storage/store_connections.mx
sql/src/storage/store_dependency.mx
sql/src/storage/store_sequence.mx
Branch: sciql
Log Message:
merged
diffs (truncated from 63124 to 300 lines):
diff -r 86d353e114bf -r 1680743af067 .hgtags
--- a/.hgtags Mon Nov 22 23:38:49 2010 +0100
+++ b/.hgtags Tue Nov 23 00:14:15 2010 +0100
@@ -428,3 +428,7 @@
ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
+5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
+49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1
+49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1
+491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1
diff -r 86d353e114bf -r 1680743af067 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Nov 22 23:38:49 2010 +0100
+++ b/MonetDB/MonetDB.spec Tue Nov 23 00:14:15 2010 +0100
@@ -110,6 +110,12 @@
%{_libdir}/libbat.so
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110
+- Rebuilt.
+
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101105
- Rebuilt.
diff -r 86d353e114bf -r 1680743af067 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Nov 22 23:38:49 2010 +0100
+++ b/MonetDB/debian/changelog Tue Nov 23 00:14:15 2010 +0100
@@ -1,3 +1,15 @@
+monetdb (1.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:03 +0100
+
+monetdb (1.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:16 +0100
+
monetdb (1.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 86d353e114bf -r 1680743af067 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx Mon Nov 22 23:38:49 2010 +0100
+++ b/MonetDB/src/common/stream.mx Tue Nov 23 00:14:15 2010 +0100
@@ -275,10 +275,10 @@
typedef enum mnstr_errors {
- NO__ERROR = 0,
- OPEN_ERROR,
- READ_ERROR,
- WRITE_ERROR
+ MNSTR_NO__ERROR = 0,
+ MNSTR_OPEN_ERROR,
+ MNSTR_READ_ERROR,
+ MNSTR_WRITE_ERROR
} mnstr_errors;
#endif /*_STREAM_H_*/
@@ -591,7 +591,7 @@
mnstr_errnr(stream *s)
{
if (s == 0)
- return READ_ERROR;
+ return MNSTR_READ_ERROR;
return s->errnr;
}
@@ -599,7 +599,7 @@
mnstr_clearerr(stream *s)
{
if (s != NULL)
- s->errnr = NO__ERROR;
+ s->errnr = MNSTR_NO__ERROR;
}
int
@@ -649,7 +649,7 @@
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
s->read(s, (void *) &s->byteorder, sizeof(s->byteorder), 1);
return s;
}
@@ -662,7 +662,7 @@
#endif
assert(s->access == ST_WRITE);
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
s->write(s, (void *) &s->byteorder, sizeof(s->byteorder), 1);
return s;
}
@@ -689,13 +689,13 @@
char buf[BUFSIZ];
switch (s->errnr) {
- case OPEN_ERROR:
+ case MNSTR_OPEN_ERROR:
snprintf(buf, BUFSIZ, "error could not open file %s\n",
s->name);
return strdup(buf);
- case READ_ERROR:
+ case MNSTR_READ_ERROR:
snprintf(buf, BUFSIZ, "error reading file %s\n", s->name);
return strdup(buf);
- case WRITE_ERROR:
+ case MNSTR_WRITE_ERROR:
snprintf(buf, BUFSIZ, "error writing file %s\n", s->name);
return strdup(buf);
}
@@ -714,7 +714,7 @@
s->type = ST_ASCII;
s->name = strdup(name);
s->stream_data.p = NULL;
- s->errnr = NO__ERROR;
+ s->errnr = MNSTR_NO__ERROR;
s->stream_data.p = NULL;
s->read = NULL;
s->readline = NULL;
@@ -744,7 +744,7 @@
if (!feof(fp)) {
rc = fread(buf, elmsize, cnt, fp);
if (ferror(fp))
- s->errnr = READ_ERROR;
+ s->errnr = MNSTR_READ_ERROR;
}
return (ssize_t) rc;
}
@@ -756,7 +756,7 @@
size_t rc = fwrite(buf, elmsize, cnt, (FILE *)
s->stream_data.p);
if (rc < cnt)
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return (ssize_t) rc;
}
return (ssize_t) cnt;
@@ -785,7 +785,7 @@
FILE *fp = (FILE *) s->stream_data.p;
if (s->access == ST_WRITE && fflush(fp) < 0) {
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return 1;
}
return 0;
@@ -810,7 +810,7 @@
#endif
#endif
) {
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return 1;
}
return 0;
@@ -874,7 +874,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = fopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = file_read;
s->readline = NULL;
s->write = file_write;
@@ -955,7 +955,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = gzopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = stream_gzread;
s->write = stream_gzwrite;
s->close = stream_gzclose;
@@ -972,10 +972,10 @@
if ((s = open_gzstream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
gzread((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
stream_gzclose(s);
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
return s;
}
@@ -989,7 +989,7 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
gzwrite((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder));
return s;
}
@@ -1082,7 +1082,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = BZ2_bzopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = stream_bzread;
s->write = stream_bzwrite;
s->close = stream_bzclose;
@@ -1099,10 +1099,10 @@
if ((s = open_bzstream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
BZ2_bzread((BZFILE *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
stream_bzclose(s);
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
return s;
}
@@ -1116,7 +1116,7 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
BZ2_bzwrite((BZFILE *) s->stream_data.p, (void *)
&s->byteorder, sizeof(s->byteorder));
return s;
}
@@ -1176,7 +1176,7 @@
return open_gzrstream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1185,19 +1185,19 @@
return open_bzrstream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
if ((s = open_stream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR) {
+ if (s->errnr == MNSTR_NO__ERROR) {
if (fread((void *) &s->byteorder, sizeof(s->byteorder), 1,
(FILE *) s->stream_data.p) < 1 ||
ferror((FILE *) s->stream_data.p)) {
fclose((FILE *) s->stream_data.p);
s->stream_data.p = NULL;
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
}
return s;
@@ -1219,7 +1219,7 @@
return open_gzwstream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1228,7 +1228,7 @@
return open_bzwstream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1236,9 +1236,9 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
fwrite((void *) &s->byteorder, sizeof(s->byteorder), 1, (FILE *)
s->stream_data.p) < 1)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
}
@@ -1270,7 +1270,7 @@
return open_gzrastream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
