8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 12:03:02 +01:00

Fixed CORE-1344.

This commit is contained in:
dimitr 2007-07-04 16:07:55 +00:00
parent 2be6485c9e
commit e8f33e1fd4

View File

@ -2961,12 +2961,10 @@ jrd_prc* MET_procedure(thread_db* tdbb, int id, bool noscan, USHORT flags)
if (!noscan) if (!noscan)
{ {
jrd_req* request = CMP_find_request(tdbb, irq_r_procedure, IRQ_REQUESTS);
jrd_req* request2 = CMP_find_request(tdbb, irq_r_params, IRQ_REQUESTS);
jrd_req* request3 = CMP_find_request(tdbb, irq_r_params2, IRQ_REQUESTS);
jrd_req* request4 = CMP_find_request(tdbb, irq_p_type, IRQ_REQUESTS);
SSHORT valid_blr = TRUE; SSHORT valid_blr = TRUE;
jrd_req* request = CMP_find_request(tdbb, irq_r_procedure, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request) FOR(REQUEST_HANDLE request)
P IN RDB$PROCEDURES WITH P.RDB$PROCEDURE_ID EQ procedure->prc_id P IN RDB$PROCEDURES WITH P.RDB$PROCEDURE_ID EQ procedure->prc_id
@ -3007,6 +3005,9 @@ jrd_prc* MET_procedure(thread_db* tdbb, int id, bool noscan, USHORT flags)
vec<Parameter*>* paramVector = 0; vec<Parameter*>* paramVector = 0;
procedure->prc_defaults = 0; procedure->prc_defaults = 0;
jrd_req* request2 = CMP_find_request(tdbb, irq_r_params, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request2) FOR(REQUEST_HANDLE request2)
PA IN RDB$PROCEDURE_PARAMETERS CROSS PA IN RDB$PROCEDURE_PARAMETERS CROSS
F IN RDB$FIELDS WITH F.RDB$FIELD_NAME = PA.RDB$FIELD_SOURCE F IN RDB$FIELDS WITH F.RDB$FIELD_NAME = PA.RDB$FIELD_SOURCE
@ -3024,6 +3025,8 @@ jrd_prc* MET_procedure(thread_db* tdbb, int id, bool noscan, USHORT flags)
if (ENCODE_ODS(dbb->dbb_ods_version, dbb->dbb_minor_original) >= ODS_11_1) if (ENCODE_ODS(dbb->dbb_ods_version, dbb->dbb_minor_original) >= ODS_11_1)
{ {
jrd_req* request3 = CMP_find_request(tdbb, irq_r_params2, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request3) FOR(REQUEST_HANDLE request3)
PA2 IN RDB$PROCEDURE_PARAMETERS WITH PA2 IN RDB$PROCEDURE_PARAMETERS WITH
PA2.RDB$PROCEDURE_NAME EQ PA.RDB$PROCEDURE_NAME AND PA2.RDB$PROCEDURE_NAME EQ PA.RDB$PROCEDURE_NAME AND
@ -3125,6 +3128,8 @@ jrd_prc* MET_procedure(thread_db* tdbb, int id, bool noscan, USHORT flags)
if (ENCODE_ODS(dbb->dbb_ods_version, dbb->dbb_minor_original) >= ODS_11_1) if (ENCODE_ODS(dbb->dbb_ods_version, dbb->dbb_minor_original) >= ODS_11_1)
{ {
jrd_req* request4 = CMP_find_request(tdbb, irq_p_type, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request4) FOR(REQUEST_HANDLE request4)
PT IN RDB$PROCEDURES PT IN RDB$PROCEDURES
WITH PT.RDB$PROCEDURE_ID EQ procedure->prc_id WITH PT.RDB$PROCEDURE_ID EQ procedure->prc_id