Changeset: ef8e5b344623 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef8e5b344623
Modified Files:
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
sql/test/mapi/Tests/sql_int128.stable.out.int128
Branch: Jul2017
Log Message:
Approvals.
diffs (82 lines):
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
--- a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
+++ b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
@@ -27,9 +27,6 @@ stderr of test 'sys_tracelog.Bug-3887` i
# cmdline opt gdk_debug = 536870922
-MAPI = (monetdb) /var/tmp/mtest-25081/.s.monetdb.33961
-QUERY = select count(*) from "sys"."tracelog";
-ERROR = !Profiler not started
# 12:53:39 >
# 12:53:39 > "Done."
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
--- a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
+++ b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
@@ -65,6 +65,12 @@ Ready.
# 14:11:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17906" "--port=36024"
# 14:11:11 >
+#select count(*) from "sys"."tracelog";
+% .L11 # table_name
+% L10 # name
+% bigint # type
+% 1 # length
+[ 0 ]
# 14:11:11 >
# 14:11:11 > "Done."
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128
b/sql/test/mapi/Tests/sql_int128.stable.out.int128
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128
+++ b/sql/test/mapi/Tests/sql_int128.stable.out.int128
@@ -61,9 +61,7 @@ Ready.
% 95 # length
function user.s4_1():void;
X_2:void := querylog.define("explain set a = 1234567890987654321;",
"default_pipe", 7:int);
-barrier X_55 := language.dataflow();
X_5 := sql.mvc();
-exit X_55;
sql.setVariable(X_5, "a", 1234567890987654321:hge);
sql.exportOperation();
end user.s4_1;
@@ -101,9 +99,7 @@ end user.s4_1;
% 87 # length
function user.s6_1():void;
X_2:void := querylog.define("explain set b = 10000000000;",
"default_pipe", 7:int);
-barrier X_55 := language.dataflow();
X_5 := sql.mvc();
-exit X_55;
sql.setVariable(X_5, "b", 10000000000:hge);
sql.exportOperation();
end user.s6_1;
@@ -141,9 +137,7 @@ end user.s6_1;
% 82 # length
function user.s8_1():void;
X_1:void := querylog.define("explain set c = a * b;", "default_pipe",
10:int);
-barrier X_58 := language.dataflow();
X_4 := sql.mvc();
-exit X_58;
X_5:hge := sql.getVariable(X_4, "a");
X_7:hge := sql.getVariable(X_4, "b");
X_9:hge := calc.*(X_5, X_7);
@@ -184,9 +178,7 @@ end user.s8_1;
% 82 # length
function user.s10_1():void;
X_1:void := querylog.define("explain set d = c * b;", "default_pipe",
10:int);
-barrier X_58 := language.dataflow();
X_4 := sql.mvc();
-exit X_58;
X_5:hge := sql.getVariable(X_4, "c");
X_7:hge := sql.getVariable(X_4, "b");
X_9:hge := calc.*(X_5, X_7);
@@ -227,9 +219,7 @@ end user.s10_1;
% 82 # length
function user.s12_1():void;
X_1:void := querylog.define("explain set e = d + a;", "default_pipe",
11:int);
-barrier X_59 := language.dataflow();
X_4 := sql.mvc();
-exit X_59;
X_5:hge := sql.getVariable(X_4, "d");
X_8:hge := sql.getVariable(X_4, "a");
X_11:hge := calc.+(X_5, X_8);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
