firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:43:04 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2006-11-11 02:47:08 +00:00
parent 56e9274a3c
commit 40698ea38c
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpre/cme.cpp
View File

@ -1100,7 +1100,7 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
else else
request->add_byte(blr_rs_stream); request->add_byte(blr_rs_stream);
// Process unions, if any, otherwise process relations // Process unions, if any, otherwise process relations
gpre_rse* sub_rse = 0; gpre_rse* sub_rse = 0;
gpre_nod* union_node = selection->rse_union; gpre_nod* union_node = selection->rse_union;
@ -1150,7 +1150,7 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
request->add_byte(blr_writelock); request->add_byte(blr_writelock);
} }
// Process the clauses present // Process the clauses present
if (selection->rse_first) if (selection->rse_first)
{ {
@ -1205,11 +1205,11 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
} }
#ifdef SCROLLABLE_CURSORS #ifdef SCROLLABLE_CURSORS
// generate a statement to be executed if the user scrolls // generate a statement to be executed if the user scrolls
// in a direction other than forward; a message is sent outside // in a direction other than forward; a message is sent outside
// the normal send/receive protocol to specify the direction // the normal send/receive protocol to specify the direction
// and offset to scroll; note that we do this only on a SELECT // and offset to scroll; note that we do this only on a SELECT
// type statement and only when talking to a 4.1 engine or greater // type statement and only when talking to a 4.1 engine or greater
if (request->req_flags & REQ_sql_cursor && if (request->req_flags & REQ_sql_cursor &&
request->req_database->dbb_base_level >= 5) request->req_database->dbb_base_level >= 5)
@ -1226,7 +1226,7 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
} }
#endif #endif
// Finish up by making a BLR_END // Finish up by making a BLR_END
request->add_byte(blr_end); request->add_byte(blr_end);
} }

1
src/gpre/gpreswi.h
View File

@ -102,6 +102,7 @@ enum gpre_cmd_switch
* SWB 31.Aug.2006 * SWB 31.Aug.2006
*/ */
IN_SW_GPRE_RMCOBOL, IN_SW_GPRE_RMCOBOL,
/* /*
* Added to allow specification of a Cobol date format, other than ISC_QUAD, to be used to * Added to allow specification of a Cobol date format, other than ISC_QUAD, to be used to
* deliver dates to Cobol programs * deliver dates to Cobol programs

2
src/gpre/sqe.cpp
View File

@ -3171,7 +3171,6 @@ static GPRE_NOD par_udf_or_field_with_collate(gpre_req* request,
static void par_update(gpre_rse *select, bool have_union, bool view_flag) static void par_update(gpre_rse *select, bool have_union, bool view_flag)
{ {
// Parse FOR UPDATE if present // Parse FOR UPDATE if present
if (MSC_match(KW_FOR)) { if (MSC_match(KW_FOR)) {
if (! MSC_match(KW_UPDATE)) { if (! MSC_match(KW_UPDATE)) {
@ -3185,6 +3184,7 @@ static void par_update(gpre_rse *select, bool have_union, bool view_flag)
} }
select->rse_flags |= RSE_for_update; select->rse_flags |= RSE_for_update;
} }
// Parse WITH LOCK if present // Parse WITH LOCK if present
if (MSC_match(KW_WITH)) { if (MSC_match(KW_WITH)) {
if (! MSC_match(KW_LOCK)) { if (! MSC_match(KW_LOCK)) {

1
src/jrd/ibase.h
View File

@ -495,6 +495,7 @@ ISC_USHORT ISC_EXPORT isc_event_block_a(ISC_SCHAR**,
ISC_SCHAR**, ISC_SCHAR**,
ISC_USHORT, ISC_USHORT,
ISC_SCHAR**); ISC_SCHAR**);
void ISC_EXPORT isc_event_block_s(ISC_SCHAR**, void ISC_EXPORT isc_event_block_s(ISC_SCHAR**,
ISC_SCHAR**, ISC_SCHAR**,
ISC_USHORT, ISC_USHORT,