Changeset: d7916b097148 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7916b097148
Modified Files:
clients/ChangeLog.Feb2013
gdk/ChangeLog.Feb2013
gdk/gdk_batop.c
gdk/gdk_heap.c
monetdb5/ChangeLog.Feb2013
sql/ChangeLog.Feb2013
sql/backends/monet5/sql.mx
sql/common/sql_mem.c
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (103 lines):
diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013
--- a/clients/ChangeLog.Feb2013
+++ b/clients/ChangeLog.Feb2013
@@ -1,6 +1,11 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org>
+- mclient: Fixed a bug where the -H option only worked if the readline
+ history file already existed. Now we properly create and use the
+ history file.
+
* Wed Nov 6 2013 Sjoerd Mullender <sjo...@acm.org>
- ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to
refer to a 32 bit integer always (i.e. "int" on 64 bit architectures
diff --git a/gdk/ChangeLog.Feb2013 b/gdk/ChangeLog.Feb2013
--- a/gdk/ChangeLog.Feb2013
+++ b/gdk/ChangeLog.Feb2013
@@ -1,3 +1,11 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org>
+- Stopped using the deprecated sbrk() system call.
+- Fixed a problem when reverse sorting a sorted column.
+- Fixed bugs that deal with problems that could possibly occur when
+ transactions are aborted and the server is restarted. See bug #3243.
+- A bug was fixed in the handling of grouped aggregates when all values
+ in a group are null. See bug #3388.
+
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1238,7 +1238,7 @@ BATorder_internal(BAT *b, int stable, in
* column needs to be key) */
return BATrevert(b);
}
- if ((!(reverse && b->hrevsorted) && !(!reverse && b->hsorted)) &&
+ if (!(reverse ? b->hrevsorted : b->hsorted) &&
do_sort(Hloc(b, BUNfirst(b)), Tloc(b, BUNfirst(b)),
b->H->vheap ? b->H->vheap->base : NULL,
BATcount(b), Hsize(b), Tsize(b), b->htype,
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -418,6 +418,7 @@ GDKupgradevarheap(COLrec *c, var_t v, in
size_t i, n;
size_t savefree;
const char *filename;
+ bat bid;
assert(c->heap.parentid == 0);
assert(width != 0);
@@ -449,7 +450,10 @@ GDKupgradevarheap(COLrec *c, var_t v, in
filename = c->heap.filename;
else
filename++;
- if (c->heap.storage == STORE_MMAP && !file_exists(BAKDIR, filename,
NULL)) {
+ bid = strtol(filename, NULL, 8);
+ if (c->heap.storage == STORE_MMAP &&
+ (BBP_status(bid) & (BBPEXISTING|BBPDELETED)) &&
+ !file_exists(BAKDIR, filename, NULL)) {
int fd;
ssize_t ret = 0;
size_t size = n << c->shift;
diff --git a/monetdb5/ChangeLog.Feb2013 b/monetdb5/ChangeLog.Feb2013
--- a/monetdb5/ChangeLog.Feb2013
+++ b/monetdb5/ChangeLog.Feb2013
@@ -1,3 +1,12 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a possible buffer overflow in the COPY INTO code.
+- Fixed a problem that when the server is using all available threads
+ for a query, it was not possible to attach another client and have
+ it execute even the smallest query. This is fixed by creating extra
+ threads for each client entering the fray at the cost of having more
+ threads that execute queries. But at least there is guaranteed progress
+ for all clients (modulo the operating system scheduler). See bug #3258.
+
diff --git a/sql/ChangeLog.Feb2013 b/sql/ChangeLog.Feb2013
--- a/sql/ChangeLog.Feb2013
+++ b/sql/ChangeLog.Feb2013
@@ -1,3 +1,7 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Tue Nov 19 2013 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a bug where the server at some point stopped saving compiled
+ queries in the SQL query cache.
+
diff --git a/sql/common/sql_mem.c b/sql/common/sql_mem.c
--- a/sql/common/sql_mem.c
+++ b/sql/common/sql_mem.c
@@ -78,6 +78,7 @@ sql_allocator *sa_reset( sql_allocator *
}
sa->nr = 1;
sa->used = 0;
+ sa->usedmem = SA_BLOCK;
return sa;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
