Changeset: 40561ccb45ce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40561ccb45ce
Modified Files:
Branch: Jun2010
Log Message:
Merged heads.
diffs (truncated from 433 to 300 lines):
diff -r e1dfe2841627 -r 40561ccb45ce .hgtags
--- a/.hgtags Wed Jun 30 12:43:28 2010 +0200
+++ b/.hgtags Wed Jun 30 14:21:04 2010 +0200
@@ -410,3 +410,5 @@
d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
+c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
+e042ecc2e895b1bb5f06da65d0db6a8756cdb6d3 Jun2010_1
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB/MonetDB.spec Wed Jun 30 14:21:04 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 1.38.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 1.38.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB/debian/changelog Wed Jun 30 14:21:04 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100630) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 30 Jun 2010 14:10:36 +0200
+
monetdb (1.38.1-20100625) unstable; urgency=low
* Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx Wed Jun 30 14:21:04 2010 +0200
@@ -2102,6 +2102,9 @@
#define MT_PAGESIZE(s) ((((s)-1)/MT_pagesize()+1)*MT_pagesize())
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#if defined(MAP_ANONYMOUS)
#define MMAP_FLAGS(f) f|MAP_ANONYMOUS
#define MMAP_FD -1
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 14:21:04 2010 +0200
@@ -372,20 +372,22 @@
# if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
# else
-# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
+# if defined(HAVE_GETRLIMIT) && defined(RLIMIT_RSS)
{
- int mib[2] = { CTL_HW, HW_MEMSIZE };
- unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
- uint64_t size;
- size_t len = sizeof(size);
+ struct rlimit rl;
- if (sysctl(mib, namelen, &size, &len, NULL, 0) >= 0) {
- _MT_npages = size / _MT_pagesize;
- }
+ /* Specifies the limit (in pages) of the process's resident set
+ * (the number of virtual pages resident in RAM). This limit
+ * only has effect in Linux 2.4.x, x < 30, and there only
+ * affects calls to madvise() specifying MADV_WILLNEED */
+ /* FIXME: this looks like a total wrong thing to check in any
+ * case to me */
+ getrlimit(RLIMIT_RSS, &rl);
+ _MT_npages = rl.rlim_cur / _MT_pagesize;
}
# else
# error "don't know how to get the amount of physical memory for your OS"
-# endif /* sysctl */
+# endif /* getrlimit */
# endif /* sysconf */
# endif /* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Wed Jun 30 14:21:04 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 4.38.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 4.38.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB4/debian/changelog Wed Jun 30 14:21:04 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100630) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 30 Jun 2010 14:10:36 +0200
+
monetdb4-server (4.38.1-20100625) unstable; urgency=low
* Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed Jun 30 14:21:04 2010 +0200
@@ -214,6 +214,9 @@
%{_libdir}/*.so
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 5.20.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 5.20.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Wed Jun 30 12:43:28 2010 +0200
+++ b/MonetDB5/debian/changelog Wed Jun 30 14:21:04 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.1-20100630) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 30 Jun 2010 14:10:36 +0200
+
monetdb5-server (5.20.1-20100625) unstable; urgency=low
* Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/clients/MonetDB-client.spec Wed Jun 30 14:21:04 2010 +0200
@@ -333,6 +333,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 1.38.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 1.38.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce clients/debian/changelog
--- a/clients/debian/changelog Wed Jun 30 12:43:28 2010 +0200
+++ b/clients/debian/changelog Wed Jun 30 14:21:04 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.1-20100630) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 30 Jun 2010 14:10:36 +0200
+
monetdb-client (1.38.1-20100625) unstable; urgency=low
* Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
---
a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
Wed Jun 30 12:43:28 2010 +0200
+++
b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
Wed Jun 30 14:21:04 2010 +0200
@@ -592,14 +592,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{8D3D872E-AAEB-4CC9-9C0A-B2AA780F3613}"
- "PackageCode" = "8:{44A4BE04-6D51-47EF-BDAA-D147D5E2934F}"
+ "ProductCode" = "8:{FEF4111D-7D84-494C-816B-59AC17D61DD3}"
+ "PackageCode" = "8:{CA234000-7CBC-41BE-B950-52932DA115F6}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.25"
+ "ProductVersion" = "8:10.6.30"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r e1dfe2841627 -r 40561ccb45ce
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
---
a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
Wed Jun 30 12:43:28 2010 +0200
+++
b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
Wed Jun 30 14:21:04 2010 +0200
@@ -592,14 +592,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{C1A3B0AF-9E7D-40FA-9624-145A019773AC}"
- "PackageCode" = "8:{B39B2ABE-EA1C-4EF7-B1F6-D593903A840C}"
+ "ProductCode" = "8:{20538730-659F-47B6-BA7D-FD8102EA1D54}"
+ "PackageCode" = "8:{C4F24F66-3C34-4D5C-A2AA-C662448BEE9D}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.25"
+ "ProductVersion" = "8:10.6.30"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r e1dfe2841627 -r 40561ccb45ce geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/geom/MonetDB-geom.spec Wed Jun 30 14:21:04 2010 +0200
@@ -172,6 +172,9 @@
%endif
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 0.18.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 0.18.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
--- a/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Wed Jun 30 12:43:28
2010 +0200
+++ b/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Wed Jun 30 14:21:04
2010 +0200
@@ -447,14 +447,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{A057677F-55B9-45D4-A966-A855347665F1}"
- "PackageCode" = "8:{514614EE-78E5-47AE-BB11-9B06F5A45D19}"
+ "ProductCode" = "8:{58592D26-F57D-40EE-A887-2800247B063B}"
+ "PackageCode" = "8:{46EAD9E3-9260-4AB8-B182-AD16E6A8F619}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.25"
+ "ProductVersion" = "8:10.6.30"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r e1dfe2841627 -r 40561ccb45ce
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
--- a/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Wed Jun 30
12:43:28 2010 +0200
+++ b/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Wed Jun 30
14:21:04 2010 +0200
@@ -447,14 +447,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{AA7708D3-1E95-48BB-BCB3-7BDF5321FE84}"
- "PackageCode" = "8:{F950589E-12C6-42F6-A053-DC8F917A506C}"
+ "ProductCode" = "8:{48BA4013-D587-425E-AC25-42F7F296B3B5}"
+ "PackageCode" = "8:{8C150465-6617-475E-A9CE-8E155A8D51A7}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.25"
+ "ProductVersion" = "8:10.6.30"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r e1dfe2841627 -r 40561ccb45ce geom/debian/changelog
--- a/geom/debian/changelog Wed Jun 30 12:43:28 2010 +0200
+++ b/geom/debian/changelog Wed Jun 30 14:21:04 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-geom (0.18.1-20100630) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 30 Jun 2010 14:10:36 +0200
+
monetdb-geom (0.18.1-20100625) unstable; urgency=low
* Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec Wed Jun 30 12:43:28 2010 +0200
+++ b/pathfinder/MonetDB-XQuery.spec Wed Jun 30 14:21:04 2010 +0200
@@ -138,6 +138,9 @@
%{_bindir}/monetdb-xquery-config
%changelog
+* Wed Jun 30 2010 Sjoerd Mullender <[email protected]> - 0.38.1-20100630
+- Rebuilt.
+
* Fri Jun 25 2010 Sjoerd Mullender <[email protected]> - 0.38.1-20100625
- Rebuilt.
diff -r e1dfe2841627 -r 40561ccb45ce
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Wed Jun
30 12:43:28 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Wed Jun
30 14:21:04 2010 +0200
@@ -4246,14 +4246,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB4"
- "ProductCode" = "8:{D288557E-4374-4358-AC97-48C846514826}"
- "PackageCode" = "8:{C8C66D9C-0E2C-42A8-8A5C-DD5AD2221345}"
+ "ProductCode" = "8:{F49EF5E9-4562-4AEC-90B7-8658E01E25FB}"
+ "PackageCode" = "8:{286E0413-7780-40C1-BE92-CEB6882233A4}"
"UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
