Changeset: 39817bda0bb2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39817bda0bb2
Modified Files:
        sql/server/sql_mvc.c
        sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
Branch: Aug2018
Log Message:

Fixed error message.


diffs (35 lines):

diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -500,7 +500,7 @@ str
 mvc_rollback(mvc *m, int chain, const char *name, bool disabling_auto_commit)
 {
        sql_trans *tr = m->session->tr;
-       str msg = MAL_SUCCEED;
+       str msg;
 
        if (mvc_debug)
                fprintf(stderr, "#mvc_rollback %s\n", (name) ? name : "");
@@ -516,7 +516,7 @@ mvc_rollback(mvc *m, int chain, const ch
                while (tr && (!tr->name || strcmp(tr->name, name) != 0))
                        tr = tr->parent;
                if (!tr) {
-                       msg = createException(SQL, "sql.rollback", 
SQLSTATE(42000) "ROLLBACK: no such savepoint: '%s'", name);
+                       msg = createException(SQL, "sql.rollback", 
SQLSTATE(42000) "ROLLBACK TO SAVEPOINT: no such savepoint: '%s'", name);
                        m->session->status = -1;
                        store_unlock();
                        return msg;
diff --git a/sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err 
b/sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
--- a/sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
+++ b/sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
@@ -82,8 +82,8 @@ stderr of test 'savepoint_rollback-bug-s
 
 MAPI  = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
 QUERY = ROLLBACK TO SAVEPOINT a2;
-ERROR = !ROLLBACK TO SAVEPOINT: (a2) failed
-CODE  = 3B000
+ERROR = !ROLLBACK TO SAVEPOINT: no such savepoint: 'a2'
+CODE  = 42000
 
 # 21:02:42 >  
 # 21:02:42 >  Done.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to