Fixes related with CORE-3993

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/branches/B2_5_Release@57963 65644016-39b1-43b1-bf79-96bc8fe82c15