Changeset: dda98e2c9372 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dda98e2c9372
Modified Files:
sql/backends/monet5/sql_embedded.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: translate-scripts
Log Message:
Call mal_init from sql_embedded.
diffs (62 lines):
diff --git a/sql/backends/monet5/sql_embedded.c
b/sql/backends/monet5/sql_embedded.c
--- a/sql/backends/monet5/sql_embedded.c
+++ b/sql/backends/monet5/sql_embedded.c
@@ -53,6 +53,11 @@ sqlEmbeddedBoot(void)
if( SQLembeddedinitialized )
return 0;
+ if (mal_init()) {
+ fprintf(stderr, "MAL init failed\n");
+ return -1;
+ }
+
if ((msg = MSinitClientPrg(mal_clients, "user", "main")) !=
MAL_SUCCEED) {
fprintf(stderr, "%s\n", msg);
freeException(msg);
@@ -79,6 +84,7 @@ sqlEmbeddedShutdown(void)
if( !SQLembeddedinitialized )
return 0;
(void) malEmbeddedStop();
+ mserver_reset();
SQLembeddedinitialized = false;
return 0;
}
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -676,12 +676,6 @@ main(int argc, char **av)
exit(1);
}
- if (mal_init()) {
- /* don't show this as a crash */
- msab_registerStop();
- return -1;
- }
-
if (sqlEmbeddedBoot() != 0) {
/* don't show this as a crash */
msab_registerStop();
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -269,11 +269,6 @@ static str monetdb_initialize(void) {
exit(1);
}
- if (mal_init()) {
- retval = GDKstrdup("mal_init() failed");
- goto cleanup;
- }
-
if (sqlEmbeddedBoot() != 0) {
retval = GDKstrdup("sqlEmbeddedBoot() failed");
goto cleanup;
@@ -311,7 +306,6 @@ cleanup:
static void monetdb_shutdown(void) {
if (monetdb_initialized) {
- mserver_reset();
(void) sqlEmbeddedShutdown();
monetdb_initialized = 0;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
