MonetDB: mtime - Merge with default branch.

[Sjoerd Mullender]

Changeset: ce1e3ffc1e21 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce1e3ffc1e21
Modified Files:
        sql/backends/monet5/sql_scenario.c
        
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
        sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
        
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
Branch: mtime
Log Message:

Merge with default branch.


diffs (69 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -92,7 +92,6 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
        str tmp;
        Scenario ms, s = getFreeScenario();
 
-//     (void) ret;
        (void) mb;
        (void) stk;
        (void) pci;
diff --git 
a/sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
 
b/sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
--- 
a/sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
+++ 
b/sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128
@@ -57,9 +57,9 @@ stdout of test 'convert-function-test-hg
 # loading sql script: 99_system.sql
 # MonetDB/SQL module loaded
 
-# 13:45:21 >  
-# 13:45:21 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-3718" "--port=39681"
-# 13:45:21 >  
+# 15:25:36 >  
+# 15:25:36 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-31494" "--port=37004"
+# 15:25:36 >  
 
 #CREATE TABLE T_hugeint (v hugeint);
 #INSERT into T_hugeint VALUES (1), (0), (-1), (-127), (127), (-32767), 
(32767), (-2147483647), (2147483647);
diff --git 
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out 
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
--- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
+++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
@@ -313,7 +313,7 @@ stdout of test 'convert-function-test.Bu
 [ 11,  11      ]
 [ 0123456789,  0123456789      ]
 [ A0B2C3D4F5,  A0B2C3D4F5      ]
-[ ""   ]
+[ ,            ]
 [ NULL,        NULL    ]
 #SELECT v, cast(v as varchar(16)) from T_blob;
 % sys.t_blob,  sys.L3 # table_name
@@ -357,7 +357,7 @@ stdout of test 'convert-function-test.Bu
 [ 11,  11      ]
 [ 0123456789,  0123456789      ]
 [ A0B2C3D4F5,  A0B2C3D4F5      ]
-[ ""   ]
+[ ,            ]
 [ NULL,        NULL    ]
 #DROP TABLE T_blob;
 #CREATE TABLE T_tinyint (v tinyint);
diff --git 
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
 
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
--- 
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
+++ 
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
@@ -337,7 +337,7 @@ stdout of test 'convert-function-test.Bu
 [ 11,  11      ]
 [ 0123456789,  0123456789      ]
 [ A0B2C3D4F5,  A0B2C3D4F5      ]
-[ ""   ]
+[ ,            ]
 [ NULL,        NULL    ]
 #SELECT v, cast(v as varchar(16)) from T_blob;
 % sys.t_blob,  sys.L3 # table_name
@@ -381,7 +381,7 @@ stdout of test 'convert-function-test.Bu
 [ 11,  11      ]
 [ 0123456789,  0123456789      ]
 [ A0B2C3D4F5,  A0B2C3D4F5      ]
-[ ""   ]
+[ ,            ]
 [ NULL,        NULL    ]
 #DROP TABLE T_blob;
 #CREATE TABLE T_tinyint (v tinyint);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list