Changeset: ff73940f652e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff73940f652e
Modified Files:
monetdb5/mal/mal_client.c
sql/backends/monet5/sql_scenario.c
Branch: embedded
Log Message:
fix for windows
diffs (33 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -362,7 +362,10 @@ freeClient(Client c)
c->prompt = NULL;
c->promptlength = -1;
if (c->errbuf) {
+/* no client threads in embedded mode */
+#ifndef HAVE_EMBEDDED
GDKsetbuf(0);
+#endif
if (c->father == NULL)
GDKfree(c->errbuf);
c->errbuf = 0;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -448,6 +448,7 @@ SQLinitClient(Client c)
}
if (m->session->tr)
reset_functions(m->session->tr);
+#ifndef HAVE_EMBEDDED
/* pass through credentials of the user if not console */
if (c->user != 0) {
schema = monet5_user_get_def_schema(m, c->user);
@@ -457,6 +458,7 @@ SQLinitClient(Client c)
}
_DELETE(schema);
}
+#endif
/*expect SQL text first */
be->language = 'S';
/* Set state, this indicates an initialized client scenario */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
