Changeset: ddb6e59e963b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddb6e59e963b Modified Files: monetdb5/modules/mal/Makefile.ag sql/server/sql_mvc.c Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 18375 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -444,3 +444,5 @@ 1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3 c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_root +dbf80a87be87b463e6603221e0ed6e31d85d94c3 Apr2011_5 +bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_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-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -587,6 +587,59 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Wed Jul 20 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- Rebuilt. + +* Tue Jul 19 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720 +- sql: Fixed regression where the superuser password could no longer be + changed, bug #2844 + +* Wed Jul 13 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- buildtools: We can now build RPMs on CentOS 6.0. Since there is no geos library + on CentOS, we do not support the geom modules there. + +* Sat Jul 9 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- gdk: Fixed a problem where appending string BATs could cause enormous growth + of the string heap. This fixes bug 2820. + +* Fri Jul 8 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720 +- java: Return false from Statement.getMoreResults() instead of a + NullPointerException when no query has been performed on the Statement + yet, bug #2833 + +* Fri Jul 1 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720 +- clients: Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827 + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- buildtools: We can now also build on Fedora 15. This required some very minor + changes. +- buildtools: Changed configure check for OpenSSL so that we can also build on CentOS + 5.6. We now no longer demand that OpenSSL is at least version 0.9.8f, + but instead we require that the hash functions we need are supported. + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- clients: The separate Python distribution now uses the same version number as + the main package. + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- gdk: Fixes to memory detection on FreeBSD. + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- sql: Fixed incorrect insert counts. +- sql: Fixed bug 2823: MAL exeption on SQL query with subquery in the where + part. +- sql: Redirect error from create scripts back to the first client. This + fixes bug 2813. +- sql: Added joinidx based semijoin; push join through union (using + joinidx). +- sql: Fixed pushing select down. + +* Mon Jun 6 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720 +- java: Fixed read-only interpretation. Connection.isReadOnly now always + returns false, setReadOnly now generates a warning when called with + true. Partly from bug #2818 +- java: Allow readonly to be set when autocommit is disabled as well. Bug #2818 + * Tue May 17 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517 - Rebuilt. diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -15,12 +15,36 @@ { "Entry" { + "MsmKey" = "8:_01F58A57152744E4B63B585C71D11F07" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_02CF5E25BEE54F778151C0945D00A00A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_04254233029E45F19A14C08AD768A78E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_05190747250740A891E1ADC63ECE98E5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -33,7 +57,7 @@ } "Entry" { - "MsmKey" = "8:_078B5C45D57D4BB399500E6ED4BD4235" + "MsmKey" = "8:_0649DE636E8E4B51839FA05ED3F28173" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -45,19 +69,19 @@ } "Entry" { + "MsmKey" = "8:_07D64592E03F4084B82BEE5879CC2D5F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0805F6E64C7046AF97DC8817EC3BC77D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_08B502996EF54B4EB8CAB596962DF51A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0D3B4BD4C61849AE94E755DF092F34F0" + "MsmKey" = "8:_09106CBE3E1D4B57AA54653A4011E25A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -69,13 +93,25 @@ } "Entry" { - "MsmKey" = "8:_0E7193833B6842D5827D775A5B0413F2" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1031404DCB744EEFB91F51B19DF12D10" + "MsmKey" = "8:_1032EC592CE548D7932FCD49C957C565" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_119D4EB28D814E5593C11C64D481CC1B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_130F6E389F1B44FBB8AC1F99A12AAA2F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13351DAE06DF4C81B9D28B5DC3D402A7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -87,37 +123,13 @@ } "Entry" { - "MsmKey" = "8:_13D007313C0C496DAC2C22C28BC00F58" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1583174A1A6E49108814CEA1DCF222D9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_15AB1B1FC4BB48A3A8BBC9AF3E03047F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1692D18F915A4BA787D1E1D5FCC97DD5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_16BE85BCAE3745C4AFEAB3F61F37FB2B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_173AE214173C4A24ACA0A2282F43479B" + "MsmKey" = "8:_14CFF10DEACD4ADA83C08AA543373293" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_14D0778EF0104D1E80F0388C2990FD5D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -129,25 +141,37 @@ } "Entry" { + "MsmKey" = "8:_1ACBD1FC806447D4B5F0B1C5134413C1" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1AF238588D2D4EA5A416D48291406811" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1C13614EA6074DA6BBC868B4CF04D653" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1C2698EEAF2D4A8BA66BB2B2543852AB" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1D97C8A942184D019CCF284C6ED4C18D" + "MsmKey" = "8:_1C5AFF75F3004FE98F966BC3BC49F9C4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1CF476F18AF84DC19E62436635B95595" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1E2F13D358D14A82AB841ABABD810697" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1E7AFD9A211E45FDAC5CE09BD9BD68B4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -165,7 +189,31 @@ } "Entry" { - "MsmKey" = "8:_2305ABCB8B134AB6ABA9FE53D2ADF7EC" + "MsmKey" = "8:_2214BDD91F7D4BC49CAC1A16C6876458" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_225FA2D3C59A41249F1164342918D68A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
