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

Misc.

Browse Source
This commit is contained in:
dimitr 2011-02-22 10:12:22 +00:00
parent 2db78d08f3
commit 0aac664d7b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/cmp.cpp
View File

@ -2977,7 +2977,7 @@ static jrd_nod* copy(thread_db* tdbb,
node->nod_type = input->nod_type; node->nod_type = input->nod_type;
node->nod_arg[e_gen_value] = node->nod_arg[e_gen_value] =
copy(tdbb, csb, input->nod_arg[e_gen_value], remap, field_id, message, remap_fld); copy(tdbb, csb, input->nod_arg[e_gen_value], remap, field_id, message, remap_fld);
node->nod_arg[e_gen_relation] = input->nod_arg[e_gen_relation]; node->nod_arg[e_gen_id] = input->nod_arg[e_gen_id];
return (node); return (node);
case nod_cast: case nod_cast:

3
src/jrd/exe.h
View File

@ -419,8 +419,7 @@ const int e_fun_length = 2;
// Generate id // Generate id
const int e_gen_value = 0; const int e_gen_value = 0;
const int e_gen_relation = 1; const int e_gen_id = 1;
const int e_gen_id = 1; // Generator id (replaces e_gen_relation)
const int e_gen_length = 2; const int e_gen_length = 2;
// Protection mask // Protection mask

2
src/jrd/par.cpp
View File

@ -3123,7 +3123,7 @@ jrd_nod* PAR_parse_node(thread_db* tdbb, CompilerScratch* csb, USHORT expected)
if (tmp < 0) { if (tmp < 0) {
error(csb, Arg::Gds(isc_gennotdef) << Arg::Str(name)); error(csb, Arg::Gds(isc_gennotdef) << Arg::Str(name));
} }
node->nod_arg[e_gen_relation] = (jrd_nod*) (IPTR) tmp; node->nod_arg[e_gen_id] = (jrd_nod*) (IPTR) tmp;
node->nod_arg[e_gen_value] = PAR_parse_node(tdbb, csb, VALUE); node->nod_arg[e_gen_value] = PAR_parse_node(tdbb, csb, VALUE);
/* CVC: There're thousand ways to go wrong, but I don't see any value /* CVC: There're thousand ways to go wrong, but I don't see any value