Changeset: 2f783f70cb3b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f783f70cb3b Modified Files: NT/monetdb_config.h.in configure.ag monetdb5/modules/mal/cbp.c monetdb5/modules/mal/cbp.mal sql/backends/monet5/sql.mx sql/backends/monet5/sql_result.mx sql/backends/monet5/sql_scenario.c Branch: headless Log Message:
Merge with default branch. diffs (truncated from 18645 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -459,3 +459,5 @@ 477cc2a87348df99b4eab237501d1113e5cb21d8 5ab2786b8f740c3e9fd1578605cec2bcd7725bc2 Aug2011_7 477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_release f022d32377c51b00599ecb014a72ea7ea2d6b8ba Aug2011_SP2_release +0e42a9ccf4c65e301f76c721ea84e976de6ede84 Aug2011_9 +95911663ea9e3823837168d3f64328360aaf061a Aug2011_SP3_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/Aug2011-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Aug2011-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -625,6 +625,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Nov 15 2011 Sjoerd Mullender <[email protected]> - 11.5.9-20111115 +- Rebuilt. + +* Sun Nov 6 2011 Fabian Groffen <[email protected]> - 11.5.9-20111115 +- merovingian: Fixed a bug where monetdbd's socket files from /tmp were removed when + a second monetdbd was attempted to be started using the same port. + +* Wed Oct 26 2011 Fabian Groffen <[email protected]> - 11.5.9-20111115 +- sql: Added a fix for bug #2834, which caused weird (failing) behaviour + with PreparedStatements. + * Fri Oct 21 2011 Sjoerd Mullender <[email protected]> - 11.5.7-20111021 - 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,31 +15,19 @@ { "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" + "MsmKey" = "8:_03B75A027AE64CD6A02720659BD3C362" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0589C6F724D0421C9C909F12DA19B36A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -57,31 +45,31 @@ } "Entry" { - "MsmKey" = "8:_0649DE636E8E4B51839FA05ED3F28173" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_07BF8A96B6E14409912BCC730E25C25C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_07D64592E03F4084B82BEE5879CC2D5F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0805F6E64C7046AF97DC8817EC3BC77D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_09106CBE3E1D4B57AA54653A4011E25A" + "MsmKey" = "8:_0629084AD55F45E68F61C23D1DE3973D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0664690FB4A2404CB955249DE09B06CF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_083F00FFC47943FBB0CCF0732224E356" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_097F3173DEB845F0998FCE5A271A4172" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_098B2F0F79864EABA37FAB89DFBAF9ED" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -93,25 +81,7 @@ } "Entry" { - "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" + "MsmKey" = "8:_0F6F78A51A25478E8B515B0F145D4C3D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -123,25 +93,25 @@ } "Entry" { - "MsmKey" = "8:_14CFF10DEACD4ADA83C08AA543373293" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_14D0778EF0104D1E80F0388C2990FD5D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1AB1400754D546928D779D2D9F9BBFF3" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1ACBD1FC806447D4B5F0B1C5134413C1" + "MsmKey" = "8:_144EA75F7F914531AE61E861C77748D9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_14F533032E1244EBB5E5124FBC5F8351" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_15E2F9C224BC494DBFDBDC5F2240C5B8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1A7CAF67452442EAAF431607DFE349C6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -153,25 +123,31 @@ } "Entry" { - "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" + "MsmKey" = "8:_1B114BD53DC940A18B5DE9857493DB61" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1B77C60FBDE542DC8D16D828ABA210DF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1CEA949308354E9F9C3A8AD29AC6C6D8" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1E80BC799FF44127BE32F37A3BBC82DE" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1E85594288D74AB9A42AEB84C878C0D3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -183,37 +159,19 @@ } "Entry" { + "MsmKey" = "8:_20D37B4660DB4235841D507F0F6EC928" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_210ACB4F1EA444B4B72F5B60E9953FEE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_210BCA0AA09841FE9092AFB500938341" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2214BDD91F7D4BC49CAC1A16C6876458" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_233C1F91A3B646DFA94BA3711DB3F93B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_23D4F0E6E6F84C10A588F5D7C5D1DD0A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
