Changeset: 8362f5e63ffd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8362f5e63ffd Added Files: monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resolve.h sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.sql sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out Removed Files: monetdb5/mal/mal_resolve.mx 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/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py configure.ag debian/changelog gdk/gdk_bat.mx gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Dec2011 libversions monetdb5/mal/Makefile.ag monetdb5/mal/mal_module.c monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/optimizer/Tests/groups00.stable.out monetdb5/optimizer/opt_groups.mx monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_remap.mx monetdb5/tools/libmonetdb5.rc sql/test/BugTracker-2012/Tests/All vertoo.data Branch: sciql Log Message:
Merge with default branch diffs (truncated from 1905 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -472,3 +472,5 @@ 32665cf67d03011ff1fcc2c8e118370c47e5fae6 d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7 f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root +e36693f883f56d50da695471b876542755306736 Dec2011_9 +f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -626,6 +626,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Mon Mar 12 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.9-20120312 +- Rebuilt. + +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- java: Implemented missing Number types support in + PreparedStatement.setObject() + * Fri Feb 24 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.7-20120224 - 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 @@ -99,12 +99,6 @@ } "Entry" { - "MsmKey" = "8:_144EA75F7F914531AE61E861C77748D9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_14F533032E1244EBB5E5124FBC5F8351" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -141,6 +135,12 @@ } "Entry" { + "MsmKey" = "8:_1CA9B74A411F463B9B17EC5EA5C3F65D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1CEA949308354E9F9C3A8AD29AC6C6D8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1563,26 +1563,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_144EA75F7F914531AE61E861C77748D9" - { - "SourcePath" = "8:lib\\monetdb5\\opt_derivepath.mal" - "TargetName" = "8:opt_derivepath.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14F533032E1244EBB5E5124FBC5F8351" { "SourcePath" = "8:lib\\monetdb5\\batxml.mal" @@ -1703,6 +1683,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1CA9B74A411F463B9B17EC5EA5C3F65D" + { + "SourcePath" = "8:lib\\monetdb5\\opt_groups.mal" + "TargetName" = "8:opt_groups.mal" + "Tag" = "8:" + "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1CEA949308354E9F9C3A8AD29AC6C6D8" { "SourcePath" = "8:lib\\monetdb5\\mkey.mal" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -417,7 +417,7 @@ } "Entry" { - "MsmKey" = "8:_56D88A2735E8478BA1FAD87ED15592E3" + "MsmKey" = "8:_565B70022BCB405E9CB242A3FBE5C7D2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -2623,10 +2623,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_56D88A2735E8478BA1FAD87ED15592E3" - { - "SourcePath" = "8:lib\\monetdb5\\opt_derivepath.mal" - "TargetName" = "8:opt_derivepath.mal" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_565B70022BCB405E9CB242A3FBE5C7D2" + { + "SourcePath" = "8:lib\\monetdb5\\opt_groups.mal" + "TargetName" = "8:opt_groups.mal" "Tag" = "8:" "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" "Condition" = "8:" diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -5615,7 +5615,6 @@ int hlbProp; int horiginProp; int hubProp; int idLength(Client cntxt); -int idcmp(str n, str m); str identityRef; str ifthenelseRef; str ilikeselectRef; diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.7.9-20120312) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Mon, 12 Mar 2012 14:32:53 +0100 + +monetdb (11.7.9-20120312) unstable; urgency=low + + * java: Implemented missing Number types support in + PreparedStatement.setObject() + + -- Fabian Groffen <fab...@cwi.nl> Tue, 28 Feb 2012 14:32:53 +0100 + monetdb (11.7.7-20120224) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx --- a/gdk/gdk_bat.mx +++ b/gdk/gdk_bat.mx @@ -3085,8 +3085,8 @@ BATmode(BAT *b, int mode) /* * @+ BATpropcheck * - * This is a low-cost routine that smartly tries to deduce as - * much properties possible on the head column of its BAT parameter. + * This is a low-cost routine that smartly tries to deduce as many + * properties as possible on the head column of its BAT parameter. * * with PROPDEBUG (-d8) enabled, it is also a powerful tool * to check whether all properties of a BAT are set correctly. diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- Implemented missing Number types support in + PreparedStatement.setObject() + * Mon Feb 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 - Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL error when called with catalog and schema argument. diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011 --- a/java/ChangeLog.Dec2011 +++ b/java/ChangeLog.Dec2011 @@ -1,7 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> -- Implemented missing Number types support in - PreparedStatement.setObject() - diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -35,13 +35,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/mutils) -GDK_VERSION=4:4:0 +GDK_VERSION=4:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=5:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=10:3:0 +MONETDB5_VERSION=10:4:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=3:0:0 diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag --- a/monetdb5/mal/Makefile.ag +++ b/monetdb5/mal/Makefile.ag @@ -49,7 +49,7 @@ lib_mal = { mal_properties.c mal_properties.h \ mal_readline.c mal_readline.h \ mal_recycle.c mal_recycle.h \ - mal_resolve.mx \ + mal_resolve.c mal_resolve.h \ mal_sabaoth.c mal_sabaoth.h \ mal_scenario.c mal_scenario.h \ mal_session.c mal_session.h \ diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c --- a/monetdb5/mal/mal_module.c +++ b/monetdb5/mal/mal_module.c @@ -214,12 +214,12 @@ void freeModuleList(Module s){ s=t; } } + /* - * @- - * After filling in a structure it is added to the multi-level - * symbol table. We keep a skip list of similar named function - * symbols. This speeds up searching provided the modules adhire - * to the structure group the functions as well. + * After filling in a structure it is added to the multi-level symbol + * table. We keep a skip list of similarly named function symbols. + * This speeds up searching provided the modules adhere to the + * structure and group the functions as well. */ void insertSymbol(Module scope, Symbol prg){ InstrPtr sig; diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal/mal_resolve.c rename from monetdb5/mal/mal_resolve.mx rename to monetdb5/mal/mal_resolve.c --- a/monetdb5/mal/mal_resolve.mx +++ b/monetdb5/mal/mal_resolve.c @@ -1,23 +1,22 @@ -@/ -The contents of this file are subject to the MonetDB Public License -Version 1.1 (the "License"); you may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://www.monetdb.org/Legal/MonetDBLicense +/* + * The contents of this file are subject to the MonetDB Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.monetdb.org/Legal/MonetDBLicense + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * + * The Original Code is the MonetDB Database System. + * + * The Initial Developer of the Original Code is CWI. + * Portions created by CWI are Copyright (C) 1997-July 2008 CWI. + * Copyright August 2008-2012 MonetDB B.V. + * All Rights Reserved. + */ -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -License for the specific language governing rights and limitations _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
