Changeset: d5ef99a0ecb8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5ef99a0ecb8 Modified Files: clients/Tests/exports.stable.out monetdb5/mal/mal_authorize.c monetdb5/mal/mal_authorize.h sql/backends/monet5/embeddedclient.c.in tools/merovingian/ChangeLog tools/merovingian/ChangeLog.Jan2014 tools/merovingian/client/monetdb.1 tools/merovingian/client/monetdb.c tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/controlrunner.c tools/mserver/mserver5.c Branch: default Log Message:
Merge with Jan2014 branch, not changing any files (except ChangeLog). diffs (22 lines): diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog --- a/tools/merovingian/ChangeLog +++ b/tools/merovingian/ChangeLog @@ -1,3 +1,7 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Sun Feb 16 2014 Fabian Groffen <fab...@monetdb.org> +- monetdb create: add -p flag to set monetdb user password on creation, + and therefore allow creating the database in unlocked state + diff --git a/tools/merovingian/ChangeLog.Jan2014 b/tools/merovingian/ChangeLog.Jan2014 --- a/tools/merovingian/ChangeLog.Jan2014 +++ b/tools/merovingian/ChangeLog.Jan2014 @@ -2,7 +2,5 @@ # This file is updated with mchangelog * Sun Feb 16 2014 Fabian Groffen <fab...@monetdb.org> -- monetdb create: add -p flag to set monetdb user password on creation, - and therefore allow creating the database in unlocked state - monetdb destroy -f now also works on running databases _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
