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
Add pre-built zlib library

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60316 65644016-39b1-43b1-bf79-96bc8fe82c15
Support for zlib on Windows

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60317 65644016-39b1-43b1-bf79-96bc8fe82c15
Fixed CORE-4503: ISQL command SHOW USERS display only me

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60318 65644016-39b1-43b1-bf79-96bc8fe82c15
Updated the version info.

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60319 65644016-39b1-43b1-bf79-96bc8fe82c15
Refactored the RPB flags. The new logic also provides a second-level protection against CORE-4618.

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

git-svn-id: svn://svn.code.sf.net/p/firebird/code/firebird/trunk@60321 65644016-39b1-43b1-bf79-96bc8fe82c15
Fixed CORE-4631: Lock manager "out of room" error hides the real cause of this problem.

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

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