On 2007-02-13 10:55, Fabian wrote:

Update of /cvsroot/monetdb/MonetDB5/src/tools In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30761/src/tools

Modified Files: mserver5.mx Log Message: Don't set the version as a gdk_XXX variable, instead "hardcode" it by using the VERSION define. This way a user won't get an "old mserver" by using an "old config file".

Index: mserver5.mx

RCS file: /cvsroot/monetdb/MonetDB5/src/tools/mserver5.mx,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- mserver5.mx 19 Jan 2007 14:41:24 -0000 1.27 +++ mserver5.mx 13 Feb 2007 09:55:54 -0000 1.28 @@ -156,7 +156,7 @@ char *msg = mo_find_option(set, setlen, "monet_welcome");

if (msg && strcmp(msg, "yes") == 0) {

• printf("# MonetDB Server v%s\n", GDKgetenv("gdk_version"));
  

• printf("# MonetDB Server v" VERSION "\n");
  

  printf("# Copyright (c) 1993-2007 CWI, all rights reserved\n"); printf("# Compiled for %s/" SZFMT "bit with " SZFMT "bit OIDs %s linked\n", HOST, (size_t) (sizeof(ptr) * 8), (size_t) (sizeof(oid) * 8), linkinfo);

#ifdef MONET_GLOBAL_DEBUG

Using printf("# MonetDB Server v%s\n", VERSION); may be better. It'll even work when somebody somehow puts a % in VERSION.