Changeset: 3b5d54ff69f7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b5d54ff69f7 Modified Files: buildtools/conf/mock/fedora-13-i386-monetdb.cfg buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg buildtools/conf/mock/fedora-14-i386-monetdb.cfg buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg buildtools/conf/mock/logging.ini buildtools/conf/mock/site-defaults.cfg configure.ag gdk/Makefile.ag sql/backends/monet5/vaults/fits.c Branch: headless Log Message:
Merge with default branch. diffs (truncated from 974 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -434,3 +434,4 @@ 491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1 be8749b7640878f829575ef9daa995810d6fe25d Oct2010_3 3dc7b6687e454fc31ce9d3887aa01e457de4e9f2 Mar2011_root +e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 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/Oct2010/%{name}-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Mar2011/%{name}-%{version}.tar.gz BuildRequires: bison BuildRequires: bzip2-devel @@ -574,6 +574,76 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Mar 17 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317 +- Rebuilt. + +* Tue Mar 15 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- geom: Set endianness for wkb en/decoding. + +* Sat Mar 05 2011 Stefan de Konink <[email protected]> - 11.1.1-20110317 +- monetdb5: sphinx module: update, adding limit/max_results support + +* Mon Feb 14 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317 +- clients: Fixed bug 2677: SQL_DESC_OCTET_LENGTH should give the size in bytes + required to copy the data. + +* Mon Jan 24 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Disable timer functionality for non-XQuery languages since it is + incorrect, bug #2705 + +* Mon Jan 24 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- sql: Fix bug #2648, do not allow restarting a sequence with NULL via the + result of a sub-query. + +* Fri Jan 14 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- gdk: MonetDB/src/gdk was moved to gdk + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Added mapi_get_uri function to retrieve mapi URI for the connection + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- merovingian: Allow use of globs with all commands that accept database names as + their parameters + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- java: PreparedStatements now free the server-side resources attached to them + when closed. This implements bug #2720 + +* Tue Jan 4 2011 Niels Nes <[email protected]> - 11.1.1-20110317 +- sql: Allow clients to release prepared handles using Xrelease commands + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Allow to dump table data using INSERT INTO statements, rather than COPY + INTO + CSV data using the -N/--inserts flag of mclient and msqldump. + Bug #2727 + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Added support for \dn to list schemas or describe a specific one + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Added support for \df to list functions or describe a specific one +- clients: Added support for \ds to list sequences or describe a specific one + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: Added support for wildcards * and ? in object names given to \d + commands, such that pattern matching is possible, e.g. \d my* +- clients: Added support for \dS that lists also system tables + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- clients: object names given to \d are now lowercased, unless quoted by either + single or double quotes +- clients: Strip any trailing whitespace with the \d command + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- merovingian: merovingian has been renamed into monetdbd. Internally, monetdbd keeps + referring to merovingian for e.g. settings and logfiles. Merovingian + has been renamed to make the process more recognisable as part of the + MonetDB suite. + +* Tue Jan 4 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 +- monetdb5: Improve the performance of remote.put for BAT arguments. The put + speed is now roughly equal to the speed of get on a BAT. + * Tue Jan 4 2011 Sjoerd Mullender <[email protected]> - 11.0.0-0 - Created top-level bootstrap/configure/make with new version numbers. diff --git a/buildtools/conf/Makefile.ag b/buildtools/conf/Makefile.ag --- a/buildtools/conf/Makefile.ag +++ b/buildtools/conf/Makefile.ag @@ -51,5 +51,3 @@ } EXTRA_DIST = rules.mk - -EXTRA_DIST_DIR = mock diff --git a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg b/buildtools/conf/mock/fedora-13-i386-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg +++ /dev/null @@ -1,44 +0,0 @@ -config_opts['root'] = 'fedora-13-i386' -config_opts['target_arch'] = 'i686' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=i386 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=i386 -failovermethod=priority - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/i386/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/13/i386/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg b/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg +++ /dev/null @@ -1,48 +0,0 @@ -config_opts['root'] = 'fedora-13-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 -# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64 -failovermethod=priority - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/x86_64/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/13/x86_64/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-14-i386-monetdb.cfg b/buildtools/conf/mock/fedora-14-i386-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-14-i386-monetdb.cfg +++ /dev/null @@ -1,47 +0,0 @@ -config_opts['root'] = 'fedora-14-i386' -config_opts['target_arch'] = 'i686' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386 -failovermethod=priority -enabled=0 - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/i386/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/14/i386/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg b/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg +++ /dev/null @@ -1,51 +0,0 @@ -config_opts['root'] = 'fedora-14-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 -# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64 -failovermethod=priority -enabled=0 - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
