MonetDB: linear-hashing - Backported missing error message throw...

[Pedro Ferreira]

Changeset: 00a775f53792 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00a775f53792
Modified Files:
        sql/backends/monet5/sql_optimizer.c
Branch: linear-hashing
Log Message:

Backported missing error message throwing at SQLoptimizeQuery into 
linear-hashing


diffs (23 lines):

diff --git a/sql/backends/monet5/sql_optimizer.c 
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -254,11 +254,15 @@ SQLoptimizeQuery(Client c, MalBlkPtr mb)
                if (c->listing)
                        printFunction(c->fdout, mb, 0, c->listing);
                if (be->mvc->debug) {
-                       msg = runMALDebugger(c, c->curprg->def);
-                       if (msg != MAL_SUCCEED)
-                               freeException(msg); /* ignore error */
+                       str omsg = runMALDebugger(c, c->curprg->def);
+                       if (omsg != MAL_SUCCEED)
+                               freeException(omsg); /* ignore error */
                }
-               return createException(MAL, "optimizer.optimizeQuery", "%s", 
mb->errors);
+               if (mb->errors && msg && msg != mb->errors) { /* if both set, 
throw mb->errors as the earliest one */
+                       freeException(msg);
+                       msg = MAL_SUCCEED;
+               }
+               return createException(MAL, "optimizer.optimizeQuery", "%s", 
mb->errors ? mb->errors : msg);
        }
 
        pipe = getSQLoptimizer(be->mvc);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list