Changeset: c267ce5d0fea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c267ce5d0fea
Modified Files:
sql/server/sql_mvc.c
Branch: Jul2021
Log Message:
I forgot to cleanup at one place
diffs (28 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -85,10 +85,11 @@ mvc_init_create_view(mvc *m, sql_schema
sql_column *col = mvc_bind_column(m, t, VIEW[i].name); \
VIEW[i].oldid = col->base.id; \
} \
- if((output = mvc_drop_table(m, s, t, 0)) != MAL_SUCCEED) { \
+ if ((output = mvc_drop_table(m, s, t, 0)) != MAL_SUCCEED) { \
mvc_destroy(m); \
+ mvc_exit(store); \
TRC_CRITICAL(SQL_TRANS, \
- "Initialization: %s\n", output); \
+ "Initialization error: %s\n", output);
\
freeException(output); \
return NULL; \
} \
@@ -274,8 +275,8 @@ mvc_init(int debug, store_type store_tpe
assert(m->session->schema != NULL);
if (!store->first) {
- MVC_INIT_DROP_TABLE(tid, "tables", tview, 9);
- MVC_INIT_DROP_TABLE(cid, "columns", cview, 10);
+ MVC_INIT_DROP_TABLE(tid, "tables", tview, 9);
+ MVC_INIT_DROP_TABLE(cid, "columns", cview, 10);
}
t = mvc_init_create_view(m, s, "tables", "SELECT \"id\",
\"name\", \"schema_id\", \"query\", CAST(CASE WHEN \"system\" THEN \"type\" +
10 /* system table/view */ ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\"
/* table/view */ ELSE \"type\" + 20 /* global temp table */ END) END AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", CASE WHEN
(NOT \"system\" AND \"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\"
FROM \"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
