Changeset: e82c6b72d1c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e82c6b72d1c5
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_system.c
sql/backends/monet5/sql_result.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (43 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1196,7 +1196,10 @@ strPut(Heap *h, var_t *dst, const char *
/* double the heap size until we have enough space */
do {
- newsize <<= 1;
+ if (newsize < 4 * 1024 * 1024)
+ newsize <<= 1;
+ else
+ newsize += 4 * 1024 * 1024;
} while (newsize <= h->free + pad + len + extralen);
assert(newsize);
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -592,8 +592,8 @@ MT_create_thread(MT_Id *t, void (*f) (vo
p->func = f;
p->arg = arg;
p->exited = 0;
+ pthread_mutex_lock(&posthread_lock);
p->next = posthreads;
- pthread_mutex_lock(&posthread_lock);
posthreads = p;
f = thread_starter;
pthread_mutex_unlock(&posthread_lock);
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -772,11 +772,6 @@ mvc_import_table(Client cntxt, mvc *m, b
if (locked) {
BAT *b = store_funcs.bind_col(m->session->tr,
col, RDONLY);
- if (sz > (lng) BATTINY)
- b = BATextend(b, (BUN) sz);
-
- assert(b != NULL);
-
HASHdestroy(b);
fmt[i].c = b;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
