Changeset: 5c77e1860c32 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c77e1860c32 Modified Files: NT/monetdb_config.h.in configure.ag gdk/gdk_utils.c sql/backends/monet5/sql.mx Branch: headless Log Message:
Merge with default branch. diffs (truncated from 1581 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -441,3 +441,5 @@ 568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1 +1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3 +c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Apr2011/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -577,6 +577,26 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue May 17 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- Rebuilt. + +* Fri May 13 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on +Windows. + +* Wed May 11 2011 Fabian Groffen <[email protected]> - 11.3.3-20110517 +- java: Insertion via PreparedStatement and retrieval via ResultSet of timestamp +and time fields with and without timezones was improved to better +respect timezones, as partly indicated in bug #2781. + +* Wed May 11 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- monetdb5: Fixed a bug in conversion from string to the URL type. The bug was +an incorrect call to free(). + +* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- geom: Fixed various problems so that now all our tests work correctly on +all our testing platforms. + * Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421 - Rebuilt. diff --git a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec --- a/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec +++ b/clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec @@ -13,4 +13,6 @@ s.require_path = 'lib' s.add_dependency(%q<activerecord>, [">= 2.3.2"]) s.add_dependency(%q<ruby-monetdb-sql>, [">= 0.1"]) + # placeholder project to avoid warning about not having a rubyforge_project + s.rubyforge_project = "nowarning" end diff --git a/clients/ruby/ruby-monetdb-sql-0.1.gemspec b/clients/ruby/ruby-monetdb-sql-0.1.gemspec --- a/clients/ruby/ruby-monetdb-sql-0.1.gemspec +++ b/clients/ruby/ruby-monetdb-sql-0.1.gemspec @@ -12,4 +12,6 @@ s.files = ["README", "lib/MonetDB.rb", "lib/MonetDBConnection.rb", "lib/MonetDBData.rb", "lib/MonetDBExceptions.rb", "lib/hasher.rb"] s.has_rdoc = true s.require_path = './lib' + # placeholder project to avoid warning about not having a rubyforge_project + s.rubyforge_project = "nowarning" end diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +monetdb (11.3.3-20110517) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Tue, 17 May 2011 16:45:39 +0200 + +monetdb (11.3.3-20110517) unstable; urgency=low + + * gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on +Windows. + + -- Sjoerd Mullender <[email protected]> Fri, 13 May 2011 16:45:38 +0200 + +monetdb (11.3.3-20110517) unstable; urgency=low + + * java: Insertion via PreparedStatement and retrieval via ResultSet of timestamp +and time fields with and without timezones was improved to better +respect timezones, as partly indicated in bug #2781. + + -- Fabian Groffen <[email protected]> Wed, 11 May 2011 16:45:38 +0200 + +monetdb (11.3.3-20110517) unstable; urgency=low + + * monetdb5: Fixed a bug in conversion from string to the URL type. The bug was +an incorrect call to free(). + + -- Sjoerd Mullender <[email protected]> Wed, 11 May 2011 16:45:38 +0200 + +monetdb (11.3.3-20110517) unstable; urgency=low + + * geom: Fixed various problems so that now all our tests work correctly on +all our testing platforms. + + -- Sjoerd Mullender <[email protected]> Wed, 27 Apr 2011 16:45:38 +0200 + monetdb (11.3.1-20110421) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri May 13 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- Fixed a bug where large files (> 2GB) didn't always get deleted on + Windows. + * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - Fixed bugs in antiselect which gave the incorrect result when upper and lower bound were equal. This bug could be triggered by the SQL diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011 --- a/gdk/ChangeLog.Apr2011 +++ b/gdk/ChangeLog.Apr2011 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Fri May 13 2011 Sjoerd Mullender <[email protected]> -- Fixed a bug where large files (> 2GB) didn't always get deleted on - Windows. - diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -451,8 +451,23 @@ GlobalMemoryStatus(&memStat); _MT_npages = memStat.dwTotalPhys / _MT_pagesize; } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE) - /* FreeBSD, NetBSD, Darwin */ +#elif defined(HAVE_SYS_SYSCTL_H) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE) || defined(HW_PHYSMEM)) +# if SIZEOF_SIZE_T == SIZEOF_INT && defined(HW_PHYSMEM) + /* FreeBSD, NetBSD, OpenBSD, Darwin, 32-bits */ + { + int size = 0; + size_t len = sizeof(size); + int mib[2]; + + /* Everyone should have permission to make this call, + * if we get a failure something is really wrong. */ + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + sysctl(mib, 2, &size, &len, NULL, 0); + _MT_npages = size / _MT_pagesize; + } +# elif defined(HW_MEMSIZE) + /* FreeBSD, NetBSD, Darwin, 64-bits */ { uint64_t size = 0; size_t len = sizeof(size); @@ -463,16 +478,10 @@ mib[0] = CTL_HW; mib[1] = HW_MEMSIZE; sysctl(mib, 2, &size, &len, NULL, 0); -# ifdef SIZEOF_SIZE_T == SIZEOF_INT - /* we can have more memory than a size_t can handle on a 32-bits - * platform, so trim it down, if that is the case */ - if (size > 0xffffffff) - size = 0xffffffff; -# endif _MT_npages = size / _MT_pagesize; } -#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64) - /* OpenBSD */ +# elif defined (HW_PHYSMEM64) + /* OpenBSD, 64-bits */ { int64_t size = 0; size_t len = sizeof(size); @@ -483,14 +492,9 @@ mib[0] = CTL_HW; mib[1] = HW_PHYSMEM64; sysctl(mib, 2, &size, &len, NULL, 0); -# ifdef SIZEOF_SIZE_T == SIZEOF_INT - /* we can have more memory than a size_t can handle on a 32-bits - * platform, so trim it down, if that is the case */ - if (size > 0xffffffff) - size = 0xffffffff; -# endif _MT_npages = size / _MT_pagesize; } +# endif #elif defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) _MT_npages = sysconf(_SC_PHYS_PAGES); #else diff --git a/geom/ChangeLog-Archive b/geom/ChangeLog-Archive --- a/geom/ChangeLog-Archive +++ b/geom/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- Fixed various problems so that now all our tests work correctly on + all our testing platforms. + * Tue Mar 15 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 - Set endianness for wkb en/decoding. diff --git a/geom/ChangeLog.Apr2011 b/geom/ChangeLog.Apr2011 --- a/geom/ChangeLog.Apr2011 +++ b/geom/ChangeLog.Apr2011 @@ -1,7 +1,3 @@ # ChangeLog file for geom # This file is updated with Maddlog -* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> -- Fixed various problems so that now all our tests work correctly on - all our testing platforms. - diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed May 11 2011 Fabian Groffen <[email protected]> - 11.3.3-20110517 +- Insertion via PreparedStatement and retrieval via ResultSet of timestamp + and time fields with and without timezones was improved to better + respect timezones, as partly indicated in bug #2781. + * Tue Apr 5 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 - clarify exception messages for unsupported methods diff --git a/java/ChangeLog.Apr2011 b/java/ChangeLog.Apr2011 --- a/java/ChangeLog.Apr2011 +++ b/java/ChangeLog.Apr2011 @@ -1,8 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Wed May 11 2011 Fabian Groffen <[email protected]> -- Insertion via PreparedStatement and retrieval via ResultSet of timestamp - and time fields with and without timezones was improved to better - respect timezones, as partly indicated in bug #2781. - diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -30,13 +30,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/mutils) -GDK_VERSION=3:0:0 +GDK_VERSION=3:1:0 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=3:0:0 +MAPI_VERSION=3:1:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=7:0:0 +MONETDB5_VERSION=7:1:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=2:0:0 +STREAM_VERSION=2:1:0 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed May 11 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 +- Fixed a bug in conversion from string to the URL type. The bug was + an incorrect call to free(). + * Thu Feb 3 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 - mserver5 no longer reads monetdb5.conf upon startup by default. Use --config=file to have mserver5 read a configuration on startup diff --git a/monetdb5/ChangeLog.Apr2011 b/monetdb5/ChangeLog.Apr2011 --- a/monetdb5/ChangeLog.Apr2011 +++ b/monetdb5/ChangeLog.Apr2011 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Wed May 11 2011 Sjoerd Mullender <[email protected]> -- Fixed a bug in conversion from string to the URL type. The bug was - an incorrect call to free(). - diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx --- a/sql/backends/monet5/sql.mx +++ b/sql/backends/monet5/sql.mx _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
