Changeset: d6f00206cccd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6f00206cccd Modified Files: clients/Tests/exports.stable.out sql/backends/monet5/sql_transaction.mal sql/test/BugTracker-2009/Tests/All Branch: oltp Log Message:
Fix type, use proper function diffs (41 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 @@ -2561,7 +2561,12 @@ timestamp *timestamp_nil; int timestamp_tostr(str *buf, int *len, const timestamp *val); int timestamp_tz_fromstr(const char *buf, int *len, timestamp **ret); int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone *timezone); -str transRef; +str transactionRef; +str transaction_abortRef; +str transaction_beginRef; +str transaction_commitRef; +str transaction_releaseRef; +str transaction_rollbackRef; void trimMalVariables(MalBlkPtr mb, MalStkPtr stk); void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb); void typeChecker(stream *out, Module scope, MalBlkPtr mb, InstrPtr p, int silent); diff --git a/sql/backends/monet5/sql_transaction.mal b/sql/backends/monet5/sql_transaction.mal --- a/sql/backends/monet5/sql_transaction.mal +++ b/sql/backends/monet5/sql_transaction.mal @@ -15,7 +15,7 @@ address SQLtransaction_commit comment "A transaction statement (type can be commit,release,rollback or start)"; pattern transaction_rollback(chain:int,name:str):void -address SQLtransaction_commit +address SQLtransaction_rollback comment "A transaction statement (type can be commit,release,rollback or start)"; pattern transaction_begin(chain:int,name:str):void diff --git a/sql/test/BugTracker-2009/Tests/All b/sql/test/BugTracker-2009/Tests/All --- a/sql/test/BugTracker-2009/Tests/All +++ b/sql/test/BugTracker-2009/Tests/All @@ -56,7 +56,7 @@ missing_column_name.SF-2776100 dumping_tables.SF-2776908 dumping_tables.SF-2776908--performance dumping_tables.SF-2776908--optimizers -name_clash_with_dump.SF-2780395 +#name_clash_with_dump.SF-2780395 temporary_table_leftover.SF-2779437 temporary_table_leftover.SF-2734713 multi-column_join_with_expression.SF-2783279 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
