Changeset: 7cc9dc4a7cfb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cc9dc4a7cfb
Modified Files:
clients/mapiclient/mclient.c
sql/server/sql_privileges.c
Branch: Nov2019
Log Message:
Correct fix made for 6754.
Instead of changing the msg reported by mclient, change the setting of m->type
when command set schema is executed.
This restores the feedback info when user starts or ends a transaction in
mclient (auto commit mode: off and auto commit mode: on).
diffs (29 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1933,7 +1933,7 @@ format_result(Mapi mid, MapiHdl hdl, boo
SQLqueryEcho(hdl);
if (formatter == TABLEformatter ||
formatter == ROWCOUNTformatter)
- mnstr_printf(toConsole, "operation
successful\n");
+ mnstr_printf(toConsole, "auto commit mode:
%s\n", mapi_get_autocommit(mid) ? "on" : "off");
timerHuman(sqloptimizer, maloptimizer, querytime,
singleinstr, false);
continue;
case Q_PREPARE:
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -754,11 +754,11 @@ mvc_set_schema(mvc *m, char *schema)
if (m->session->schema_name)
_DELETE(m->session->schema_name);
m->session->schema_name = new_schema_name;
- m->type = Q_TRANS;
+ m->type = Q_SCHEMA;
if (m->session->tr->active)
m->session->schema = s;
ret = 1;
- } else if(new_schema_name) {
+ } else if (new_schema_name) {
_DELETE(new_schema_name);
}
return ret;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
