Changeset: 0c07b9a3714c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c07b9a3714c
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (58 lines):
diff -r f4f4ba58c54d -r 0c07b9a3714c clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Fri Aug 13 10:32:27 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Fri Aug 13 11:04:22 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Fri Aug 13 2010 Fabian Groffen <fab...@cwi.nl>
+- Fix bug #2650, a too small buffer caused the active database as reported by
mclient's welcome message to be truncated
+
* Wed Jul 21 2010 Fabian Groffen <fab...@cwi.nl>
- Add --version option to mclient.
diff -r f4f4ba58c54d -r 0c07b9a3714c clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Aug 13 10:32:27 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Aug 13 11:04:22 2010 +0200
@@ -2639,23 +2639,25 @@
"FROM sys.env() AS env "
"WHERE \"name\" IN ('gdk_dbname',
'monet_version')")) != NULL &&
mapi_error(mid) == MOK) {
- char dbname[24], m5ver[24];
+ char *dbname = NULL, m5ver[24];
char *name, *val;
- dbname[0] = m5ver[0] = '\0';
+ m5ver[0] = '\0';
while (fetch_row(hdl) == 2) {
name = mapi_fetch_field(hdl, 0);
val = mapi_fetch_field(hdl, 1);
if (name != NULL && val != NULL) {
if (strcmp(name, "gdk_dbname") == 0) {
- snprintf(dbname,
sizeof(dbname), "%s", val);
+ dbname = strdup(val);
} else if (strcmp(name,
"monet_version") == 0) {
snprintf(m5ver, sizeof(m5ver),
"%s", val);
}
}
}
mapi_close_handle(hdl);
- if (dbname[0] != '\0' && m5ver[0] != '\0')
+ if (dbname != NULL && *dbname != '\0' && m5ver[0] !=
'\0')
mnstr_printf(toConsole, "Database: MonetDB v%s,
'%s'\n", m5ver, dbname);
+ if (dbname != NULL)
+ free(dbname);
}
mnstr_printf(toConsole, "Type \\q to quit, \\? for a list of
available commands\n");
if (mode == SQL)
diff -r f4f4ba58c54d -r 0c07b9a3714c sql/src/server/rel_sequence.mx
--- a/sql/src/server/rel_sequence.mx Fri Aug 13 10:32:27 2010 +0200
+++ b/sql/src/server/rel_sequence.mx Fri Aug 13 11:04:22 2010 +0200
@@ -185,7 +185,7 @@
/* first alter the known values */
seq = create_sql_sequence(sql->sa, s, name, seq->start, min, max, inc,
cache, cycle);
- /* restart maybe a query, ie we create a statement
+ /* restart may be a query, i.e. we create a statement
restart(ssname,seqname,value) */
if (start_type == 0) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
