Changeset: e4e456d61e31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4e456d61e31
Modified Files:
clients/src/mapiclient/mclient.mx
sql/ChangeLog.Jun2010
Branch: default
Log Message:
Merged from Jun2010
diffs (32 lines):
diff -r 2a60e5961918 -r e4e456d61e31 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Aug 17 10:07:55 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Aug 17 10:18:48 2010 +0200
@@ -1154,11 +1154,9 @@
/* correct the lengths in case only the headers were
* squeezed, if the content itself is wider, the headers
* will be squeezed to their size (see below) */
- if (lentotal == total) {
- for (i = 0; i < fields; i++)
- if (len[i] < hdr[i])
- len[i] = hdr[i];
- }
+ for (i = 0; i < fields; i++)
+ if (len[i] < hdr[i])
+ len[i] = hdr[i];
/* worst case: lentotal = total, which means it still
* doesn't fit, values will be squeezed next */
diff -r 2a60e5961918 -r e4e456d61e31 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Tue Aug 17 10:07:55 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 17 10:18:48 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Aug 16 2010 Niels Nes <ni...@cwi.nl>
+- Fixed bug 2657, a regression after the fix for bug 2353. A join with a
+ single value subquery resulted in an assertion failure.
+
* Fri Aug 13 2010 Niels Nes <ni...@cwi.nl>
- Fixed bug 2643 added more defensive code, when an aggregation function
doesn't exist
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
