Changeset: dbfb7e1d30bc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbfb7e1d30bc Added Files: gdk/gdk_atoms.c gdk/gdk_atoms.h Removed Files: buildtools/ChangeLog.Dec2011 clients/ChangeLog.Dec2011 gdk/ChangeLog.Dec2011 gdk/gdk_atoms.mx geom/ChangeLog.Dec2011 java/ChangeLog.Dec2011 monetdb5/ChangeLog.Dec2011 sql/ChangeLog.Dec2011 testing/ChangeLog.Dec2011 tools/merovingian/ChangeLog.Dec2011 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/ChangeLog-Archive clients/ChangeLog.Apr2012 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py clients/ruby/Makefile.ag clients/ruby/adapter/Makefile.ag common/stream/stream.c configure.ag debian/changelog debian/control debian/monetdb-client-testing.install debian/monetdb5-server.install gdk/ChangeLog-Archive gdk/ChangeLog.Apr2012 gdk/Makefile.ag gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Apr2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Apr2012 monetdb5/extras/jaql/Tests/plan01.stable.out monetdb5/extras/jaql/jaql.c monetdb5/extras/jaql/jaqlscenario.c monetdb5/extras/jaql/jaqltree.h monetdb5/extras/jaql/parser/jaql.l monetdb5/extras/jaql/parser/jaql.y monetdb5/tests/gdkTests/Tests/casts.stable.out monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64 monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64 monetdb5/tests/gdkTests/Tests/casts.stable.out.oid64 monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/udf.c sql/backends/monet5/sql.mx sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out testing/Mfilter.py.in tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Apr2012 vertoo.data Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 3798 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -474,3 +474,5 @@ f47248f30989933b245a4d6f2e31a9e443f1078b ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root e36693f883f56d50da695471b876542755306736 Dec2011_9 f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release +4702495ed780241f85da16bda9cb8f6bf7cf0a08 Apr2012_1 +62f7cc254c8e83e5021d8230ed5b8e62c3793dd8 Apr2012_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2012/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -48,6 +48,7 @@ BuildRequires: python BuildRequires: readline-devel BuildRequires: ruby BuildRequires: rubygems +BuildRequires: rubygems-devel BuildRequires: unixODBC-devel BuildRequires: zlib-devel @@ -57,8 +58,7 @@ Obsoletes: %{name}-devel %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %endif -%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)} %description MonetDB is a database management system that is developed from a @@ -261,16 +261,16 @@ program. %files client-ruby %defattr(-,root,root) -%docdir %{gemdir}/doc/activerecord-monetdb-adapter-0.1 -%docdir %{gemdir}/doc/ruby-monetdb-sql-0.1 -%{gemdir}/doc/activerecord-monetdb-adapter-0.1/* -%{gemdir}/doc/ruby-monetdb-sql-0.1/* -%{gemdir}/cache/*.gem -# %dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1 -# %dir %{gemdir}/gems/ruby-monetdb-sql-0.1 -%{gemdir}/gems/activerecord-monetdb-adapter-0.1 -%{gemdir}/gems/ruby-monetdb-sql-0.1 -%{gemdir}/specifications/*.gemspec +%docdir %{gem_dir}/doc/activerecord-monetdb-adapter-0.1 +%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.1 +%{gem_dir}/doc/activerecord-monetdb-adapter-0.1/* +%{gem_dir}/doc/ruby-monetdb-sql-0.1/* +%{gem_dir}/cache/*.gem +# %dir %{gem_dir}/gems/activerecord-monetdb-adapter-0.1 +# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.1 +%{gem_dir}/gems/activerecord-monetdb-adapter-0.1 +%{gem_dir}/gems/ruby-monetdb-sql-0.1 +%{gem_dir}/specifications/*.gemspec %package client-tests Summary: MonetDB Client tests package @@ -295,6 +295,7 @@ developer. %files client-tests %defattr(-,root,root) +%{_bindir}/arraytest %{_bindir}/odbcsample1 %{_bindir}/sample0 %{_bindir}/sample1 @@ -391,6 +392,7 @@ fi %{_libdir}/monetdb5/autoload/*_vault.mal %{_libdir}/monetdb5/autoload/*_lsst.mal %{_libdir}/monetdb5/autoload/*_udf.mal +%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal %if %{?centos:0}%{!?centos:1} %exclude %{_libdir}/monetdb5/lib_geom.so %endif @@ -587,6 +589,7 @@ developer, but if you do want to test, t --with-python=yes \ --with-readline=yes \ --with-rubygem=yes \ + --with-rubygem-dir="%{gem_dir}" \ --with-sphinxclient=no \ --with-unixodbc=yes \ --with-valgrind=no \ @@ -626,6 +629,35 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Apr 18 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- Rebuilt. + +* Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.9.1-20120418 +- merovingian: The logfile and pidfile monetdbd properties are now displayed with + dbfarm path when relative + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- clients: ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- clients: mclient now has a -a (--autocommit) option to turn off autocommit mode. + +* Mon Mar 12 2012 Wouter Alink <[email protected]> - 11.9.1-20120418 +- java: Password reading by JdbcClient no longer results in strange artifacts +- java: JdbcClient now returns exit code 1 in case of failures + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- gdk: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- monetdb5: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + * Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.7.9-20120312 - Rebuilt. diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011 deleted file mode 100644 --- a/buildtools/ChangeLog.Dec2011 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Mar 9 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. + +* Tue Mar 6 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- mclient now has a -a (--autocommit) option to turn off autocommit mode. + * Wed Dec 7 2011 Fabian Groffen <[email protected]> - 11.7.1-20120111 - Fix making connections with stethoscope to hosts without monetdbd. Bug #2944. diff --git a/clients/ChangeLog.Apr2012 b/clients/ChangeLog.Apr2012 --- a/clients/ChangeLog.Apr2012 +++ b/clients/ChangeLog.Apr2012 @@ -1,9 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Fri Mar 9 2012 Sjoerd Mullender <[email protected]> -- ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. - -* Tue Mar 6 2012 Sjoerd Mullender <[email protected]> -- mclient now has a -a (--autocommit) option to turn off autocommit mode. - diff --git a/clients/ChangeLog.Dec2011 b/clients/ChangeLog.Dec2011 deleted file mode 100644 --- a/clients/ChangeLog.Dec2011 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/ruby/Makefile.ag b/clients/ruby/Makefile.ag --- a/clients/ruby/Makefile.ag +++ b/clients/ruby/Makefile.ag @@ -19,7 +19,7 @@ SUBDIRS = adapter gem_monetdb = { FILES = ruby-monetdb-sql-0.1.gemspec - DIR = $(prefix)/$(RUBY_DIR) + DIR = $(RUBY_DIR) } EXTRA_DIST = Changelog README TODO ruby-monetdb-sql-0.1.gemspec diff --git a/clients/ruby/adapter/Makefile.ag b/clients/ruby/adapter/Makefile.ag --- a/clients/ruby/adapter/Makefile.ag +++ b/clients/ruby/adapter/Makefile.ag @@ -17,7 +17,7 @@ gem_adapter = { FILES = activerecord-monetdb-adapter-0.1.gemspec - DIR = $(prefix)/$(RUBY_DIR) + DIR = $(RUBY_DIR) } EXTRA_DIST = activerecord-monetdb-adapter-0.1.gemspec diff --git a/common/stream/stream.c b/common/stream/stream.c --- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -1336,7 +1336,8 @@ open_urlstream(const char *url) #else stream *open_urlstream(const char *url) { - (void) url; + if (url != NULL && strncmp(url, "file://", sizeof("file://") - 1) == 0) + return open_rastream(url + sizeof("file://") - 1); return NULL; } #endif /* HAVE_CURL */ diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1370,6 +1370,13 @@ case "$have_rubygem_dir" in RUBY_DIR="$have_rubygem_dir" ;; esac +case "$RUBY_DIR" in +${prefix}/*) + RUBY_DIR="\${prefix}`echo "$RUBY_DIR" | sed "s|^$prefix||"`";; +/*) ;; +*) + RUBY_DIR="\${prefix}/$RUBY_DIR";; +esac AC_SUBST(RUBY_DIR) RUBYGEM=gem diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,53 @@ +monetdb (11.9.1-20120418) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 18 Apr 2012 09:48:42 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * merovingian: The logfile and pidfile monetdbd properties are now displayed with + dbfarm path when relative + + -- Fabian Groffen <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * clients: ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. + + -- Sjoerd Mullender <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * clients: mclient now has a -a (--autocommit) option to turn off autocommit mode. + + -- Sjoerd Mullender <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * java: Password reading by JdbcClient no longer results in strange artifacts + * java: JdbcClient now returns exit code 1 in case of failures + + -- Wouter Alink <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * gdk: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + + -- Sjoerd Mullender <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + +monetdb (11.9.1-20120418) unstable; urgency=low + + * monetdb5: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + + -- Sjoerd Mullender <[email protected]> Mon, 12 Mar 2012 09:48:40 +0200 + monetdb (11.7.9-20120312) unstable; urgency=low * Rebuilt. diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: MonetDB BV <[email protected] Homepage: http://www.monetdb.org/ Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/ Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/ -Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libreadline5-dev, libssl-dev, libxml2-dev, perl, python, ruby, rubygems, unixodbc-dev, uuid-dev, zlib1g-dev +Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libreadline-gplv2-dev, libssl-dev, libxml2-dev, perl, python, ruby, rubygems, unixodbc-dev, uuid-dev, zlib1g-dev # Build-Depends: libraptor1-dev Standards-Version: 3.8.0 diff --git a/debian/monetdb-client-testing.install b/debian/monetdb-client-testing.install --- a/debian/monetdb-client-testing.install +++ b/debian/monetdb-client-testing.install @@ -1,3 +1,4 @@ +debian/tmp/usr/bin/arraytest usr/bin debian/tmp/usr/bin/odbcsample1 usr/bin _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
