Changeset: 5e08a7eba004 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e08a7eba004
Modified Files:
monetdb5/mal/mal_interpreter.mx
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
Branch: Jul2012
Log Message:
back-ported changeset a528928726b6 to Jul2012 branch
diffs (29 lines):
diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -1307,7 +1307,10 @@ DFLOWscheduler(DataFlow flow)
PARDEBUG mnstr_printf(GDKstdout, "#errors encountered
%s ", f->error ? f->error : "unknown");
if (ret == MAL_SUCCEED)
ret = f->error;
- else {
+ else if (strcmp(ret, f->error) == 0) {
+ GDKfree(f->error);
+ f->error = MAL_SUCCEED;
+ } else {
/* collect all errors encountered */
str z = (char*)GDKmalloc(strlen(ret) +
strlen(f->error) + 2);
if (z) {
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
@@ -33,10 +33,6 @@ stderr of test 'predicate_select.Bug-309
MAPI = monetdb@sofia:39129
QUERY = select * from tables where name;
ERROR = !conversion from string to type bit failed.
- !conversion from string to type bit failed.
- !conversion from string to type bit failed.
- !conversion from string to type bit failed.
- !conversion from string to type bit failed.
# 18:53:13 >
# 18:53:13 > "Done."
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
