Changeset: 2cbf7ab29bce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2cbf7ab29bce
Added Files:
common/utils/strptime.c
sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.sql
sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stable.err
sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stable.out
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.sql
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.err
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.out
Removed Files:
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
Modified Files:
.hgignore
MonetDB.spec
NT/Makefile
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/rules.msc
clients/R/MonetDB.R/R/dplyr.R
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Makefile.ag
clients/mapiclient/eventparser.c
clients/mapilib/mapi.c
common/utils/Makefile.ag
configure.ag
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/logger.c
monetdb5/optimizer/opt_pipes.c
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_scenario.c
sql/common/sql_types.c
sql/scripts/99_system.sql
sql/server/sql_mvc.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_logger.h
sql/storage/restrict/restrict_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.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/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-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/perl_dbi.SQL.bat
sql/test/pg_regress/Tests/date.stable.err
sql/test/pg_regress/Tests/time.stable.err
sql/test/pg_regress/Tests/timetz.stable.err
testing/Mtest.py.in
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/argvcmds.h
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/discoveryrunner.h
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/properties.h
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/Makefile.ag
Branch: HTM
Log Message:
Merge with default branch
Resolve a few minor merge conflicts in gdk_logger, bat_logger and sql_mvc
diffs (truncated from 5942 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -91,3 +91,8 @@ NT/sql
NT/testing
NT/tools
NT/unistd.h
+
+syntax: regexp
+^java/build$
+syntax: regexp
+^java/target$
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -901,7 +901,6 @@ developer, but if you do want to test, t
%{configure} \
--enable-assert=no \
- --enable-bits=%{bits} \
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -24,7 +24,6 @@ install: targetdirs all
$(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
$(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
- -if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
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
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
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
@@ -999,7 +999,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
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
@@ -4927,7 +4927,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
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
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
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
@@ -999,7 +999,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -439,7 +439,7 @@ create_winconfig_conds_new_py:
update_winconfig_conds_py: create_winconfig_conds_new_py
if not exist "$(TOPDIR)\winconfig_conds.py" $(CP)
"$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
- C:\cygwin\bin\cmp.exe -s "$(TOPDIR)\winconfig_conds_new.py"
"$(TOPDIR)\winconfig_conds.py" || \
+ cmp -s "$(TOPDIR)\winconfig_conds_new.py"
"$(TOPDIR)\winconfig_conds.py" || \
$(CP) "$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -2062,17 +2062,17 @@ 2391 139 "arg_2" "oid" 63 0 1
2
2392 140 "res_0" "month_interval" 32 0 0 0
2393 140 "arg_1" "month_interval" 32 0 1 1
2394 140 "arg_2" "oid" 63 0 1 2
-2395 141 "res_0" "sec_interval" 19 0 0 0
-2396 141 "arg_1" "sec_interval" 19 0 1 1
+2395 141 "res_0" "sec_interval" 13 0 0 0
+2396 141 "arg_1" "sec_interval" 13 0 1 1
2397 141 "arg_2" "oid" 63 0 1 2
-2398 142 "res_0" "sec_interval" 19 0 0 0
-2399 142 "arg_1" "sec_interval" 19 0 1 1
+2398 142 "res_0" "sec_interval" 13 0 0 0
+2399 142 "arg_1" "sec_interval" 13 0 1 1
2400 142 "arg_2" "oid" 63 0 1 2
-2401 143 "res_0" "sec_interval" 19 0 0 0
-2402 143 "arg_1" "sec_interval" 19 0 1 1
+2401 143 "res_0" "sec_interval" 13 0 0 0
+2402 143 "arg_1" "sec_interval" 13 0 1 1
2403 143 "arg_2" "oid" 63 0 1 2
-2404 144 "res_0" "sec_interval" 19 0 0 0
-2405 144 "arg_1" "sec_interval" 19 0 1 1
+2404 144 "res_0" "sec_interval" 13 0 0 0
+2405 144 "arg_1" "sec_interval" 13 0 1 1
2406 144 "arg_2" "oid" 63 0 1 2
2407 145 "res_0" "tinyint" 8 0 0 0
2408 145 "arg_1" "tinyint" 8 0 1 1
@@ -2127,17 +2127,17 @@ 2456 162 "arg_2" "tinyint" 8 0
1 2
2457 163 "res_0" "month_interval" 32 0 0 0
2458 163 "arg_1" "month_interval" 32 0 1 1
2459 163 "arg_2" "tinyint" 8 0 1 2
-2460 164 "res_0" "sec_interval" 19 0 0 0
-2461 164 "arg_1" "sec_interval" 19 0 1 1
+2460 164 "res_0" "sec_interval" 13 0 0 0
+2461 164 "arg_1" "sec_interval" 13 0 1 1
2462 164 "arg_2" "tinyint" 8 0 1 2
-2463 165 "res_0" "sec_interval" 19 0 0 0
-2464 165 "arg_1" "sec_interval" 19 0 1 1
+2463 165 "res_0" "sec_interval" 13 0 0 0
+2464 165 "arg_1" "sec_interval" 13 0 1 1
2465 165 "arg_2" "tinyint" 8 0 1 2
-2466 166 "res_0" "sec_interval" 19 0 0 0
-2467 166 "arg_1" "sec_interval" 19 0 1 1
+2466 166 "res_0" "sec_interval" 13 0 0 0
+2467 166 "arg_1" "sec_interval" 13 0 1 1
2468 166 "arg_2" "tinyint" 8 0 1 2
-2469 167 "res_0" "sec_interval" 19 0 0 0
-2470 167 "arg_1" "sec_interval" 19 0 1 1
+2469 167 "res_0" "sec_interval" 13 0 0 0
+2470 167 "arg_1" "sec_interval" 13 0 1 1
2471 167 "arg_2" "tinyint" 8 0 1 2
2472 168 "res_0" "smallint" 16 0 0 0
2473 168 "arg_1" "smallint" 16 0 1 1
@@ -2192,17 +2192,17 @@ 2521 185 "arg_2" "smallint" 16 0
1 2
2522 186 "res_0" "month_interval" 32 0 0 0
2523 186 "arg_1" "month_interval" 32 0 1 1
2524 186 "arg_2" "smallint" 16 0 1 2
-2525 187 "res_0" "sec_interval" 19 0 0 0
-2526 187 "arg_1" "sec_interval" 19 0 1 1
+2525 187 "res_0" "sec_interval" 13 0 0 0
+2526 187 "arg_1" "sec_interval" 13 0 1 1
2527 187 "arg_2" "smallint" 16 0 1 2
-2528 188 "res_0" "sec_interval" 19 0 0 0
-2529 188 "arg_1" "sec_interval" 19 0 1 1
+2528 188 "res_0" "sec_interval" 13 0 0 0
+2529 188 "arg_1" "sec_interval" 13 0 1 1
2530 188 "arg_2" "smallint" 16 0 1 2
-2531 189 "res_0" "sec_interval" 19 0 0 0
-2532 189 "arg_1" "sec_interval" 19 0 1 1
+2531 189 "res_0" "sec_interval" 13 0 0 0
+2532 189 "arg_1" "sec_interval" 13 0 1 1
2533 189 "arg_2" "smallint" 16 0 1 2
-2534 190 "res_0" "sec_interval" 19 0 0 0
-2535 190 "arg_1" "sec_interval" 19 0 1 1
+2534 190 "res_0" "sec_interval" 13 0 0 0
+2535 190 "arg_1" "sec_interval" 13 0 1 1
2536 190 "arg_2" "smallint" 16 0 1 2
2537 191 "res_0" "int" 32 0 0 0
2538 191 "arg_1" "int" 32 0 1 1
@@ -2257,17 +2257,17 @@ 2586 208 "arg_2" "int" 32 0 1
2
2587 209 "res_0" "month_interval" 32 0 0 0
2588 209 "arg_1" "month_interval" 32 0 1 1
2589 209 "arg_2" "int" 32 0 1 2
-2590 210 "res_0" "sec_interval" 19 0 0 0
-2591 210 "arg_1" "sec_interval" 19 0 1 1
+2590 210 "res_0" "sec_interval" 13 0 0 0
+2591 210 "arg_1" "sec_interval" 13 0 1 1
2592 210 "arg_2" "int" 32 0 1 2
-2593 211 "res_0" "sec_interval" 19 0 0 0
-2594 211 "arg_1" "sec_interval" 19 0 1 1
+2593 211 "res_0" "sec_interval" 13 0 0 0
+2594 211 "arg_1" "sec_interval" 13 0 1 1
2595 211 "arg_2" "int" 32 0 1 2
-2596 212 "res_0" "sec_interval" 19 0 0 0
-2597 212 "arg_1" "sec_interval" 19 0 1 1
+2596 212 "res_0" "sec_interval" 13 0 0 0
+2597 212 "arg_1" "sec_interval" 13 0 1 1
2598 212 "arg_2" "int" 32 0 1 2
-2599 213 "res_0" "sec_interval" 19 0 0 0
-2600 213 "arg_1" "sec_interval" 19 0 1 1
+2599 213 "res_0" "sec_interval" 13 0 0 0
+2600 213 "arg_1" "sec_interval" 13 0 1 1
2601 213 "arg_2" "int" 32 0 1 2
2602 214 "res_0" "bigint" 64 0 0 0
2603 214 "arg_1" "bigint" 64 0 1 1
@@ -2322,17 +2322,17 @@ 2651 231 "arg_2" "bigint" 64 0
1 2
2652 232 "res_0" "month_interval" 32 0 0 0
2653 232 "arg_1" "month_interval" 32 0 1 1
2654 232 "arg_2" "bigint" 64 0 1 2
-2655 233 "res_0" "sec_interval" 19 0 0 0
-2656 233 "arg_1" "sec_interval" 19 0 1 1
+2655 233 "res_0" "sec_interval" 13 0 0 0
+2656 233 "arg_1" "sec_interval" 13 0 1 1
2657 233 "arg_2" "bigint" 64 0 1 2
-2658 234 "res_0" "sec_interval" 19 0 0 0
-2659 234 "arg_1" "sec_interval" 19 0 1 1
+2658 234 "res_0" "sec_interval" 13 0 0 0
+2659 234 "arg_1" "sec_interval" 13 0 1 1
2660 234 "arg_2" "bigint" 64 0 1 2
-2661 235 "res_0" "sec_interval" 19 0 0 0
-2662 235 "arg_1" "sec_interval" 19 0 1 1
+2661 235 "res_0" "sec_interval" 13 0 0 0
+2662 235 "arg_1" "sec_interval" 13 0 1 1
2663 235 "arg_2" "bigint" 64 0 1 2
-2664 236 "res_0" "sec_interval" 19 0 0 0
-2665 236 "arg_1" "sec_interval" 19 0 1 1
+2664 236 "res_0" "sec_interval" 13 0 0 0
+2665 236 "arg_1" "sec_interval" 13 0 1 1
2666 236 "arg_2" "bigint" 64 0 1 2
2667 237 "res_0" "wrd" 64 0 0 0
2668 237 "arg_1" "wrd" 64 0 1 1
@@ -2387,17 +2387,17 @@ 2716 254 "arg_2" "wrd" 64 0 1
2
2717 255 "res_0" "month_interval" 32 0 0 0
2718 255 "arg_1" "month_interval" 32 0 1 1
2719 255 "arg_2" "wrd" 64 0 1 2
-2720 256 "res_0" "sec_interval" 19 0 0 0
-2721 256 "arg_1" "sec_interval" 19 0 1 1
+2720 256 "res_0" "sec_interval" 13 0 0 0
+2721 256 "arg_1" "sec_interval" 13 0 1 1
2722 256 "arg_2" "wrd" 64 0 1 2
-2723 257 "res_0" "sec_interval" 19 0 0 0
-2724 257 "arg_1" "sec_interval" 19 0 1 1
+2723 257 "res_0" "sec_interval" 13 0 0 0
+2724 257 "arg_1" "sec_interval" 13 0 1 1
2725 257 "arg_2" "wrd" 64 0 1 2
-2726 258 "res_0" "sec_interval" 19 0 0 0
-2727 258 "arg_1" "sec_interval" 19 0 1 1
+2726 258 "res_0" "sec_interval" 13 0 0 0
+2727 258 "arg_1" "sec_interval" 13 0 1 1
2728 258 "arg_2" "wrd" 64 0 1 2
-2729 259 "res_0" "sec_interval" 19 0 0 0
-2730 259 "arg_1" "sec_interval" 19 0 1 1
+2729 259 "res_0" "sec_interval" 13 0 0 0
+2730 259 "arg_1" "sec_interval" 13 0 1 1
2731 259 "arg_2" "wrd" 64 0 1 2
2732 260 "res_0" "hugeint" 128 0 0 0
2733 260 "arg_1" "hugeint" 128 0 1 1
@@ -2452,17 +2452,17 @@ 2781 277 "arg_2" "hugeint" 128 0
1 2
2782 278 "res_0" "month_interval" 32 0 0 0
2783 278 "arg_1" "month_interval" 32 0 1 1
2784 278 "arg_2" "hugeint" 128 0 1 2
-2785 279 "res_0" "sec_interval" 19 0 0 0
-2786 279 "arg_1" "sec_interval" 19 0 1 1
+2785 279 "res_0" "sec_interval" 13 0 0 0
+2786 279 "arg_1" "sec_interval" 13 0 1 1
2787 279 "arg_2" "hugeint" 128 0 1 2
-2788 280 "res_0" "sec_interval" 19 0 0 0
-2789 280 "arg_1" "sec_interval" 19 0 1 1
+2788 280 "res_0" "sec_interval" 13 0 0 0
+2789 280 "arg_1" "sec_interval" 13 0 1 1
2790 280 "arg_2" "hugeint" 128 0 1 2
-2791 281 "res_0" "sec_interval" 19 0 0 0
-2792 281 "arg_1" "sec_interval" 19 0 1 1
+2791 281 "res_0" "sec_interval" 13 0 0 0
+2792 281 "arg_1" "sec_interval" 13 0 1 1
2793 281 "arg_2" "hugeint" 128 0 1 2
-2794 282 "res_0" "sec_interval" 19 0 0 0
-2795 282 "arg_1" "sec_interval" 19 0 1 1
+2794 282 "res_0" "sec_interval" 13 0 0 0
+2795 282 "arg_1" "sec_interval" 13 0 1 1
2796 282 "arg_2" "hugeint" 128 0 1 2
2797 283 "res_0" "decimal" 2 0 0 0
2798 283 "arg_1" "decimal" 2 0 1 1
@@ -2517,17 +2517,17 @@ 2846 300 "arg_2" "decimal" 2 0
1 2
2847 301 "res_0" "month_interval" 32 0 0 0
2848 301 "arg_1" "month_interval" 32 0 1 1
2849 301 "arg_2" "decimal" 2 0 1 2
-2850 302 "res_0" "sec_interval" 19 0 0 0
-2851 302 "arg_1" "sec_interval" 19 0 1 1
+2850 302 "res_0" "sec_interval" 13 0 0 0
+2851 302 "arg_1" "sec_interval" 13 0 1 1
2852 302 "arg_2" "decimal" 2 0 1 2
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
