Changeset: 88ba8e575de2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88ba8e575de2
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/tools/Tests/mserver5--help.stable.err
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
Branch: default
Log Message:
Approve after recent changes.
diffs (170 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2753,6 +2753,7 @@ MT_Sema mal_parallelism;
MT_Lock mal_profileLock;
str mal_quote(const char *msg, size_t size);
MT_Lock mal_remoteLock;
+char *mal_trace;
void mal_unquote(char *msg);
str mapiRef;
str markHRef;
@@ -3018,6 +3019,7 @@ void setArgType(MalBlkPtr mb, InstrPtr p
InstrPtr setArgument(MalBlkPtr mb, InstrPtr p, int idx, int varid);
str setEndPoint(Module cntxt, str mod, str fcn);
void setFilter(Module cntxt, str mod, str fcn);
+void setFilterAll(void);
void setFilterOnBlock(MalBlkPtr mb, str mod, str fcn);
void setFilterVariable(MalBlkPtr mb, int i);
Module setInheritance(Module head, Module first, Module second);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -63,8 +63,10 @@ Ready.
% clob # type
% 178 # length
function user.s2_1{autoCommit=true}():void;
+barrier X_34 := language.dataflow();
X_2 := sql.mvc();
(X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/:\\tmp/xyz":str,-1:lng,0:lng,0:int);
+exit X_34;
X_9 := sql.append(X_2,"sys","ttt","a",X_5);
X_11 := sql.append(X_9,"sys","ttt","b",X_6);
X_15 := sql.append(X_11,"sys","ttt","c",X_7);
@@ -91,8 +93,10 @@ end s2_1;
% clob # type
% 178 # length
function user.s5_1{autoCommit=true}():void;
+barrier X_35 := language.dataflow();
X_2 := sql.mvc();
(X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/:\\tmp/xyz":str,-1:lng,0:lng,0:int);
+exit X_35;
X_9 := sql.append(X_2,"sys","ttt","a",X_5);
X_11 := sql.append(X_9,"sys","ttt","b",X_6);
X_16 := aggr.count(X_7);
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err
b/monetdb5/tools/Tests/mserver5--help.stable.err
--- a/monetdb5/tools/Tests/mserver5--help.stable.err
+++ b/monetdb5/tools/Tests/mserver5--help.stable.err
@@ -31,6 +31,7 @@ The debug, testing & trace options:
--algorithms
--performance
--optimizers
+ --trace[=<stethoscope flags>]
--forcemito
--debug=<bitmask>
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -81,8 +81,8 @@ Ready.
[ "oid", "int", 61 ]
[ "oid", "int", 61 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
+[ "oid", "int", 284 ]
+[ "oid", "int", 284 ]
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
@@ -141,7 +141,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 61 ]
[ "oid", "sht", 61 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 284 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -81,8 +81,8 @@ Ready.
[ "oid", "int", 61 ]
[ "oid", "int", 61 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
+[ "oid", "int", 284 ]
+[ "oid", "int", 284 ]
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
[ "oid", "int", 326 ]
@@ -141,7 +141,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 61 ]
[ "oid", "sht", 61 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 284 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -81,8 +81,8 @@ Ready.
[ "oid", "int", 62 ]
[ "oid", "int", 62 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
+[ "oid", "int", 284 ]
+[ "oid", "int", 284 ]
[ "oid", "int", 328 ]
[ "oid", "int", 328 ]
[ "oid", "int", 328 ]
@@ -141,7 +141,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 62 ]
[ "oid", "sht", 62 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 284 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -81,8 +81,8 @@ Ready.
[ "oid", "int", 63 ]
[ "oid", "int", 63 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
+[ "oid", "int", 284 ]
+[ "oid", "int", 284 ]
[ "oid", "int", 330 ]
[ "oid", "int", 330 ]
[ "oid", "int", 330 ]
@@ -141,7 +141,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 63 ]
[ "oid", "sht", 63 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 284 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -81,8 +81,8 @@ Ready.
[ "oid", "int", 63 ]
[ "oid", "int", 63 ]
[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
+[ "oid", "int", 284 ]
+[ "oid", "int", 284 ]
[ "oid", "int", 330 ]
[ "oid", "int", 330 ]
[ "oid", "int", 330 ]
@@ -141,7 +141,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 63 ]
[ "oid", "sht", 63 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 284 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
