8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00
This commit is contained in:
robocop 2008-03-04 06:02:32 +00:00
parent 42acb7e78f
commit 3e9476e464
2 changed files with 4 additions and 6 deletions

View File

@ -415,7 +415,7 @@ USHORT METD_get_col_default(dsql_req* request,
continue; continue;
} }
ISC_STATUS* old_status = tdbb->tdbb_status_vector; ISC_STATUS* const old_status = tdbb->tdbb_status_vector;
ISC_STATUS_ARRAY status_vector = {0}; ISC_STATUS_ARRAY status_vector = {0};
tdbb->tdbb_status_vector = status_vector; tdbb->tdbb_status_vector = status_vector;
@ -815,7 +815,7 @@ USHORT METD_get_domain_default(dsql_req* request,
continue; continue;
} }
ISC_STATUS* old_status = tdbb->tdbb_status_vector; ISC_STATUS* const old_status = tdbb->tdbb_status_vector;
ISC_STATUS_ARRAY status_vector = {0}; ISC_STATUS_ARRAY status_vector = {0};
tdbb->tdbb_status_vector = status_vector; tdbb->tdbb_status_vector = status_vector;

View File

@ -1438,8 +1438,10 @@ static void execute_looper(
/* Start a save point */ /* Start a save point */
if (!(request->req_flags & req_proc_fetch) && request->req_transaction) if (!(request->req_flags & req_proc_fetch) && request->req_transaction)
{
if (transaction && (transaction != dbb->dbb_sys_trans)) if (transaction && (transaction != dbb->dbb_sys_trans))
VIO_start_save_point(tdbb, transaction); VIO_start_save_point(tdbb, transaction);
}
request->req_flags &= ~req_stall; request->req_flags &= ~req_stall;
request->req_operation = next_state; request->req_operation = next_state;
@ -1836,10 +1838,6 @@ static jrd_nod* looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node)
JRD_reschedule(tdbb, 0, true); JRD_reschedule(tdbb, 0, true);
} }
#if defined(DEBUG_GDS_ALLOC) && FALSE
int node_type = node->nod_type;
#endif
switch (node->nod_type) { switch (node->nod_type) {
case nod_asn_list: case nod_asn_list:
if (request->req_operation == jrd_req::req_evaluate) { if (request->req_operation == jrd_req::req_evaluate) {