MonetDB: default - Merge with Aug2011 branch.

[Stefan Manegold]

Changeset: 161f5f2194f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=161f5f2194f3
Modified Files:
        
Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (36 lines):

diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -41,8 +41,6 @@ subs = [("@exec_prefix@", r'%prefix%'),
         ("@pkgincludedir@", r'%prefix%\include\@PACKAGE@'),
         ("@DIRSEP@", '\\'),
         ("@CROSS_COMPILING_FALSE@", ''),
-        ("@HAVE_CLIENTS_FALSE@", '#'),
-        ("@HAVE_MONETDB_FALSE@", '#'),
         ("@NATIVE_WIN32_FALSE@", '#'),
         ("@NOT_WIN32_FALSE@", ''),
         ("@PATHSEP@", ';')]
diff --git a/debian/monetdb5-sql.init.d b/debian/monetdb5-sql.init.d
--- a/debian/monetdb5-sql.init.d
+++ b/debian/monetdb5-sql.init.d
@@ -19,7 +19,7 @@ test -x $DAEMON || exit 0
 umask 022
 
 LOGDIR=/var/log/monetdb
-PIDFILE=/var/run/monetdb/$NAME.pid
+PIDFILE=/var/run/monetdb/merovingian.pid
 
 # Include monetdb5-sql defaults if available
 if [ -f /etc/default/monetdb5-sql ] ; then
diff --git 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -26,7 +26,7 @@ Over..
 # 12:13:20 >  
 
 mdb>#    mdb.start();
-mdb>#    user.s0_1();
+mdb>#    user.s1_1();
 
 # 12:13:21 >  
 # 12:13:21 >  Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list