Changeset: 6ffeae05b8bc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6ffeae05b8bc
Modified Files:
sql/server/sql_mvc.c
sql/test/transactions/Tests/transaction_isolation4.SQL.py
sql/test/transactions/Tests/transaction_isolation5.SQL.py
Branch: Jul2021
Log Message:
Typo
diffs (70 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
@@ -504,7 +504,7 @@ mvc_commit(mvc *m, int chain, const char
if (!(m->session->schema = find_sql_schema(m->session->tr,
m->session->schema_name))) {
m->session->tr = sql_trans_destroy(m->session->tr);
- return createException(SQL, "sql.commit",
SQLSTATE(40000) "%s finished sucessfuly, but the session's schema could not be
found on the current transaction", operation);
+ return createException(SQL, "sql.commit",
SQLSTATE(40000) "%s finished successfuly, but the session's schema could not be
found on the current transaction", operation);
}
m->type = Q_TRANS;
TRC_INFO(SQL_TRANS, "Savepoint commit '%s' done\n", name);
@@ -569,7 +569,7 @@ mvc_commit(mvc *m, int chain, const char
*/
(void)sql_trans_end(m->session, ok);
if (chain && sql_trans_begin(m->session) < 0)
- msg = createException(SQL, "sql.commit", SQLSTATE(40000) "%s
finished sucessfuly, but the session's schema could not be found while starting
the next transaction", operation);
+ msg = createException(SQL, "sql.commit", SQLSTATE(40000) "%s
finished successfuly, but the session's schema could not be found while
starting the next transaction", operation);
m->type = Q_TRANS;
TRC_INFO(SQL_TRANS,
"Commit done\n");
@@ -608,7 +608,7 @@ mvc_rollback(mvc *m, int chain, const ch
tr->name = NULL;
}
if (!(m->session->schema = find_sql_schema(m->session->tr,
m->session->schema_name))) {
- msg = createException(SQL, "sql.rollback",
SQLSTATE(40000) "ROLLBACK: finished sucessfuly, but the session's schema could
not be found on the current transaction");
+ msg = createException(SQL, "sql.rollback",
SQLSTATE(40000) "ROLLBACK: finished successfuly, but the session's schema could
not be found on the current transaction");
m->session->status = -1;
return msg;
}
@@ -622,7 +622,7 @@ mvc_rollback(mvc *m, int chain, const ch
tr->status = 1;
(void)sql_trans_end(m->session, SQL_ERR);
if (chain && sql_trans_begin(m->session) < 0)
- msg = createException(SQL, "sql.rollback",
SQLSTATE(40000) "ROLLBACK: finished sucessfuly, but the session's schema could
not be found while starting the next transaction");
+ msg = createException(SQL, "sql.rollback",
SQLSTATE(40000) "ROLLBACK: finished successfuly, but the session's schema could
not be found while starting the next transaction");
}
if (msg == MAL_SUCCEED)
msg = WLCrollback(m->clientid);
@@ -676,7 +676,7 @@ mvc_release(mvc *m, const char *name)
tr->name = NULL;
m->session->tr = tr;
if (!(m->session->schema = find_sql_schema(m->session->tr,
m->session->schema_name))) {
- msg = createException(SQL, "sql.release", SQLSTATE(40000)
"RELEASE: finished sucessfuly, but the session's schema could not be found on
the current transaction");
+ msg = createException(SQL, "sql.release", SQLSTATE(40000)
"RELEASE: finished successfuly, but the session's schema could not be found on
the current transaction");
m->session->status = -1;
return msg;
}
diff --git a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
@@ -202,5 +202,5 @@ with SQLTestCase() as mdb1:
mdb1.execute('drop user duser4;').assertSucceeded()
mdb1.execute('drop schema mys4;').assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
- mdb2.execute('rollback and chain;').assertFailed() # error: ROLLBACK
finished sucessfuly, but the session's schema could not be found while starting
the next transaction
+ mdb2.execute('rollback and chain;').assertFailed() # error: ROLLBACK
finished successfuly, but the session's schema could not be found while
starting the next transaction
# mbd2 cannot do anything else, the connection was terminated
diff --git a/sql/test/transactions/Tests/transaction_isolation5.SQL.py
b/sql/test/transactions/Tests/transaction_isolation5.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation5.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation5.SQL.py
@@ -6,7 +6,7 @@ with SQLTestCase() as mdb1:
mdb1.execute('SAVEPOINT mys;').assertSucceeded()
mdb1.execute('CREATE SCHEMA ups;').assertSucceeded()
mdb1.execute('SET SCHEMA ups;').assertSucceeded()
- mdb1.execute('ROLLBACK TO SAVEPOINT mys;').assertFailed(err_code="40000",
err_message="ROLLBACK: finished sucessfuly, but the session's schema could not
be found on the current transaction")
+ mdb1.execute('ROLLBACK TO SAVEPOINT mys;').assertFailed(err_code="40000",
err_message="ROLLBACK: finished successfuly, but the session's schema could not
be found on the current transaction")
mdb1.execute('rollback;').assertFailed()
with SQLTestCase() as mdb1:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
