Changeset: be877d766c25 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be877d766c25
Modified Files:
MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout
clients/src/mapiclient/ReadlineTools.mx
clients/src/mapiclient/mclient.mx
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.timeout
Branch: default
Log Message:
Merge with head
diffs (truncated from 7238 to 300 lines):
diff -r b4f5f0bcb410 -r be877d766c25 .hgtags
--- a/.hgtags Mon Aug 30 23:43:24 2010 +0200
+++ b/.hgtags Mon Aug 30 23:47:43 2010 +0200
@@ -422,3 +422,5 @@
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Aug 30 23:47:43 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
+- Rebuilt.
+
* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
- Rebuilt.
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB/debian/changelog Mon Aug 30 23:47:43 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb (1.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-Archive Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB4/ChangeLog-Archive Mon Aug 30 23:47:43 2010 +0200
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
- Slight change to Fedora, Debian, Ubuntu installers: the database
directory now has the group setuid bit set so that new databases
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Aug 30 23:47:43 2010 +0200
@@ -217,6 +217,13 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
- Rebuilt.
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Aug 30 23:47:43 2010 +0200
@@ -1,3 +1,16 @@
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb4-server (4.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r b4f5f0bcb410 -r be877d766c25
MonetDB4/src/modules/plain/aggrX3_be_minmax.mx
--- a/MonetDB4/src/modules/plain/aggrX3_be_minmax.mx Mon Aug 30 23:43:24
2010 +0200
+++ b/MonetDB4/src/modules/plain/aggrX3_be_minmax.mx Mon Aug 30 23:47:43
2010 +0200
@@ -115,7 +115,7 @@
ptr val = extrem...@8];
(void) h; /* silence compiler about unused variable */
/* trick: using a void head-type, only the tail are
(over)written */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), val?val:nil);
+ Tputvalue(bn, BUNtloc(bni,r), val?val:nil, 0);
}
@c
/* aggrX3_minmax_oid
@@ -200,7 +200,7 @@
oid val = h...@8] ? extrem...@8] : *(oid*)nil;
(void) h; /* silence compiler about unused variable */
/* trick: using a void head-type, only the tail are
(over)written */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), &val);
+ Tputvalue(bn, BUNtloc(bni,r), &val, 0);
}
@c
diff -r b4f5f0bcb410 -r be877d766c25
MonetDB4/src/modules/plain/aggrX3_bge_minmax.mx
--- a/MonetDB4/src/modules/plain/aggrX3_bge_minmax.mx Mon Aug 30 23:43:24
2010 +0200
+++ b/MonetDB4/src/modules/plain/aggrX3_bge_minmax.mx Mon Aug 30 23:47:43
2010 +0200
@@ -127,7 +127,7 @@
oid *h = (oid*)b...@4(bni,r);
ptr val = extrem...@8];
(void) h; /* silence compiler about unused variable */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), val?val:nil);
+ Tputvalue(bn, BUNtloc(bni,r), val?val:nil, 0);
}
@c
/* aggrX3_minmax3_oid
@@ -224,7 +224,7 @@
oid *h = (oid*)b...@4(bni,r);
oid val = h...@8] ? extrem...@8] : *(oid*)nil;
(void) h; /* silence compiler about unused variable */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), &val);
+ Tputvalue(bn, BUNtloc(bni,r), &val, 0);
}
@c
diff -r b4f5f0bcb410 -r be877d766c25
MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout
--- a/MonetDB4/tests/BugsViaSourgeforce/Tests/ID.853867.timeout Mon Aug 30
23:43:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-0.3
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-Archive Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/ChangeLog-Archive Mon Aug 30 23:47:43 2010 +0200
@@ -1,9 +1,13 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
- A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
- OIDs), values where sometimes written as 32 bits but read as 64 bits.
+ OIDs), values were sometimes written as 32 bits but read as 64 bits.
This fixes bugs 2644 and 2654.
* Thu Aug 19 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010 Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010 Mon Aug 30 23:47:43 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org>
+- When attempting to insert incorrect UTF-8 sequences in a COPY INTO
+ statement, the error message was truncated. This is now fixed.
+ Bug 2575.
+
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Aug 30 23:47:43 2010 +0200
@@ -214,12 +214,19 @@
%{_libdir}/*.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
- Rebuilt.
* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
- A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
- OIDs), values where sometimes written as 32 bits but read as 64 bits.
+ OIDs), values were sometimes written as 32 bits but read as 64 bits.
This fixes bugs 2644 and 2654.
* Thu Aug 19 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Aug 30 23:47:43 2010 +0200
@@ -1,3 +1,16 @@
+monetdb5-server (5.20.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb5-server (5.20.5-20100824) unstable; urgency=low
+
+ * Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb5-server (5.20.5-20100823) unstable; urgency=low
* Rebuilt.
@@ -7,7 +20,7 @@
monetdb5-server (5.20.5-20100823) unstable; urgency=low
* A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
- OIDs), values where sometimes written as 32 bits but read as 64 bits.
+ OIDs), values were sometimes written as 32 bits but read as 64 bits.
This fixes bugs 2644 and 2654.
-- Sjoerd Mullender <sjo...@acm.org> Fri, 20 Aug 2010 10:13:12 +0200
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/src/mal/mal_scenario.mx
--- a/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 23:47:43 2010 +0200
@@ -623,7 +623,7 @@
if (setjmp( c->exception_buf) < 0)
c->mode = FINISHING;
#ifdef HAVE_TIMES
- times(&t0);
+ times(&t0);
#endif
while (c->mode > FINISHING || msg != MAL_SUCCEED) {
if (msg != MAL_SUCCEED){
diff -r b4f5f0bcb410 -r be877d766c25
MonetDB5/src/modules/kernel/aggr_be_minmax.mx
--- a/MonetDB5/src/modules/kernel/aggr_be_minmax.mx Mon Aug 30 23:43:24
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_be_minmax.mx Mon Aug 30 23:47:43
2010 +0200
@@ -118,7 +118,7 @@
ptr val = extrem...@8];
(void) h; /* silence compiler about unused variable */
/* trick: using a void head-type, only the tail are
(over)written */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), val?val:nil);
+ Tputvalue(bn, BUNtloc(bni,r), val?val:nil, 0);
}
BATaccessEnd(bn,USE_HEAD|USE_TAIL,MMAP_SEQUENTIAL);
@c
@@ -209,7 +209,7 @@
oid val = h...@8] ? extrem...@8] : *(oid*)nil;
(void) h; /* silence compiler about unused variable */
/* trick: using a void head-type, only the tail are
(over)written */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), &val);
+ Tputvalue(bn, BUNtloc(bni,r), &val, 0);
}
BATaccessEnd(bn,USE_HEAD|USE_TAIL,MMAP_SEQUENTIAL);
@c
diff -r b4f5f0bcb410 -r be877d766c25
MonetDB5/src/modules/kernel/aggr_bge_minmax.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_minmax.mx Mon Aug 30 23:43:24
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_minmax.mx Mon Aug 30 23:47:43
2010 +0200
@@ -98,7 +98,7 @@
oid *h = (oid*)b...@4(bni,r);
ptr val = extrem...@8];
(void) h; /* silence compiler about unused variable */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), val?val:nil);
+ Tputvalue(bn, BUNtloc(bni,r), val?val:nil, 0);
}
BATaccessEnd(bn,USE_HEAD|USE_TAIL,MMAP_SEQUENTIAL);
@c
@@ -264,7 +264,7 @@
oid *h = (oid*)b...@4(bni,r);
oid val = h...@8] ? extrem...@8] : *(oid*)nil;
(void) h; /* silence compiler about unused variable */
- ATOMput(bn->ttype, bn->T->vheap, BUNtloc(bni,r), &val);
+ Tputvalue(bn, BUNtloc(bni,r), &val, 0);
}
@c
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/src/modules/kernel/batcast.mx
--- a/MonetDB5/src/modules/kernel/batcast.mx Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcast.mx Mon Aug 30 23:47:43 2010 +0200
@@ -235,7 +235,7 @@
@1 *v = (@1*)BUNtail(bi,p);
@1ToStr(&dst,&len, (ptr) v);
- ATOMput(ty...@1, bn->T->vheap, Tloc(bn,r), dst);
+ Tputvalue(bn, Tloc(bn,r), dst, 1);
if (dst)
GDKfree(dst);
}
@@ -260,7 +260,7 @@
BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
BATloop(b, p, q) {
ATOMfromstr(ty...@1, &v, &len, (char *) BUNtvar(bi, p));
- ATOMput(ty...@1, bn->T->vheap, Tloc(bn, r), v);
+ Tputvalue(bn, Tloc(bn,r), v, 1);
r++;
}
GDKfree(v);
diff -r b4f5f0bcb410 -r be877d766c25 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mx Mon Aug 30 23:43:24 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mx Mon Aug 30 23:47:43 2010 +0200
@@ -166,12 +166,16 @@
char *val;
val = *s ? GDKstrdup(s) : GDKstrdup("");
if ( *err == NULL){
- snprintf(buf, BUFSIZ, "value '%.*s%s' from line "
BUNFMT
- " field %d not inserted, expecting
type %s\n",
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
