Changeset: 82dd4e2b28c4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82dd4e2b28c4
Added Files:
sql/backends/monet5/Tests/rapi14.sql
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out
sql/test/Users/Tests/changePasswordUser.SQL.py
sql/test/Users/Tests/changePasswordUser.stable.err
sql/test/Users/Tests/changePasswordUser.stable.out
sql/test/Users/Tests/changeSchemaUser.SQL.py
sql/test/Users/Tests/changeSchemaUser.stable.err
sql/test/Users/Tests/changeSchemaUser.stable.out
sql/test/Users/Tests/createSetUp.sql.src
sql/test/Users/Tests/createSetUp.stable.err
sql/test/Users/Tests/createSetUp.stable.out
sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py
sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.stable.err
sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.stable.out
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.out
sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
sql/test/Users/Tests/grantRole.Bug-3772.stable.err
sql/test/Users/Tests/grantRole.Bug-3772.stable.out
sql/test/Users/Tests/renameUser.SQL.py
sql/test/Users/Tests/renameUser.stable.err
sql/test/Users/Tests/renameUser.stable.out
sql/test/Users/Tests/role.SQL.py
sql/test/Users/Tests/role.stable.err
sql/test/Users/Tests/role.stable.out
sql/test/Users/createSetUp.sql
Removed Files:
sql/scripts/19_cluster.sql
Modified Files:
MonetDB.spec
clients/R/Tests/dplyr-flights.stable.err
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/mapiclient/mclient.1
clients/mapiclient/msqldump.1
common/utils/msabaoth.c
debian/control
java/ChangeLog.Jul2015
java/build.xml
monetdb5/extras/rapi/Tests/rapi02.malC
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/extras/rapi/rapi.c
sql/backends/monet5/sql_upgrades.c
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/27_rejects.sql
sql/server/rel_select.c
sql/server/sql_mvc.c
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker-2015/Tests/All
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/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Dependencies/dependency_owner_schema_3.sql
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/All
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/process.py
Branch: HTM
Log Message:
Merge with default branch
diffs (truncated from 6978 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -135,6 +135,12 @@ BuildRequires: samtools-devel
BuildRequires: R-core-devel
%endif
+%if (0%{?fedora} >= 22)
+Recommends: %{name}-SQL-server5
+Recommends: MonetDB5-server
+Suggests: %{name}-client
+%endif
+
# need to define python_sitelib on RHEL 5 and older
# no need to define python3_sitelib: it's defined by python3-devel
%if 0%{?rhel} && 0%{?rhel} <= 5
@@ -226,6 +232,9 @@ library.
%package client
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
+%if (0%{?fedora} >= 22)
+Recommends: %{name}-SQL-server5
+%endif
%description client
MonetDB is a database management system that is developed from a
@@ -588,6 +597,11 @@ Group: Applications/Databases
Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
+%if (0%{?fedora} >= 22)
+Recommends: %{name}-SQL-server5
+Recommends: MonetDB5-server-hugeint
+Suggests: %{name}-client
+%endif
%description -n MonetDB5-server
MonetDB is a database management system that is developed from a
@@ -723,6 +737,10 @@ Requires: %{_bindir}/systemd-tmpfiles
%endif
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
+%if (0%{?fedora} >= 22)
+Recommends: %{name}-SQL-server5-hugeint
+Suggests: %{name}-client
+%endif
%description SQL-server5
MonetDB is a database management system that is developed from a
diff --git a/clients/R/Tests/dplyr-flights.stable.err
b/clients/R/Tests/dplyr-flights.stable.err
--- a/clients/R/Tests/dplyr-flights.stable.err
+++ b/clients/R/Tests/dplyr-flights.stable.err
@@ -30,7 +30,7 @@ stderr of test 'dplyr-flights` in direct
# 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588"
# 11:44:05 >
-Identifier(s) year, month, day, hour, minute are reserved SQL keywords and
need to be quoted.
+Identifier(s) year, month, day, hour, minute are reserved SQL keywords and
need(s) to be quoted in queries.
# 11:44:15 >
# 11:44:15 > "Done."
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1779,7 +1779,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3797 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3799 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 28 "res_0" "oid" 63 0 0 0
2156 28 "arg_1" "wrd" 64 0 1 1
2157 29 "res_0" "oid" 63 0 0 0
@@ -2014,17 +2014,17 @@ 2385 131 "arg_2" "oid" 63 0 1
2
2386 132 "res_0" "month_interval" 32 0 0 0
2387 132 "arg_1" "month_interval" 32 0 1 1
2388 132 "arg_2" "oid" 63 0 1 2
-2389 133 "res_0" "sec_interval" 19 0 0 0
-2390 133 "arg_1" "sec_interval" 19 0 1 1
+2389 133 "res_0" "sec_interval" 13 0 0 0
+2390 133 "arg_1" "sec_interval" 13 0 1 1
2391 133 "arg_2" "oid" 63 0 1 2
-2392 134 "res_0" "sec_interval" 19 0 0 0
-2393 134 "arg_1" "sec_interval" 19 0 1 1
+2392 134 "res_0" "sec_interval" 13 0 0 0
+2393 134 "arg_1" "sec_interval" 13 0 1 1
2394 134 "arg_2" "oid" 63 0 1 2
-2395 135 "res_0" "sec_interval" 19 0 0 0
-2396 135 "arg_1" "sec_interval" 19 0 1 1
+2395 135 "res_0" "sec_interval" 13 0 0 0
+2396 135 "arg_1" "sec_interval" 13 0 1 1
2397 135 "arg_2" "oid" 63 0 1 2
-2398 136 "res_0" "sec_interval" 19 0 0 0
-2399 136 "arg_1" "sec_interval" 19 0 1 1
+2398 136 "res_0" "sec_interval" 13 0 0 0
+2399 136 "arg_1" "sec_interval" 13 0 1 1
2400 136 "arg_2" "oid" 63 0 1 2
2401 137 "res_0" "tinyint" 8 0 0 0
2402 137 "arg_1" "tinyint" 8 0 1 1
@@ -2079,17 +2079,17 @@ 2450 154 "arg_2" "tinyint" 8 0
1 2
2451 155 "res_0" "month_interval" 32 0 0 0
2452 155 "arg_1" "month_interval" 32 0 1 1
2453 155 "arg_2" "tinyint" 8 0 1 2
-2454 156 "res_0" "sec_interval" 19 0 0 0
-2455 156 "arg_1" "sec_interval" 19 0 1 1
+2454 156 "res_0" "sec_interval" 13 0 0 0
+2455 156 "arg_1" "sec_interval" 13 0 1 1
2456 156 "arg_2" "tinyint" 8 0 1 2
-2457 157 "res_0" "sec_interval" 19 0 0 0
-2458 157 "arg_1" "sec_interval" 19 0 1 1
+2457 157 "res_0" "sec_interval" 13 0 0 0
+2458 157 "arg_1" "sec_interval" 13 0 1 1
2459 157 "arg_2" "tinyint" 8 0 1 2
-2460 158 "res_0" "sec_interval" 19 0 0 0
-2461 158 "arg_1" "sec_interval" 19 0 1 1
+2460 158 "res_0" "sec_interval" 13 0 0 0
+2461 158 "arg_1" "sec_interval" 13 0 1 1
2462 158 "arg_2" "tinyint" 8 0 1 2
-2463 159 "res_0" "sec_interval" 19 0 0 0
-2464 159 "arg_1" "sec_interval" 19 0 1 1
+2463 159 "res_0" "sec_interval" 13 0 0 0
+2464 159 "arg_1" "sec_interval" 13 0 1 1
2465 159 "arg_2" "tinyint" 8 0 1 2
2466 160 "res_0" "smallint" 16 0 0 0
2467 160 "arg_1" "smallint" 16 0 1 1
@@ -2144,17 +2144,17 @@ 2515 177 "arg_2" "smallint" 16 0
1 2
2516 178 "res_0" "month_interval" 32 0 0 0
2517 178 "arg_1" "month_interval" 32 0 1 1
2518 178 "arg_2" "smallint" 16 0 1 2
-2519 179 "res_0" "sec_interval" 19 0 0 0
-2520 179 "arg_1" "sec_interval" 19 0 1 1
+2519 179 "res_0" "sec_interval" 13 0 0 0
+2520 179 "arg_1" "sec_interval" 13 0 1 1
2521 179 "arg_2" "smallint" 16 0 1 2
-2522 180 "res_0" "sec_interval" 19 0 0 0
-2523 180 "arg_1" "sec_interval" 19 0 1 1
+2522 180 "res_0" "sec_interval" 13 0 0 0
+2523 180 "arg_1" "sec_interval" 13 0 1 1
2524 180 "arg_2" "smallint" 16 0 1 2
-2525 181 "res_0" "sec_interval" 19 0 0 0
-2526 181 "arg_1" "sec_interval" 19 0 1 1
+2525 181 "res_0" "sec_interval" 13 0 0 0
+2526 181 "arg_1" "sec_interval" 13 0 1 1
2527 181 "arg_2" "smallint" 16 0 1 2
-2528 182 "res_0" "sec_interval" 19 0 0 0
-2529 182 "arg_1" "sec_interval" 19 0 1 1
+2528 182 "res_0" "sec_interval" 13 0 0 0
+2529 182 "arg_1" "sec_interval" 13 0 1 1
2530 182 "arg_2" "smallint" 16 0 1 2
2531 183 "res_0" "int" 32 0 0 0
2532 183 "arg_1" "int" 32 0 1 1
@@ -2209,17 +2209,17 @@ 2580 200 "arg_2" "int" 32 0 1
2
2581 201 "res_0" "month_interval" 32 0 0 0
2582 201 "arg_1" "month_interval" 32 0 1 1
2583 201 "arg_2" "int" 32 0 1 2
-2584 202 "res_0" "sec_interval" 19 0 0 0
-2585 202 "arg_1" "sec_interval" 19 0 1 1
+2584 202 "res_0" "sec_interval" 13 0 0 0
+2585 202 "arg_1" "sec_interval" 13 0 1 1
2586 202 "arg_2" "int" 32 0 1 2
-2587 203 "res_0" "sec_interval" 19 0 0 0
-2588 203 "arg_1" "sec_interval" 19 0 1 1
+2587 203 "res_0" "sec_interval" 13 0 0 0
+2588 203 "arg_1" "sec_interval" 13 0 1 1
2589 203 "arg_2" "int" 32 0 1 2
-2590 204 "res_0" "sec_interval" 19 0 0 0
-2591 204 "arg_1" "sec_interval" 19 0 1 1
+2590 204 "res_0" "sec_interval" 13 0 0 0
+2591 204 "arg_1" "sec_interval" 13 0 1 1
2592 204 "arg_2" "int" 32 0 1 2
-2593 205 "res_0" "sec_interval" 19 0 0 0
-2594 205 "arg_1" "sec_interval" 19 0 1 1
+2593 205 "res_0" "sec_interval" 13 0 0 0
+2594 205 "arg_1" "sec_interval" 13 0 1 1
2595 205 "arg_2" "int" 32 0 1 2
2596 206 "res_0" "bigint" 64 0 0 0
2597 206 "arg_1" "bigint" 64 0 1 1
@@ -2274,17 +2274,17 @@ 2645 223 "arg_2" "bigint" 64 0
1 2
2646 224 "res_0" "month_interval" 32 0 0 0
2647 224 "arg_1" "month_interval" 32 0 1 1
2648 224 "arg_2" "bigint" 64 0 1 2
-2649 225 "res_0" "sec_interval" 19 0 0 0
-2650 225 "arg_1" "sec_interval" 19 0 1 1
+2649 225 "res_0" "sec_interval" 13 0 0 0
+2650 225 "arg_1" "sec_interval" 13 0 1 1
2651 225 "arg_2" "bigint" 64 0 1 2
-2652 226 "res_0" "sec_interval" 19 0 0 0
-2653 226 "arg_1" "sec_interval" 19 0 1 1
+2652 226 "res_0" "sec_interval" 13 0 0 0
+2653 226 "arg_1" "sec_interval" 13 0 1 1
2654 226 "arg_2" "bigint" 64 0 1 2
-2655 227 "res_0" "sec_interval" 19 0 0 0
-2656 227 "arg_1" "sec_interval" 19 0 1 1
+2655 227 "res_0" "sec_interval" 13 0 0 0
+2656 227 "arg_1" "sec_interval" 13 0 1 1
2657 227 "arg_2" "bigint" 64 0 1 2
-2658 228 "res_0" "sec_interval" 19 0 0 0
-2659 228 "arg_1" "sec_interval" 19 0 1 1
+2658 228 "res_0" "sec_interval" 13 0 0 0
+2659 228 "arg_1" "sec_interval" 13 0 1 1
2660 228 "arg_2" "bigint" 64 0 1 2
2661 229 "res_0" "wrd" 64 0 0 0
2662 229 "arg_1" "wrd" 64 0 1 1
@@ -2339,17 +2339,17 @@ 2710 246 "arg_2" "wrd" 64 0 1
2
2711 247 "res_0" "month_interval" 32 0 0 0
2712 247 "arg_1" "month_interval" 32 0 1 1
2713 247 "arg_2" "wrd" 64 0 1 2
-2714 248 "res_0" "sec_interval" 19 0 0 0
-2715 248 "arg_1" "sec_interval" 19 0 1 1
+2714 248 "res_0" "sec_interval" 13 0 0 0
+2715 248 "arg_1" "sec_interval" 13 0 1 1
2716 248 "arg_2" "wrd" 64 0 1 2
-2717 249 "res_0" "sec_interval" 19 0 0 0
-2718 249 "arg_1" "sec_interval" 19 0 1 1
+2717 249 "res_0" "sec_interval" 13 0 0 0
+2718 249 "arg_1" "sec_interval" 13 0 1 1
2719 249 "arg_2" "wrd" 64 0 1 2
-2720 250 "res_0" "sec_interval" 19 0 0 0
-2721 250 "arg_1" "sec_interval" 19 0 1 1
+2720 250 "res_0" "sec_interval" 13 0 0 0
+2721 250 "arg_1" "sec_interval" 13 0 1 1
2722 250 "arg_2" "wrd" 64 0 1 2
-2723 251 "res_0" "sec_interval" 19 0 0 0
-2724 251 "arg_1" "sec_interval" 19 0 1 1
+2723 251 "res_0" "sec_interval" 13 0 0 0
+2724 251 "arg_1" "sec_interval" 13 0 1 1
2725 251 "arg_2" "wrd" 64 0 1 2
2726 252 "res_0" "decimal" 2 0 0 0
2727 252 "arg_1" "decimal" 2 0 1 1
@@ -2404,17 +2404,17 @@ 2775 269 "arg_2" "decimal" 2 0
1 2
2776 270 "res_0" "month_interval" 32 0 0 0
2777 270 "arg_1" "month_interval" 32 0 1 1
2778 270 "arg_2" "decimal" 2 0 1 2
-2779 271 "res_0" "sec_interval" 19 0 0 0
-2780 271 "arg_1" "sec_interval" 19 0 1 1
+2779 271 "res_0" "sec_interval" 13 0 0 0
+2780 271 "arg_1" "sec_interval" 13 0 1 1
2781 271 "arg_2" "decimal" 2 0 1 2
-2782 272 "res_0" "sec_interval" 19 0 0 0
-2783 272 "arg_1" "sec_interval" 19 0 1 1
+2782 272 "res_0" "sec_interval" 13 0 0 0
+2783 272 "arg_1" "sec_interval" 13 0 1 1
2784 272 "arg_2" "decimal" 2 0 1 2
-2785 273 "res_0" "sec_interval" 19 0 0 0
-2786 273 "arg_1" "sec_interval" 19 0 1 1
+2785 273 "res_0" "sec_interval" 13 0 0 0
+2786 273 "arg_1" "sec_interval" 13 0 1 1
2787 273 "arg_2" "decimal" 2 0 1 2
-2788 274 "res_0" "sec_interval" 19 0 0 0
-2789 274 "arg_1" "sec_interval" 19 0 1 1
+2788 274 "res_0" "sec_interval" 13 0 0 0
+2789 274 "arg_1" "sec_interval" 13 0 1 1
2790 274 "arg_2" "decimal" 2 0 1 2
2791 275 "res_0" "decimal" 4 0 0 0
2792 275 "arg_1" "decimal" 4 0 1 1
@@ -2469,17 +2469,17 @@ 2840 292 "arg_2" "decimal" 4 0
1 2
2841 293 "res_0" "month_interval" 32 0 0 0
2842 293 "arg_1" "month_interval" 32 0 1 1
2843 293 "arg_2" "decimal" 4 0 1 2
-2844 294 "res_0" "sec_interval" 19 0 0 0
-2845 294 "arg_1" "sec_interval" 19 0 1 1
+2844 294 "res_0" "sec_interval" 13 0 0 0
+2845 294 "arg_1" "sec_interval" 13 0 1 1
2846 294 "arg_2" "decimal" 4 0 1 2
-2847 295 "res_0" "sec_interval" 19 0 0 0
-2848 295 "arg_1" "sec_interval" 19 0 1 1
+2847 295 "res_0" "sec_interval" 13 0 0 0
+2848 295 "arg_1" "sec_interval" 13 0 1 1
2849 295 "arg_2" "decimal" 4 0 1 2
-2850 296 "res_0" "sec_interval" 19 0 0 0
-2851 296 "arg_1" "sec_interval" 19 0 1 1
+2850 296 "res_0" "sec_interval" 13 0 0 0
+2851 296 "arg_1" "sec_interval" 13 0 1 1
2852 296 "arg_2" "decimal" 4 0 1 2
-2853 297 "res_0" "sec_interval" 19 0 0 0
-2854 297 "arg_1" "sec_interval" 19 0 1 1
+2853 297 "res_0" "sec_interval" 13 0 0 0
+2854 297 "arg_1" "sec_interval" 13 0 1 1
2855 297 "arg_2" "decimal" 4 0 1 2
2856 298 "res_0" "decimal" 9 0 0 0
2857 298 "arg_1" "decimal" 9 0 1 1
@@ -2534,17 +2534,17 @@ 2905 315 "arg_2" "decimal" 9 0
1 2
2906 316 "res_0" "month_interval" 32 0 0 0
2907 316 "arg_1" "month_interval" 32 0 1 1
2908 316 "arg_2" "decimal" 9 0 1 2
-2909 317 "res_0" "sec_interval" 19 0 0 0
-2910 317 "arg_1" "sec_interval" 19 0 1 1
+2909 317 "res_0" "sec_interval" 13 0 0 0
+2910 317 "arg_1" "sec_interval" 13 0 1 1
2911 317 "arg_2" "decimal" 9 0 1 2
-2912 318 "res_0" "sec_interval" 19 0 0 0
-2913 318 "arg_1" "sec_interval" 19 0 1 1
+2912 318 "res_0" "sec_interval" 13 0 0 0
+2913 318 "arg_1" "sec_interval" 13 0 1 1
2914 318 "arg_2" "decimal" 9 0 1 2
-2915 319 "res_0" "sec_interval" 19 0 0 0
-2916 319 "arg_1" "sec_interval" 19 0 1 1
+2915 319 "res_0" "sec_interval" 13 0 0 0
+2916 319 "arg_1" "sec_interval" 13 0 1 1
2917 319 "arg_2" "decimal" 9 0 1 2
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
