Changeset: 2f3e18dcbd62 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f3e18dcbd62
Modified Files:
NT/monetdb_config.h.in
gdk/gdk_utils.c
monetdb5/optimizer/opt_prelude.c
sql/storage/store.c
Branch: Jun2016
Log Message:
Windows shutdown fix
diffs (57 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -315,11 +315,12 @@
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
-
+#ifdef _MSC_VER
/* Define to 1 if you have the `localtime_r' function. */
#define HAVE_LOCALTIME_R 1
/* there is something very similar to localtime_r on Windows: */
#define localtime_r(tp,tm) localtime_s(tm,tp)
+#endif
/* Define to 1 if you have the `lockf' function. */
/* #undef HAVE_LOCKF */
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1345,6 +1345,9 @@ void
GDKexit(int status)
{
if (GDKlockFile == NULL) {
+#ifdef HAVE_EMBEDDED
+ return;
+#endif
/* no database lock, so no threads, so exit now */
exit(status);
}
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
@@ -232,7 +232,9 @@ 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
@@ -1367,7 +1367,10 @@ store_load(void) {
types_init(sa, logger_debug);
#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
