From f1d139fe91dcfbde64ab2ff9d6374e58355a6b01 Mon Sep 17 00:00:00 2001 From: dimitr Date: Tue, 17 Feb 2009 19:14:08 +0000 Subject: [PATCH] Fixed CORE-2326: AV when committing a new view while trigger on rdb$relations is in place. --- src/jrd/exe.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp index 87841a2566..d414422cac 100644 --- a/src/jrd/exe.cpp +++ b/src/jrd/exe.cpp @@ -1031,6 +1031,9 @@ void EXE_start(thread_db* tdbb, jrd_req* request, jrd_tra* transaction) SET_TDBB(tdbb); Database* dbb = tdbb->getDatabase(); + if (request->req_sql_text.length()) + gds__log(request->req_sql_text.c_str()); + BLKCHK(request, type_req); BLKCHK(transaction, type_tra); @@ -1588,7 +1591,8 @@ static void execute_procedure(thread_db* tdbb, jrd_nod* node) Jrd::ContextPoolHolder context(tdbb, proc_request->req_pool); jrd_tra* transaction = request->req_transaction; - const SLONG save_point_number = transaction->tra_save_point->sav_number; + const SLONG save_point_number = transaction->tra_save_point ? + transaction->tra_save_point->sav_number : 0; proc_request->req_timestamp = request->req_timestamp; EXE_start(tdbb, proc_request, transaction);