Simplest possible fix for CORE-4618: Rollback doesn`t undo changes when MERGE statement updates the same target rows multiple times and PLAN MERGE is used. An alternative solution is being considered.

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60313 65644016-39b1-43b1-bf79-96bc8fe82c15
Misc.


git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60314 65644016-39b1-43b1-bf79-96bc8fe82c15
nightly update

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60315 65644016-39b1-43b1-bf79-96bc8fe82c15