Changeset: 09214ff6a25d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/09214ff6a25d
Modified Files:
sql/storage/store.c
tools/mserver/mserver5.c
Branch: Jun2023
Log Message:
merged with sep2022
diffs (36 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -5977,6 +5977,8 @@ sql_trans_drop_table(sql_trans *tr, sql_
if ((res = sys_drop_table(tr, gt?gt:t, drop_action)))
return res;
+ if (isNew(t))
+ t->base.deleted = 1;
if (gt && (res = os_del(s->tables, tr, gt->base.name,
dup_base(>->base))))
return res;
if (t != gt && (res =os_del(tr->localtmps, tr, t->base.name,
dup_base(&t->base))))
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -282,8 +282,6 @@ wmain(int argc, wchar_t **argv)
main(int argc, char **av)
#endif
{
- /* make sure stdout is line buffered, even when not to a terminal */
- setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
#ifdef _MSC_VER
char **av = malloc((argc + 1) * sizeof(char *));
if (av == NULL) {
@@ -297,6 +295,11 @@ main(int argc, char **av)
}
}
av[argc] = NULL;
+#else
+ /* make sure stdout is line buffered, even when not to a terminal;
+ * on Windows, _IOLBF does the same as _IOFBF, i.e. full
+ * buffering */
+ setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
#endif
char *prog = *av;
opt *set = NULL;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
