Reflected API changes in beta1

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/trunk@60223 65644016-39b1-43b1-bf79-96bc8fe82c15
Add new keywords to keyword_or_column as seem by Dmitry.

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