firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 15:23:02 +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
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_nod* union_node = selection->rse_union;
@ -1150,7 +1150,7 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
request->add_byte(blr_writelock);
}
// Process the clauses present
// Process the clauses present
if (selection->rse_first)
{
@ -1205,11 +1205,11 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
}
#ifdef SCROLLABLE_CURSORS
// generate a statement to be executed if the user scrolls
// in a direction other than forward; a message is sent outside
// the normal send/receive protocol to specify the direction
// 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
// generate a statement to be executed if the user scrolls
// in a direction other than forward; a message is sent outside
// the normal send/receive protocol to specify the direction
// 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
if (request->req_flags & REQ_sql_cursor &&
request->req_database->dbb_base_level >= 5)
@ -1226,7 +1226,7 @@ void CME_rse(gpre_rse* selection, gpre_req* request)
}
#endif
// Finish up by making a BLR_END
// Finish up by making a BLR_END
request->add_byte(blr_end);
}

9
src/gpre/gpreswi.h
View File

@ -100,12 +100,13 @@ enum gpre_cmd_switch
/*
* Added to allow generation of RM/Cobol compatible code
* SWB 31.Aug.2006
*/
*/
IN_SW_GPRE_RMCOBOL,
/*
* Added to allow specification of a Cobol date format, other than ISC_QUAD, to be used to
* deliver dates to Cobol programs
*/
*/
IN_SW_GPRE_DATE_FMT,
/* As mentioned above: This should always be one larger than the largest
@ -177,8 +178,8 @@ static const in_sw_tab_t gpre_in_sw_table[] =
#endif
#ifdef GPRE_COBOL
{IN_SW_GPRE_COB , 0, "COB" , 0, 0, 0, FALSE, 0, 0, "\t\textended COBOL program"},
{IN_SW_GPRE_ANSI , 0, "ANSI" , 0, 0, 0, FALSE, 0, 0, "\t\tgenerate ANSI85 compatible COBOL"},
{IN_SW_GPRE_RMCOBOL , 0, "RMC" , 0, 0, 0, FALSE, 0, 0, "\t\tRM/Cobol"},
{IN_SW_GPRE_ANSI , 0, "ANSI" , 0, 0, 0, FALSE, 0, 0, "\t\tgenerate ANSI85 compatible COBOL"},
{IN_SW_GPRE_RMCOBOL , 0, "RMC" , 0, 0, 0, FALSE, 0, 0, "\t\tRM/Cobol"},
#endif
{IN_SW_GPRE_Z , 0, "Z" , 0, 0, 0, FALSE, 0, 0, "\t\tprint software version"},
{IN_SW_GPRE_BASE , 0, "BASE" , 0, 0, 0, FALSE, 0, 0, "\t\tbase directory for compiletime DB"},

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)
{
// Parse FOR UPDATE if present
if (MSC_match(KW_FOR)) {
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;
}
// Parse WITH LOCK if present
if (MSC_match(KW_WITH)) {
if (! MSC_match(KW_LOCK)) {

7
src/jrd/ibase.h
View File

@ -492,9 +492,10 @@ ISC_LONG ISC_EXPORT_VARARG isc_event_block(ISC_UCHAR**,
ISC_USHORT, ...);
ISC_USHORT ISC_EXPORT isc_event_block_a(ISC_SCHAR**,
ISC_SCHAR**,
ISC_USHORT,
ISC_SCHAR**);
ISC_SCHAR**,
ISC_USHORT,
ISC_SCHAR**);
void ISC_EXPORT isc_event_block_s(ISC_SCHAR**,
ISC_SCHAR**,
ISC_USHORT,