Changeset: a98515572a95 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a98515572a95 Added Files: buildtools/ChangeLog.Feb2013 clients/ChangeLog.Feb2013 debian/libmonetdb-client6.install debian/libmonetdb8.install gdk/ChangeLog.Feb2013 geom/ChangeLog.Feb2013 java/ChangeLog.Feb2013 java/src/nl/cwi/monetdb/jdbc/types/INET.java java/src/nl/cwi/monetdb/jdbc/types/URL.java java/tests/Test_PSmetadata.java java/tests/Test_PSsqldata.java java/tests/Test_Rsqldata.java monetdb5/ChangeLog.Feb2013 monetdb5/modules/kernel/aggr.mal.sh monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_matpack.h monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.mal monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.malC monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.err monetdb5/tests/BugTracker/Tests/stdev.Bug-3178.stable.out sql/ChangeLog.Feb2013 sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh sql/jdbc/tests/Tests/Test_PSmetadata.stable.err sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/jdbc/tests/Tests/Test_PSsqldata.SQL.bat sql/jdbc/tests/Tests/Test_PSsqldata.SQL.sh sql/jdbc/tests/Tests/Test_PSsqldata.stable.err sql/jdbc/tests/Tests/Test_PSsqldata.stable.out sql/jdbc/tests/Tests/Test_Rsqldata.SQL.bat sql/jdbc/tests/Tests/Test_Rsqldata.SQL.sh sql/jdbc/tests/Tests/Test_Rsqldata.stable.err sql/jdbc/tests/Tests/Test_Rsqldata.stable.out sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.sql sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.err sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.sql sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.err sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out sql/test/BugTracker-2012/Tests/conditions_when_for_triggers_do_not_work.Bug-2073.sql sql/test/BugTracker-2012/Tests/conditions_when_for_triggers_do_not_work.Bug-2073.stable.err sql/test/BugTracker-2012/Tests/conditions_when_for_triggers_do_not_work.Bug-2073.stable.out sql/test/BugTracker-2012/Tests/create_function.Bug-3172.sql sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.out sql/test/BugTracker-2012/Tests/create_index_update.Bug-3098.sql sql/test/BugTracker-2012/Tests/create_index_update.Bug-3098.stable.err sql/test/BugTracker-2012/Tests/create_index_update.Bug-3098.stable.out sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.err sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.stable.err sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.stable.out sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.sql sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.sql sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.err sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out sql/test/BugTracker-2012/Tests/insert_gives_39000_program_error.Bug-3097.sql sql/test/BugTracker-2012/Tests/insert_gives_39000_program_error.Bug-3097.stable.err sql/test/BugTracker-2012/Tests/insert_gives_39000_program_error.Bug-3097.stable.out sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.sql sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.err sql/test/BugTracker-2012/Tests/insert_into_table_with_2_foreignkeys.Bug-3124.stable.out sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.sql sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.err sql/test/BugTracker-2012/Tests/join_over_multitable_using_index.Bug-3181.stable.out sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.sql sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.err sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.out sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.stable.err sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.stable.out sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.sql sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.err sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out sql/test/BugTracker-2012/Tests/order_by_on_column_exp.Bug-3193.sql sql/test/BugTracker-2012/Tests/order_by_on_column_exp.Bug-3193.stable.err sql/test/BugTracker-2012/Tests/order_by_on_column_exp.Bug-3193.stable.out sql/test/BugTracker-2012/Tests/overflow-in-list.Bug-3189.sql sql/test/BugTracker-2012/Tests/overflow-in-list.Bug-3189.stable.err sql/test/BugTracker-2012/Tests/overflow-in-list.Bug-3189.stable.out sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.sql sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.err sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.out sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.sql sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.err sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.err sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.sql sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.err sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.sql sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.err sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.err sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.sql sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.out sql/test/BugTracker-2012/Tests/timestamp_minus_date.Bug-2977.sql sql/test/BugTracker-2012/Tests/timestamp_minus_date.Bug-2977.stable.err sql/test/BugTracker-2012/Tests/timestamp_minus_date.Bug-2977.stable.out sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.sql sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.err sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out sql/test/BugTracker-2012/Tests/type_resolution_error_in_SQL_procedural_code.Bug-3143.sql sql/test/BugTracker-2012/Tests/type_resolution_error_in_SQL_procedural_code.Bug-3143.stable.err sql/test/BugTracker-2012/Tests/type_resolution_error_in_SQL_procedural_code.Bug-3143.stable.out sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.sql sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.stable.err sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.stable.out testing/ChangeLog.Feb2013 tools/merovingian/ChangeLog.Feb2013 Removed Files: debian/libmonetdb-client5.install debian/libmonetdb6.install sql/server/rel_bin.c sql/server/rel_bin.h sql/server/sql_rel2bin.c sql/server/sql_rel2bin.h sql/server/sql_statement.c sql/server/sql_statement.h 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/ChangeLog clients/Tests/exports.stable.out clients/mapiclient/Makefile.ag clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/stethoscope--help.stable.err clients/mapiclient/dotmonetdb.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/mapiclient/stethoscope.c clients/mapiclient/tomograph.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/perl/DBD/monetdb.pm clients/perl/Mapi.pm clients/perl/mclient.pl clients/php/lib/php_mapi.inc clients/php/lib/php_monetdb.php clients/python/monetdb/mapi.py clients/python/setup.py clients/python3/monetdb/mapi.py clients/python3/setup.py clients/ruby/lib/MonetDBConnection.rb common/utils/msabaoth.c common/utils/msabaoth.h configure.ag debian/control debian/monetdb-client.install gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_batop.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_private.h gdk/gdk_select.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc java/ChangeLog.Oct2012 java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/nl/cwi/monetdb/client/JMonetDB.java java/src/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java java/src/nl/cwi/monetdb/merovingian/SabaothDB.java java/tests/build.xml monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/run monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_namespace.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/algebra.mx monetdb5/modules/mal/groups.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mat.h monetdb5/modules/mal/mat.mal monetdb5/modules/mal/mdb.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/pqueue.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/Tests/groups00.stable.out monetdb5/optimizer/Tests/mat00.stable.out monetdb5/optimizer/Tests/mat01.stable.out monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/tests/BugTracker/Tests/All monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/18.stable.out sql/benchmarks/viam/Tests/viam.sql sql/benchmarks/viam/Tests/viam.stable.out sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/jdbc/tests/Tests/All sql/scripts/39_analytics.sql sql/server/Makefile.ag sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.h sql/server/rel_select.c sql/server/rel_sequence.h sql/server/rel_updates.h sql/server/sql_env.h sql/server/sql_mvc.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_qc.h sql/server/sql_scan.c sql/server/sql_semantic.c sql/test/ADT2006/Tests/benesamo.stable.out sql/test/ADT2006/Tests/woud.stable.out sql/test/BugDay_2005-11-09_2.9.3/Tests/integer_overflow.SF-1048671.stable.err sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err sql/test/BugTracker-2009/Tests/pow_operator.SF-2812721.sql sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.sql sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.stable.err sql/test/BugTracker-2012/Tests/All 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/string-insert-default-null-crash.Bug-3168.sql sql/test/BugTracker-2012/Tests/string-insert-default-null-crash.Bug-3168.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Tests/marcin1.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/bugs/Tests/in_or_bug.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/rdf/Tests/q2_28_t.stable.out sql/test/rdf/Tests/q3_28_t.stable.out sql/test/rdf/Tests/q4_28_t.stable.out sql/test/rdf/Tests/q6_28_t.stable.out testing/Mfilter.py.in testing/Mtest.py.in testing/README testing/process.py tools/merovingian/ChangeLog tools/merovingian/client/monetdb.1 tools/merovingian/client/monetdb.c tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/utils/utils.c tools/mserver/mserver5.1 tools/mserver/mserver5.c vertoo.data Branch: rdf Log Message:
Merge with default branch diffs (truncated from 36789 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -511,4 +511,8 @@ 525f227382ddb8f5377114d11c3b030865493f42 ======= 55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release +<<<<<<< /export/scratch2/duc/work/MonetRDF/MonetDB-hg/.hgtags >>>>>>> /tmp/.hgtags~other.n2Hc7T +======= +c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root +>>>>>>> /tmp/.hgtags~other.wca4Mz diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.14.0 +%define version 11.16.0 %{!?buildno: %define buildno %(date +%Y%m%d)} # groups of related archs @@ -140,7 +140,6 @@ MonetDB, you will very likely need this %files client %defattr(-,root,root) %{_bindir}/mclient -%{_bindir}/mnc %{_bindir}/msqldump %{_bindir}/stethoscope %{_libdir}/libmapi.so.* 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 @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.14.0" + "ProductVersion" = "8:11.16.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.14.0" + "ProductVersion" = "8:11.16.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 @@ -2303,7 +2303,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.16.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -2943,7 +2943,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.16.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4147,7 +4147,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.14.0" + "Name" = "8:MonetDB-SQL-11.16.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4197,7 +4197,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.14.0" + "ProductVersion" = "8:11.16.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 @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.14.0" + "ProductVersion" = "8:11.16.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.14.0" + "ProductVersion" = "8:11.16.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 @@ -2143,7 +2143,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.16.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -3063,7 +3063,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.16.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4147,7 +4147,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.14.0" + "Name" = "8:MonetDB-SQL-11.16.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4197,7 +4197,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.14.0" + "ProductVersion" = "8:11.16.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 @@ -689,13 +689,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.14.0" +#define PACKAGE_STRING "MonetDB 11.16.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.14.0" +#define PACKAGE_VERSION "11.16.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.14.0 +VERSION=11.16.0 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Feb2013 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Feb2013 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,8 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Wed Nov 7 2012 Sjoerd Mullender <sjo...@acm.org> -- msqldump: Implmented an option (--table/-t) to dump a single table. -- Changed msqdump's trace option to be in line with mclient. In both - cases, the long option is --Xdebug and the short option is -X. - diff --git a/clients/ChangeLog b/clients/ChangeLog.Feb2013 copy from clients/ChangeLog copy to clients/ChangeLog.Feb2013 --- a/clients/ChangeLog +++ b/clients/ChangeLog.Feb2013 @@ -1,6 +1,11 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> +- Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release +- The tool mnc was removed from installations + * Wed Nov 7 2012 Sjoerd Mullender <sjo...@acm.org> - msqldump: Implmented an option (--table/-t) to dump a single table. - Changed msqdump's trace option to be in line with mclient. In both 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 @@ -90,8 +90,12 @@ BAT *BATcalcorcst(BAT *b, const ValRecor BAT *BATcalcrsh(BAT *b1, BAT *b2, BAT *s, int abort_on_error); BAT *BATcalcrshcst(BAT *b, const ValRecord *v, BAT *s, int abort_on_error); BAT *BATcalcsign(BAT *b, BAT *s); +dbl BATcalcstdev_population(dbl *avgp, BAT *b); +dbl BATcalcstdev_sample(dbl *avgp, BAT *b); BAT *BATcalcsub(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error); BAT *BATcalcsubcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); +dbl BATcalcvariance_population(dbl *avgp, BAT *b); +dbl BATcalcvariance_sample(dbl *avgp, BAT *b); BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s); BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s); BAT *BATclear(BAT *b, int force); @@ -124,7 +128,11 @@ BAT *BATgroupmedian(BAT *b, BAT *g, BAT BAT *BATgroupmin(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); BAT *BATgroupprod(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); BAT *BATgroupsize(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); +BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); +BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); +BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); +BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int abort_on_error); BUN BATgrows(BAT *b); BAT *BAThash(BAT *b, BUN masksize); BAT *BAThashjoin(BAT *l, BAT *r, BUN estimate); @@ -621,16 +629,24 @@ str AGGRprod3_lng(bat *retval, bat *bid, str AGGRprod3_sht(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRprod3_wrd(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRsize2(bat *retval, bat *bid, bat *eid); +str AGGRstdev2_dbl(bat *retval, bat *bid, bat *eid); +str AGGRstdev3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); +str AGGRstdevp2_dbl(bat *retval, bat *bid, bat *eid); +str AGGRstdevp3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); str AGGRsubavgcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); +str AGGRsubmax_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); str AGGRsubmaxcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); +str AGGRsubmaxcand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); str AGGRsubmedian(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); str AGGRsubmediancand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); str AGGRsubmin(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); +str AGGRsubmin_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); str AGGRsubmincand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); +str AGGRsubmincand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); str AGGRsubprod_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); str AGGRsubprod_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); str AGGRsubprod_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); @@ -645,6 +661,10 @@ str AGGRsubprodcand_int(bat *retval, bat str AGGRsubprodcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubprodcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubprodcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); +str AGGRsubstdev_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +str AGGRsubstdevcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); +str AGGRsubstdevp_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +str AGGRsubstdevpcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); @@ -659,6 +679,10 @@ str AGGRsubsumcand_int(bat *retval, bat str AGGRsubsumcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); +str AGGRsubvariance_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); +str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int *abort_on_error); +str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils, int *abort_on_error); str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils); str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int *skip_nils); str AGGRsum2_bte(bat *retval, bat *bid, bat *eid); @@ -675,6 +699,10 @@ str AGGRsum3_int(bat *retval, bat *bid, str AGGRsum3_lng(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRsum3_sht(bat *retval, bat *bid, bat *gid, bat *eid); str AGGRsum3_wrd(bat *retval, bat *bid, bat *gid, bat *eid); +str AGGRvariance2_dbl(bat *retval, bat *bid, bat *eid); +str AGGRvariance3_dbl(bat *retval, bat *bid, bat *gid, bat *eid); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list