Changeset: bcf85caaccbd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bcf85caaccbd
Branch: persistent_sketches
Log Message:
merged with default
diffs (23 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
@@ -342,7 +342,7 @@ mvc_init(int debug, store_type store_tpe
mvc_destroy(m);
mvc_exit(store);
TRC_CRITICAL(SQL_TRANS,
- "Initialization: creation of
sys.tables column %s failed\n", cview[i].name);
+ "Initialization: creation of
sys.columns column %s failed\n", cview[i].name);
return NULL;
}
cview[i].newid = col->base.id;
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -921,6 +921,7 @@ scanner_string(mvc *c, int quote, bool e
cur = scanner_read_more(c, 1);
} else {
cur = scanner_getc(c);
+ escape = false;
}
}
(void) sql_error(c, 2, "%s", lc->errstr ? lc->errstr : SQLSTATE(42000)
"Unexpected end of input");
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
