Changeset: 29b9d412d266 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29b9d412d266
Added Files:
buildtools/ChangeLog.Jul2012
clients/ChangeLog.Jul2012
gdk/ChangeLog.Jul2012
gdk/gdk_qsort.c
gdk/gdk_qsort_impl.h
gdk/gdk_ssort.c
gdk/gdk_ssort_impl.h
geom/ChangeLog.Jul2012
java/ChangeLog.Jul2012
monetdb5/ChangeLog.Jul2012
monetdb5/extras/jaql/jaqltests/Tests/in.jaql
monetdb5/extras/jaql/jaqltests/Tests/in.stable.err
monetdb5/extras/jaql/jaqltests/Tests/in.stable.out
monetdb5/mal/Tests/performanceTests/tst400h.mal
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_dataflow.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mal_mapi.h
monetdb5/modules/mal/mal_mapi.mal
sql/ChangeLog.Jul2012
sql/backends/monet5/UDF/udf_impl.h
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.err
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/any_null.Bug-2594.sql
sql/test/BugTracker-2012/Tests/any_null.Bug-2594.stable.err
sql/test/BugTracker-2012/Tests/any_null.Bug-2594.stable.out
sql/test/BugTracker-2012/Tests/bug_large-insert-Bug.2960.sql
sql/test/BugTracker-2012/Tests/bug_large-insert-Bug.2960.stable.err
sql/test/BugTracker-2012/Tests/bug_large-insert-Bug.2960.stable.out
sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.sql
sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.err
sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out
sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.sql
sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.stable.err
sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.stable.out
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.sql
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.err
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.out
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err
sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.sql
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.stable.err
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.stable.out
sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.sql
sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.err
sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.out
sql/test/VOC/Tests/median.Bug-3096.sql
sql/test/VOC/Tests/median.Bug-3096.stable.err
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/bugs/Tests/correlated_update_bug.sql
sql/test/bugs/Tests/correlated_update_bug.stable.err
sql/test/bugs/Tests/correlated_update_bug.stable.out
testing/ChangeLog.Jul2012
tools/merovingian/ChangeLog.Jul2012
Removed Files:
gdk/gdk_qsort.mx
gdk/gdk_ssort.mx
monetdb5/mal/mal_interpreter.mx
monetdb5/modules/mal/mal_mapi.mx
monetdb5/modules/mal/tablet_mk.c
monetdb5/modules/mal/tablet_si.c
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
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Apr2012
clients/ChangeLog-Archive
clients/ChangeLog.Apr2012
clients/Tests/exports.stable.out
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/mclient.c
clients/mapiclient/stethoscope.c
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
debian/changelog
debian/rules
gdk/ChangeLog
gdk/ChangeLog-Archive
gdk/ChangeLog.Apr2012
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.mx
gdk/gdk_bbp.mx
gdk/gdk_calc.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_relop.mx
gdk/gdk_search.mx
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_value.c
gdk/libbat.rc
libversions
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltree.h
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/performanceTests/performanceLog
monetdb5/mal/Tests/performanceTests/tst400a.mal
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_resolve.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/url.mx
monetdb5/modules/kernel/batcalc.c
monetdb5/modules/kernel/batcalc.mal
monetdb5/modules/kernel/batcalc.mal.sh
monetdb5/modules/kernel/batmmath.mx
monetdb5/modules/kernel/calc.c
monetdb5/modules/kernel/calc.mal
monetdb5/modules/kernel/calc.mal.sh
monetdb5/modules/kernel/counters.c
monetdb5/modules/kernel/group.mx
monetdb5/modules/kernel/mmath.mx
monetdb5/modules/kernel/status.mx
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/bbp.mx
monetdb5/modules/mal/language.mx
monetdb5/modules/mal/mdb.mx
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet_sql.c
monetdb5/optimizer/opt_centipede.mx
monetdb5/optimizer/opt_groups.mx
monetdb5/optimizer/opt_joinpath.mx
monetdb5/optimizer/opt_multiplex.mx
monetdb5/scheduler/run_octopus.c
monetdb5/scheduler/srvpool.c
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Apr2012
sql/backends/monet5/UDF/Makefile.ag
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/rel.txt
sql/scripts/39_analytics.sql
sql/server/rel_bin.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_atom.h
sql/server/sql_parser.y
sql/server/sql_rel2bin.c
sql/server/sql_statement.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/BATpropcheck_error.SF-1012739.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/quoted_keywords.SF-922288.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/union_limitation.SF-921992.stable.out
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.sql
sql/test/BugTracker-2012/Tests/sticky-precision.Bug-2969.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/coalesce.stable.err.single
sql/test/Tests/systemfunctions.stable.out
sql/test/VOC/Tests/All
sql/test/bugs/Tests/All
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/null/Tests/null_in_case.stable.out
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/insert_queue.sql
sql/test/zones.sql
testing/Mtest.py.in
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Apr2012
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/mserver/mserver5.1
tools/mserver/mserver5.c
vertoo.data
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 32375 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -476,3 +476,11 @@ e36693f883f56d50da695471b876542755306736
f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release
4702495ed780241f85da16bda9cb8f6bf7cf0a08 Apr2012_1
62f7cc254c8e83e5021d8230ed5b8e62c3793dd8 Apr2012_release
+961301b12e2c230afc5471fefcc3d7af9ab3e98f Apr2012_3
+cbc7f297899d61201e4d5a8cb06ae3aacf070111 Apr2012_SP1_release
+4a6a6523c78992de5d3a1e7a72454250f4964881 Apr2012_5
+cbc7f297899d61201e4d5a8cb06ae3aacf070111 Apr2012_SP1_release
+ebb4a17093e63a199a1d5d27855aa8a31c7e7785 Apr2012_SP1_release
+06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root
+94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
+95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.10.0
+%define version 11.12.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -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/Apr2012/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -658,6 +658,40 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Jun 07 2012 Sjoerd Mullender <[email protected]> - 11.9.7-20120607
+- Rebuilt.
+
+* Wed May 23 2012 Fabian Groffen <[email protected]> - 11.9.7-20120607
+- clients: Resolved a cosmetical error where tab-characters would cause
+ misalignments in tabular result views. For the time being, tabs are
+ now represented as a single space in tabular view.
+
+* Thu May 17 2012 Fabian Groffen <[email protected]> - 11.9.7-20120607
+- gdk: Limit number of detected CPU cores to 16 on 32-bits systems to avoid
+ running quickly out of addressable resources followed by a kill from
+ the OS.
+
+* Wed May 16 2012 Fabian Groffen <[email protected]> - 11.9.5-20120516
+- Rebuilt.
+
+* Tue May 15 2012 Fabian Groffen <[email protected]> - 11.9.5-20120516
+- merovingian: Fixed a bug where connecting to a stopped multiplex-funnel
would result
+ in a 'there are no available connections' error.
+
+* Tue May 15 2012 Sjoerd Mullender <[email protected]> - 11.9.5-20120516
+- sql: Databases that were upgraded from the Aug2011 release have an error
+ in the catalog for SQL procedures. This is now fixed.
+
+* Mon May 14 2012 Fabian Groffen <[email protected]> - 11.9.3-20120514
+- Rebuilt.
+
+* Wed May 2 2012 Sjoerd Mullender <[email protected]> - 11.9.3-20120514
+- buildtools: Windows: we now use OpenSSL 1.0.1b.
+
+* Fri Apr 27 2012 Fabian Groffen <[email protected]> - 11.9.3-20120514
+- gdk: Implemented MT_getrss for Mac OS X systems, this allows the server to
+ know about how much memory is currently in use.
+
* Wed Apr 18 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
- Rebuilt.
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2879,7 +2879,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3739,7 +3739,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5343,7 +5343,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.10.0"
+ "Name" = "8:MonetDB-SQL-11.12.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5393,7 +5393,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2839,7 +2839,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3919,7 +3919,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5343,7 +5343,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.10.0"
+ "Name" = "8:MonetDB-SQL-11.12.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5393,7 +5393,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.10.0"
+ "ProductVersion" = "8:11.12.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -728,13 +728,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.10.0"
+#define PACKAGE_STRING "MonetDB 11.12.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.10.0"
+#define PACKAGE_VERSION "11.12.0"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.10.0
+VERSION=11.12.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Thu Apr 19 2012 Sjoerd Mullender <[email protected]>
-- Split the MonetDB-client-ruby RPM package into two and named them in
- accordance with the Fedora packaging guidelines as rubygem-<gem-name>.
-
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed May 2 2012 Sjoerd Mullender <[email protected]> - 11.9.3-20120514
+- Windows: we now use OpenSSL 1.0.1b.
+
* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
- Fixed some of the package names for Debian/Ubuntu. Packages for
libraries should contain the major number of the library version number.
diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012
--- a/buildtools/ChangeLog.Apr2012
+++ b/buildtools/ChangeLog.Apr2012
@@ -1,6 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Wed May 2 2012 Sjoerd Mullender <[email protected]>
-- Windows: we now use OpenSSL 1.0.1b.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Jul2012
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Jul2012
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog.Jul2012
@@ -1,6 +1,9 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Jun 5 2012 Sjoerd Mullender <[email protected]>
+- Removed --enable-bits option from configure.
+
* Thu Apr 19 2012 Sjoerd Mullender <[email protected]>
- Split the MonetDB-client-ruby RPM package into two and named them in
accordance with the Fedora packaging guidelines as rubygem-<gem-name>.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed May 23 2012 Fabian Groffen <[email protected]> - 11.9.7-20120607
+- Resolved a cosmetical error where tab-characters would cause
+ misalignments in tabular result views. For the time being, tabs are
+ now represented as a single space in tabular view.
+
* Fri Mar 9 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
- ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute.
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jul2012
copy from clients/ChangeLog
copy to clients/ChangeLog.Jul2012
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
