Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3127/src/backends/monet5/merovingian
Modified Files:
merovingian.c
Log Message:
propagated changes of Tuesday Sep 29 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/29 - mr-meltdown:
src/backends/monet5/merovingian/merovingian.c,1.65.2.1
Fix: add missing master property to the default properties
Fix: seed randomiser early enough (before rand being used)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: merovingian.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- merovingian.c 24 Sep 2009 14:15:31 -0000 1.65
+++ merovingian.c 29 Sep 2009 10:59:19 -0000 1.66
@@ -607,6 +607,8 @@
snprintf(buf, sizeof(buf), "%d", ret);
kv->val = GDKstrdup(buf);
}
+ kv = findConfKey(_mero_props, "master");
+ kv->val = GDKstrdup("no");
/* we no longer need prefix */
freeConfFile(ckv);
@@ -646,6 +648,10 @@
MERO_EXIT(1);
}
+ /* seed the randomiser for when we create a database, send responses
+ * to HELO, etc */
+ srand(time(NULL));
+
/* see if we have the passphrase if we do remote control stuff */
if (_mero_controlport != 0) {
struct stat statbuf;
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
