Changeset: 6de7d2fee8f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6de7d2fee8f2
Modified Files:
NT/mksqlwxs.py
monetdb5/NT/M5server.bat
sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql
Branch: default
Log Message:
Merge with Nov2019 branch.
diffs (44 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -157,7 +157,8 @@ def main():
r'lib\libmonetdb5.pdb',
r'lib\libstream.pdb'])
id = comp(geom, id, 14,
- [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS']])
+ [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS'],
+ r'%s\bin\geos.dll' % makedefs['LIBGEOS']])
print(r' </Directory>')
print(r' <Directory Id="etc" Name="etc">')
id = comp(features, id, 14, [r'etc\.monetdb'])
diff --git a/monetdb5/NT/M5server.bat b/monetdb5/NT/M5server.bat
--- a/monetdb5/NT/M5server.bat
+++ b/monetdb5/NT/M5server.bat
@@ -23,12 +23,14 @@ if "%APPDATA%" == "" goto usevar
rem if the APPDATA variable does exist, put the database there
set MONETDBDIR=%APPDATA%\MonetDB5
set MONETDBFARM="--dbpath=%MONETDBDIR%\dbfarm\demo"
+mkdir "%MONETDBDIR%\dbfarm\demo"
goto skipusevar
:usevar
rem if the APPDATA variable does not exist, put the database in the
rem installation folder (i.e. default location, so no command line argument)
-set MONETDBDIR=%MONETDB%\var\MonetDB5
+set MONETDBDIR=%MONETDB%\var\monetdb5
set MONETDBFARM=
+mkdir "%MONETDB%\var\monetdb5\dbfarm"
:skipusevar
rem the SQL log directory used to be in %MONETDBDIR%, but we now
diff --git
a/sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql
b/sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql
---
a/sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql
+++
b/sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql
@@ -1,3 +1,5 @@
-select now() + 1 - now();
-select now() + interval '1' second - now();
-select now() - now();
+declare deterministic timestamp;
+set deterministic = now();
+select deterministic + 1 - deterministic;
+select deterministic + interval '1' second - deterministic;
+select deterministic - deterministic;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
