Changeset: b780c78c9020 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b780c78c9020 Modified Files: clients/ChangeLog.Jun2010 clients/src/mapiclient/mclient.mx sql/src/server/rel_sequence.mx Branch: Jun2010 Log Message:
Fix bug #2650, a too small buffer caused the active database as reported by mclient's welcome message to be truncated diffs (58 lines): diff -r ea24d3a3f864 -r b780c78c9020 clients/ChangeLog.Jun2010 --- a/clients/ChangeLog.Jun2010 Fri Aug 13 09:46:57 2010 +0200 +++ b/clients/ChangeLog.Jun2010 Fri Aug 13 11:01:08 2010 +0200 @@ -1,6 +1,9 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Fri Aug 13 2010 Fabian Groffen <[email protected]> +- 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 <[email protected]> - Add --version option to mclient. diff -r ea24d3a3f864 -r b780c78c9020 clients/src/mapiclient/mclient.mx --- a/clients/src/mapiclient/mclient.mx Fri Aug 13 09:46:57 2010 +0200 +++ b/clients/src/mapiclient/mclient.mx Fri Aug 13 11:01:08 2010 +0200 @@ -2589,23 +2589,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') stream_printf(toConsole, "Database: MonetDB v%s, '%s'\n", m5ver, dbname); + if (dbname != NULL) + free(dbname); } stream_printf(toConsole, "Type \\q to quit, \\? for a list of available commands\n"); if (mode == SQL) diff -r ea24d3a3f864 -r b780c78c9020 sql/src/server/rel_sequence.mx --- a/sql/src/server/rel_sequence.mx Fri Aug 13 09:46:57 2010 +0200 +++ b/sql/src/server/rel_sequence.mx Fri Aug 13 11:01:08 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 [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
