Changeset: fb2d20663f7d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb2d20663f7d Modified Files: sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 sql/src/backends/monet5/merovingian/daemon/client.c Branch: default Log Message:
Merged from Oct2010 diffs (33 lines): diff -r b023b4a73de6 -r fb2d20663f7d sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 --- a/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Wed Oct 20 20:18:27 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Thu Oct 21 13:23:44 2010 +0200 @@ -1,6 +1,10 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog - 16 Jul 2010; Arjen de Rijke <[email protected]> - merovingian_forkmserver.c, properties.c: - Add readonly property for databases to monetdb and merovingian. +* Thu Oct 21 2010 Fabian Groffen <[email protected]> +- Report a stopped and locked database as under maintenance, instead of + without connections, bug #2685 + +* Fri 16 Jul 2010 Arjen de Rijke <[email protected]> +- Add readonly property for databases to monetdb and merovingian. + diff -r b023b4a73de6 -r fb2d20663f7d sql/src/backends/monet5/merovingian/daemon/client.c --- a/sql/src/backends/monet5/merovingian/daemon/client.c Wed Oct 20 20:18:27 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/daemon/client.c Thu Oct 21 13:23:44 2010 +0200 @@ -239,7 +239,11 @@ /* if we can't redirect, our mission ends here */ if (r == 0) { - e = newErr("there are no available connections for '%s'", database); + if (top->locked) { + e = newErr("database '%s' is under maintenance", top->dbname); + } else { + e = newErr("there are no available connections for '%s'", database); + } mnstr_printf(fout, "!merovingian: %s\n", e); mnstr_flush(fout); close_stream(fout); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
