Changeset: 255e5a92aa7f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=255e5a92aa7f
Modified Files:
gdk/gdk_utils.c
monetdb5/modules/atoms/mtime.c
monetdb5/optimizer/opt_prelude.c
sql/storage/store.c
Branch: default
Log Message:
Several shutdown fixes.
diffs (49 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -746,6 +746,7 @@ GDKreset(int status, int exit)
GDK_mmap_pagesize = MMAP_PAGESIZE;
GDK_mem_maxsize = GDK_VM_MAXSIZE;
GDK_vm_maxsize = GDK_VM_MAXSIZE;
+ GDKatomcnt = TYPE_str + 1;
GDK_vm_trim = 1;
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -1393,6 +1393,7 @@ str
MTIMEepilogue(void *ret)
{
(void) ret;
+ MTIMEreset();
return MAL_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -244,9 +244,6 @@ str zero_or_oneRef;
void optimizerInit(void)
{
-#ifndef HAVE_EMBEDDED
- assert(batRef == NULL);
-#endif
abortRef = putName("abort");
affectedRowsRef = putName("affectedRows");
aggrRef = putName("aggr");
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1384,9 +1384,7 @@ store_load(void) {
#define FUNC_OIDS 2000
// TODO: Niels: Are we fine running this twice?
-#ifndef HAVE_EMBEDDED
- assert( store_oid <= FUNC_OIDS );
-#endif
+
/* we store some spare oids */
store_oid = FUNC_OIDS;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
