Changeset: 4ba54a6420c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ba54a6420c1
Modified Files:
MonetDB5/src/modules/kernel/alarm.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (143 lines):
diff -r 499158f78116 -r 4ba54a6420c1 MonetDB4/src/modules/plain/alarm.mx
--- a/MonetDB4/src/modules/plain/alarm.mx Mon Nov 15 11:23:03 2010 +0100
+++ b/MonetDB4/src/modules/plain/alarm.mx Tue Nov 16 15:15:34 2010 +0100
@@ -286,12 +286,14 @@
#ifdef HAVE_CTIME_R3
char buf[26];
- *retval = GDKstrdup(ctime_r(&t, buf, sizeof(buf)));
+ ctime_r(&t, buf, sizeof(buf));
+ *retval = GDKstrdup(buf);
#else
#ifdef HAVE_CTIME_R
char buf[26];
- *retval = GDKstrdup(ctime_r(&t, buf));
+ ctime_r(&t, buf);
+ *retval = GDKstrdup(buf);
#else
*retval = GDKstrdup(ctime(&t));
#endif
diff -r 499158f78116 -r 4ba54a6420c1 MonetDB5/src/modules/kernel/alarm.mx
--- a/MonetDB5/src/modules/kernel/alarm.mx Mon Nov 15 11:23:03 2010 +0100
+++ b/MonetDB5/src/modules/kernel/alarm.mx Tue Nov 16 15:15:34 2010 +0100
@@ -315,12 +315,14 @@
#ifdef HAVE_CTIME_R3
char buf[26];
- base = ctime_r(&t, buf, sizeof(buf));
+ ctime_r(&t, buf, sizeof(buf));
+ base = buf;
#else
#ifdef HAVE_CTIME_R
char buf[26];
- base = ctime_r(&t, buf);
+ ctime_r(&t, buf);
+ base = buf;
#else
base = ctime(&t);
#endif
diff -r 499158f78116 -r 4ba54a6420c1 buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Mon Nov 15 11:23:03 2010 +0100
+++ b/buildtools/conf/winconfig.h Tue Nov 16 15:15:34 2010 +0100
@@ -76,10 +76,13 @@
/* #undef HAVE_ALLOCA_H */
/* Define to 1 if you have the `asctime_r' function. */
-/* #undef HAVE_ASCTIME_R */
+#define HAVE_ASCTIME_R 1
/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */
-/* #undef HAVE_ASCTIME_R3 */
+#define HAVE_ASCTIME_R3 1
+
+/* there is something very similar to asctime_r on Windows: */
+#define asctime_r(t,b,s) asctime_s(b,s,t)
/* Define to 1 if you have the `basename' function. */
/* #undef HAVE_BASENAME */
@@ -91,10 +94,13 @@
/* #undef HAVE_CRYPT_H */
/* Define to 1 if you have the `ctime_r' function. */
-/* #undef HAVE_CTIME_R */
+#define HAVE_CTIME_R 1
/* Define if you have ctime_r(time_t*,char *buf,size_t s) */
-/* #undef HAVE_CTIME_R3 */
+#define HAVE_CTIME_R3 1
+
+/* there is something very similar to ctime_r on Windows: */
+#define ctime_r(t,b,s) ctime_s(b,s,t)
/* Define if you have the cURL library */
/* #undef HAVE_CURL */
@@ -266,7 +272,10 @@
#define HAVE_LOCALE_H 1
/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
+#define HAVE_LOCALTIME_R 1
+
+/* there is something very similar to localtime_r on Windows: */
+#define localtime_r(tp,tm) localtime_s(tm,tp)
/* Define to 1 if you have the `lockf' function. */
/* #undef HAVE_LOCKF */
diff -r 499158f78116 -r 4ba54a6420c1 python/debian/control
--- a/python/debian/control Mon Nov 15 11:23:03 2010 +0100
+++ b/python/debian/control Tue Nov 16 15:15:34 2010 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Gijs Molenaar <gijs.molen...@cwi.nl>
Build-Depends: cdbs, debhelper (>= 7), python-central
-XS-Python-Version: 2.5, 2.6
+XS-Python-Version: >= 2.5
Standards-Version: 3.8.0
Homepage: http://www.monetdb.nl
@@ -16,7 +16,7 @@
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
-
+ .
This package contains the files needed to use MonetDB from a Python
program.
diff -r 499158f78116 -r 4ba54a6420c1 python/debian/docs
--- a/python/debian/docs Mon Nov 15 11:23:03 2010 +0100
+++ b/python/debian/docs Tue Nov 16 15:15:34 2010 +0100
@@ -1,3 +1,3 @@
-README.rst
+README.txt
COPYRIGHT
diff -r 499158f78116 -r 4ba54a6420c1 sql/debian/monetdb5-sql.init.d
--- a/sql/debian/monetdb5-sql.init.d Mon Nov 15 11:23:03 2010 +0100
+++ b/sql/debian/monetdb5-sql.init.d Tue Nov 16 15:15:34 2010 +0100
@@ -60,7 +60,7 @@
case "$1" in
start)
if [ "$STARTUP" != "yes" ]; then
- echo "can't start, should be enabled first by change STARTUP to
yes in /etc/default/monetdb5-sql"
+ echo "can't start, should be enabled first by changing STARTUP to
yes in /etc/default/monetdb5-sql"
exit 0
fi
@@ -89,9 +89,11 @@
fi
;;
stop)
- echo -n "Stopping $DESC: "
- start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON
- echo "$NAME."
+ if running ; then
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON
+ echo "$NAME."
+ fi
;;
restart)
$0 stop
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
