Changeset: 03ea58b5c00d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03ea58b5c00d
Modified Files:
Branch: Jun2010
Log Message:
hg merge
diffs (88 lines):
diff -r 6a21956b2fd1 -r 03ea58b5c00d .hgignore
--- a/.hgignore Thu Jun 03 22:25:12 2010 +0200
+++ b/.hgignore Thu Jun 03 22:28:18 2010 +0200
@@ -1,6 +1,7 @@
/\#
/\.\#
/@
+~$
MANIFEST$
Makefile\.in$
MonetDB4/NT/MonetDB\.pc$
diff -r 6a21956b2fd1 -r 03ea58b5c00d MonetDB5/src/modules/kernel/array.mx
--- a/MonetDB5/src/modules/kernel/array.mx Thu Jun 03 22:25:12 2010 +0200
+++ b/MonetDB5/src/modules/kernel/array.mx Thu Jun 03 22:28:18 2010 +0200
@@ -46,7 +46,7 @@
comment "Fills an index BAT, (grpcount,grpsize,clustersize,offset)";
command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1]
-address arraygridb...@1
+address arraygridbatshi...@1
comment "Fills an index BAT, (grpcount,grpsize,clustersize,offset)
and shift all elemenets with a factor s";
diff -r 6a21956b2fd1 -r 03ea58b5c00d buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c Thu Jun 03 22:25:12 2010 +0200
+++ b/buildtools/Mx/disclaimer.c Thu Jun 03 22:28:18 2010 +0200
@@ -47,8 +47,14 @@
buf[0] = '\0';
strncat(buf, inputdir, 8096 - 1);
len = strlen(buf);
- if (len < 8095 && buf[len - 1] != DIR_SEP)
+ if (len > 0 && len < 8095 && buf[len - 1] != DIR_SEP
+#ifdef WIN32
+ && buf[len - 1] != '/'
+#endif
+ ) {
buf[len++] = DIR_SEP;
+ buf[len] = 0;
+ }
/* search backwards, such that we can find the license.txt
* file in the root of each module */
strncat(buf, filename, 8095 - len);
diff -r 6a21956b2fd1 -r 03ea58b5c00d buildtools/conf/Mdebootstrap
--- a/buildtools/conf/Mdebootstrap Thu Jun 03 22:25:12 2010 +0200
+++ b/buildtools/conf/Mdebootstrap Thu Jun 03 22:28:18 2010 +0200
@@ -52,7 +52,7 @@
if [ "x$x" = 'xy' ]; then
( /bin/rm -f $R $* && echo "$n files deleted." ) ||
echo "rm failed."
else
- echo "rm canceled, no files/directories deleted."
+ echo "rm cancelled, no files/directories deleted."
fi
fi
}
@@ -79,8 +79,16 @@
RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v
'(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$'
; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name
.cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name
.#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst
./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp
./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh
./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh
./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in
fi
-echo '
+if [ -d CVS ]; then
+ echo '
It might be a good idea to run "cvs -q diff --brief", now,
-to check whether required files have been removed accidently.
+to check whether required files have been removed accidentally.
If so, these files can be restored by "cvs update <file>".
'
+else
+ echo '
+It might be a good idea to run "hg status -d", now,
+to check whether required files have been removed accidentally.
+If so, these files can be restored by "hg revert <file>".
+'
+fi
diff -r 6a21956b2fd1 -r 03ea58b5c00d clients/src/php/native/lib/php_mapi.inc
--- a/clients/src/php/native/lib/php_mapi.inc Thu Jun 03 22:25:12 2010 +0200
+++ b/clients/src/php/native/lib/php_mapi.inc Thu Jun 03 22:28:18 2010 +0200
@@ -768,8 +768,10 @@
global $connection_pool;
$connections = array();
- foreach($connection_pool as $conn) {
+ if ($connection_pool !== null) {
+ foreach($connection_pool as $conn) {
$connections[] = $conn["id"];
+ }
}
$id = hash("sha1", time());
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
