8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:03:03 +01:00
This commit is contained in:
robocop 2014-03-21 23:03:56 +00:00
parent ef040723f7
commit e4e6de7ebf
3 changed files with 5 additions and 4 deletions

View File

@ -91,7 +91,7 @@ Semantics:
FUNCTION} triggers.
Notes:
1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE does not fire DDL triggers.
1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE do not fire DDL triggers.
Utilities support:
DDL triggers is a type of database triggers, so the parameters -nodbtriggers (GBAK and ISQL)

View File

@ -1508,7 +1508,7 @@ dsc* ArithmeticNode::add(const dsc* desc, impure_value* value, const ValueExprNo
const SLONG l1 = MOV_get_long(desc, node->nodScale);
const SINT64 l2 = MOV_get_long(&value->vlu_desc, node->nodScale);
SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
const SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
if (rc < MIN_SLONG || rc > MAX_SLONG)
ERR_post(Arg::Gds(isc_exception_integer_overflow));
@ -10395,7 +10395,8 @@ DmlNode* UdfCallNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
csb->csb_blr_reader.setPos(savePos);
return SysFuncCallNode::parse(tdbb, pool, csb, blr_sys_function);
}
else if (blrOp == blr_subfunc)
if (blrOp == blr_subfunc)
{
DeclareSubFuncNode* declareNode;
if (csb->subFunctions.get(name.identifier, declareNode))

View File

@ -689,7 +689,7 @@ RecordSource* OPT_compile(thread_db* tdbb, CompilerScratch* csb, RseNode* rse,
nodeBase = opt->opt_base_conjuncts;
}
fb_assert(nodeBase >= 0 && j >= 0);
fb_assert(nodeBase >= 0 && j >= 0 && nodeBase + j < MAX_CONJUNCTS);
opt->opt_conjuncts[nodeBase + j].opt_conjunct_node = node;
}