| 
      
      
      From: <fir...@us...> - 2015-01-31 00:26:44
       | 
| Revision: 60592
          http://sourceforge.net/p/firebird/code/60592
Author:   firebirds
Date:     2015-01-31 00:14:04 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-01-30 20:23:34 UTC (rev 60591)
+++ firebird/trunk/ChangeLog	2015-01-31 00:14:04 UTC (rev 60592)
@@ -1,3 +1,197 @@
+ 2015-01-30 20:23  egorpugin 
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+   M src/remote/CMakeLists.txt
+[build] [cmake] Make 'remote' and 'common' targets private for 'yvalve' target.
+
+ 2015-01-30 17:25  alexpeshkoff 
+   M src/common/unicode_util.cpp
+WIP on CORE-3885: Firebird for Android, fix ICU load
+
+ 2015-01-29 15:16  dimitr 
+   M src/jrd/btr.cpp
+Simplest possible fix for regression CORE-4673: Computed index based on a computed column stores NULL for all its keys.
+
+ 2015-01-29 10:47  dimitr 
+   M src/dsql/StmtNodes.cpp
+Removed the redundant code (accidental copy-paste remaining), thanks to Adriano.
+
+ 2015-01-29 10:26  dimitr 
+   M src/dsql/StmtNodes.cpp
+Fixed CORE-4675: Conditions like WHERE <field> = <cursor>.<field> don't use existing index.
+
+ 2015-01-29 07:10  egorpugin 
+   M CMakeLists.txt
+   M src/CMakeLists.txt
+[build] [cmake] Extract ICU and zlib only once.
+
+ 2015-01-28 17:12  hvlad 
+   M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+Correct use of CRT.
+
+ 2015-01-28 17:00  alexpeshkoff 
+   M src/utilities/fbtracemgr/traceMgrMain.cpp
+Fixed a bug introduced by me when working on CORE-3658 3 years ago
+
+ 2015-01-28 14:52  egorpugin 
+   M src/CMakeLists.txt
+[build] [cmake] Set engine12_common target's type to OBJECT (library).
+
+ 2015-01-28 09:01  dimitr 
+   M src/jrd/jrd.cpp
+Fixed my yesterday's commit (forgotten part).
+
+ 2015-01-28 08:15  dimitr 
+   M src/jrd/EngineInterface.h
+   M src/jrd/jrd.cpp
+Fixed my yesterday's commit.
+
+ 2015-01-27 14:37  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M builds/cmake/Configure.cmake
+   M src/CMakeLists.txt
+   M src/include/gen/autoconfig.h.in
+Improve Qt+MSVC build. Fix some messages. Crosscompiling improvements (add some defines).
+
+ 2015-01-27 10:46  alexpeshkoff 
+   M builds/posix/Makefile.in
+   M builds/posix/Makefile.in.plugins_examples
+   M builds/posix/make.android.arme
+   M builds/posix/make.defaults
+   M builds/posix/make.rules
+   M configure.ac
+   M src/common/ThreadStart.cpp
+   M src/common/ThreadStart.h
+   M src/common/classes/init.cpp
+   M src/include/cross/android.arme
+   M src/remote/server/os/posix/inet_server.cpp
+Work in progress on CORE-3885: Firebird for Android, build is complete
+
+ 2015-01-27 10:33  dimitr 
+   M src/isql/isql.epp
+Removed debugging option.
+
+ 2015-01-27 10:31  dimitr 
+   M builds/win32/msvc10/engine.vcxproj
+   M builds/win32/msvc12/engine.vcxproj
+Fixed Windows builds.
+
+ 2015-01-27 10:29  dimitr 
+   M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+   A src/dsql/DsqlCursor.cpp
+   A src/dsql/DsqlCursor.h
+   M src/dsql/dsql.cpp
+   M src/dsql/dsql.h
+   M src/dsql/dsql_proto.h
+   M src/gpre/obj_cxx.cpp
+   M src/include/firebird/FirebirdInterface.idl
+   M src/include/firebird/IdlFbInterfaces.h
+   M src/isql/isql.epp
+   M src/isql/show.epp
+   M src/jrd/DbCreators.cpp
+   M src/jrd/EngineInterface.h
+   M src/jrd/Mapping.cpp
+   M src/jrd/PreparedStatement.cpp
+   M src/jrd/extds/InternalDS.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/tra.cpp
+   M src/jrd/tra.h
+   M src/jrd/tra_proto.h
+   M src/remote/client/interface.cpp
+   M src/remote/server/server.cpp
+   M src/yvalve/YObjects.h
+   M src/yvalve/utl.cpp
+   M src/yvalve/why.cpp
+Core (engine-level) support for scrollable DSQL cursors. Fixed the IResultSet API to match the JDBC spec. Renamed FB_EOF to FB_NO_DATA. Refactored some DSQL internals.
+
+ 2015-01-27 10:21  alexpeshkoff 
+   M src/lock/lock_proto.h
+cleanup
+
+ 2015-01-27 08:48  alexpeshkoff 
+   M configure.ac
+Fixed running thread specific tests
+
+ 2015-01-26 21:33  dimitr 
+   M src/remote/client/interface.cpp
+Attempted to fix the incorrect events wrapping, causing hangs/crashes and memory leaks.
+
+ 2015-01-26 19:20  egorpugin 
+   M CMakeLists.txt
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+   M src/utilities/CMakeLists.txt
+[build] [cmake] Fix crosscompiling for android on linux.
+
+ 2015-01-26 15:23  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+[build] [cmake] Update build according to the last changes.
+
+ 2015-01-26 15:00  hvlad 
+   M builds/win32/defs/udr_engine.def
+Fix Windows build
+
+ 2015-01-26 14:52  asfernandes 
+   M builds/posix/Makefile.in.plugins_examples
+   M builds/win32/msvc10/udrcpp_example.vcxproj
+   M builds/win32/msvc10/udrcpp_example.vcxproj.filters
+   M builds/win32/msvc12/udrcpp_example.vcxproj
+   M builds/win32/msvc12/udrcpp_example.vcxproj.filters
+   M builds/win32/msvc8/udrcpp_example.vcproj
+   M builds/win32/msvc9/udrcpp_example.vcproj
+   A examples/udr/Functions.cpp
+   A examples/udr/Procedures.cpp
+   A examples/udr/Triggers.cpp (from /firebird/trunk/examples/udr/UdrCppExample.cpp:60555)
+   D examples/udr/UdrCppExample.cpp
+   A examples/udr/UdrCppExample.h
+Split the UDR examples in multiple files to demonstrate how it should be done.
+
+ 2015-01-26 14:39  dimitr 
+   M src/jrd/fun.epp
+This should fix the Windows build.
+
+ 2015-01-26 14:15  hvlad 
+   M src/jrd/blb.cpp
+   M src/jrd/blb.h
+   M src/jrd/jrd.cpp
+Improvement CORE-4671 : Release internal temporary blobs early to free some memory\disk space
+
+ 2015-01-26 10:51  dimitr 
+   M src/jrd/fun.epp
+Fixed CORE-4670: Constraint violation error may be swallowed in some cases.
+
+ 2015-01-26 07:56  egorpugin 
+   M builds/cmake/Configure.cmake
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+[build] [cmake] Fix build, typos. Move some projects to 'Boot' dir.
+
+ 2015-01-25 22:24  asfernandes 
+   M src/include/firebird/IdlFbInterfaces.h
+Fix.
+
+ 2015-01-25 20:27  asfernandes 
+   M builds/posix/Makefile.in.plugins_examples
+   M builds/win32/msvc10/udrcpp_example.vcxproj
+   M builds/win32/msvc12/udrcpp_example.vcxproj
+   M builds/win32/msvc9/Firebird3_Examples.sln
+   M examples/udr/UdrCppExample.cpp
+   M src/include/firebird/FirebirdInterface.idl
+   M src/include/firebird/IdlFbInterfaces.h
+   M src/include/firebird/Interface.h
+   M src/include/firebird/UdrCppEngine.h
+   D src/include/firebird/UdrEngine.h
+   M src/plugins/udr_engine/UdrEngine.cpp
+Improvements to the UDR plugin.
+
+ 2015-01-25 20:27  asfernandes 
+   M src/common/classes/GenericMap.h
+Make methods const.
+
  2015-01-24 11:49  hvlad 
    M src/jrd/cch.cpp
 Frontportred fix for bug CORE-2848 : "lock conversion denied" or "lock denied" error
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-01-30 20:23:34 UTC (rev 60591)
+++ firebird/trunk/src/jrd/build_no.h	2015-01-31 00:14:04 UTC (rev 60592)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31567
+  FORMAL BUILD NUMBER:31597
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31567"
-#define FILE_VER_STRING "WI-T3.0.0.31567"
-#define LICENSE_VER_STRING "WI-T3.0.0.31567"
-#define FILE_VER_NUMBER 3, 0, 0, 31567
+#define PRODUCT_VER_STRING "3.0.0.31597"
+#define FILE_VER_STRING "WI-T3.0.0.31597"
+#define LICENSE_VER_STRING "WI-T3.0.0.31597"
+#define FILE_VER_NUMBER 3, 0, 0, 31597
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31567"
+#define FB_BUILD_NO "31597"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-01-30 20:23:34 UTC (rev 60591)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-01-31 00:14:04 UTC (rev 60592)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31567
+BuildNum=31597
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-01 00:13:51
       | 
| Revision: 60596
          http://sourceforge.net/p/firebird/code/60596
Author:   firebirds
Date:     2015-02-01 00:13:49 +0000 (Sun, 01 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-01-31 15:04:14 UTC (rev 60595)
+++ firebird/trunk/ChangeLog	2015-02-01 00:13:49 UTC (rev 60596)
@@ -1,3 +1,7 @@
+ 2015-01-31 15:04  egorpugin 
+   M src/common/isc_file.cpp
+[build] Fix OS X build: removed extra qualification on member Mnt().
+
  2015-01-30 20:23  egorpugin 
    M examples/CMakeLists.txt
    M src/CMakeLists.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-01-31 15:04:14 UTC (rev 60595)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-01 00:13:49 UTC (rev 60596)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31597
+  FORMAL BUILD NUMBER:31598
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31597"
-#define FILE_VER_STRING "WI-T3.0.0.31597"
-#define LICENSE_VER_STRING "WI-T3.0.0.31597"
-#define FILE_VER_NUMBER 3, 0, 0, 31597
+#define PRODUCT_VER_STRING "3.0.0.31598"
+#define FILE_VER_STRING "WI-T3.0.0.31598"
+#define LICENSE_VER_STRING "WI-T3.0.0.31598"
+#define FILE_VER_NUMBER 3, 0, 0, 31598
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31597"
+#define FB_BUILD_NO "31598"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-01-31 15:04:14 UTC (rev 60595)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-01 00:13:49 UTC (rev 60596)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31597
+BuildNum=31598
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-01 16:43:43
       | 
| Revision: 60597
          http://sourceforge.net/p/firebird/code/60597
Author:   egorpugin
Date:     2015-02-01 16:43:35 +0000 (Sun, 01 Feb 2015)
Log Message:
-----------
[build] [cmake] Move some projects to Boot folder. Improve generating of build_msg and codes. Fix Windows issue with databases.
Modified Paths:
--------------
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-02-01 00:13:49 UTC (rev 60596)
+++ firebird/trunk/examples/CMakeLists.txt	2015-02-01 16:43:35 UTC (rev 60597)
@@ -19,6 +19,9 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbld.sql
     COMMAND ${CMAKE_COMMAND} -E remove empbuild.fdb
     COMMAND isql -q -i ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbld.sql
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different empbuild.fdb empbuild_.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove empbuild.fdb
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different empbuild_.fdb empbuild.fdb
 )
 add_custom_command(
     OUTPUT empbuild.c
@@ -47,7 +50,7 @@
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${F} ${name})
 endforeach()
 
-set(EMPBUILD_CMD empbuild employe2.fdb)
+set(EMPBUILD_CMD empbuild employe2_.fdb)
 set_win32(EMPBUILD_CMD set PATH=%PATH%\\\\;${output_dir} COMMAND ${EMPBUILD_CMD})
 set_unix (EMPBUILD_CMD PATH=${output_dir}/bin ${EMPBUILD_CMD})
 set_apple(EMPBUILD_CMD DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${EMPBUILD_CMD})
@@ -58,9 +61,12 @@
         empbuild
         ${files}
     COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove employe2_.fdb
     COMMAND ${EMPBUILD_CMD}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different employe2_.fdb employe2.fdb
 )
 add_custom_target       (employee_db DEPENDS employe2.fdb SOURCES ${files})
+add_dependencies_cc     (employee_db engine12)
 project_group           (employee_db Examples)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-01 00:13:49 UTC (rev 60596)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-01 16:43:35 UTC (rev 60597)
@@ -115,11 +115,12 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
     VERBATIM
     #
-    COMMAND ${CMAKE_COMMAND} -E remove security3.fdb
-    COMMAND ${CMAKE_COMMAND} -E echo "create database 'security3.fdb';" > create_db_security3.sql
-    COMMAND boot_isql -q -i create_db_security3.sql
-    COMMAND boot_isql -q security3.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different security3.fdb security.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove security.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove security_.fdb
+    COMMAND ${CMAKE_COMMAND} -E echo "create database 'security_.fdb';" > create_db_security.sql
+    COMMAND boot_isql -q -i create_db_security.sql
+    COMMAND boot_isql -q security_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different security_.fdb security.fdb
 )
 add_custom_command(
     OUTPUT metadata.fdb
@@ -128,10 +129,72 @@
         ${CMAKE_SOURCE_DIR}/builds/misc/metadata.gbak
     #
     COMMAND ${CMAKE_COMMAND} -E remove metadata.fdb
-    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/metadata.gbak metadata.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove metadata_.fdb
+    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/metadata.gbak metadata_.fdb
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different metadata_.fdb metadata.fdb
 )
-set(isql_exec_msg boot_isql -q msg.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/msgs)
 add_custom_command(
+    OUTPUT help.fdb
+    DEPENDS
+        boot_gbak
+        metadata.fdb
+        ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak
+    #
+    COMMAND ${CMAKE_COMMAND} -E remove help.fdb
+    COMMAND ${CMAKE_COMMAND} -E remove help_.fdb
+    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak help_.fdb
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different help_.fdb help.fdb
+)
+add_custom_target(databases
+    DEPENDS
+        boot_engine12
+        help.fdb
+        metadata.fdb
+        security.fdb
+    SOURCES
+        ${databases_src}
+)
+add_dependencies_cc(databases msg_fdb)
+project_group(databases "Boot/Custom build steps")
+
+
+########################################
+# BUILD STEP messages
+########################################
+
+add_custom_command(
+    OUTPUT firebird.msg
+    DEPENDS
+        build_msg
+        msg_fdb
+    #
+    COMMAND ${CMAKE_COMMAND} -E remove firebird.msg
+    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg -L all
+    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different firebird.msg ${output_dir}/firebird.msg
+)
+add_custom_command(
+    OUTPUT codes_headers.dummy
+    DEPENDS
+        codes
+        msg_fdb
+    COMMENT ""
+    #
+    COMMAND ${CMAKE_COMMAND} -E echo "" > codes_headers.dummy
+    COMMAND ${CMAKE_COMMAND} -E echo Building codes header...
+    COMMAND codes ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_SOURCE_DIR}/lang_helpers
+)
+add_custom_target(messages DEPENDS firebird.msg codes_headers.dummy)
+project_group(messages "Boot/Custom build steps")
+
+
+########################################
+# BUILD STEP msg_fdb
+########################################
+
+set(isql_exec_msg boot_isql -q msg_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/msgs)
+
+add_custom_command(
     OUTPUT msg.fdb
     VERBATIM
     DEPENDS
@@ -139,7 +202,8 @@
         ${msgs_src}
     #
     COMMAND ${CMAKE_COMMAND} -E remove msg.fdb
-    COMMAND ${CMAKE_COMMAND} -E echo "create database 'msg.fdb';" > create_db_msg.sql
+    COMMAND ${CMAKE_COMMAND} -E remove msg_.fdb
+    COMMAND ${CMAKE_COMMAND} -E echo "create database 'msg_.fdb';" > create_db_msg.sql
     COMMAND boot_isql -q -i create_db_msg.sql
     COMMAND ${isql_exec_msg}/msg.sql
     #
@@ -161,52 +225,18 @@
     COMMAND ${isql_exec_msg}/transmsgs.fr_FR2.sql
     COMMAND echo loading German translation
     COMMAND ${isql_exec_msg}/transmsgs.de_DE2.sql
-)
-add_custom_command(
-    OUTPUT help.fdb
-    DEPENDS
-        boot_gbak
-        metadata.fdb
-        ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak
     #
-    COMMAND ${CMAKE_COMMAND} -E remove help.fdb
-    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak help.fdb
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different msg_.fdb msg.fdb
 )
-add_custom_target(databases
+add_custom_target(msg_fdb
     DEPENDS
         boot_engine12
-        help.fdb
-        metadata.fdb
         msg.fdb
-        security.fdb
-    SOURCES
-        ${databases_src}
 )
-project_group(databases "Custom build steps")
+project_group(msg_fdb "Boot/Custom build steps")
 
 
 ########################################
-# BUILD STEP messages
-########################################
-
-add_custom_command(
-    OUTPUT firebird.msg
-    DEPENDS build_msg codes
-    #
-    COMMAND ${CMAKE_COMMAND} -E remove firebird.msg
-    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg -L all
-    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg
-)
-add_custom_target(messages DEPENDS firebird.msg)
-project_group(messages "Custom build steps")
-add_custom_command(
-    TARGET messages
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different firebird.msg ${output_dir}/firebird.msg
-)
-
-
-########################################
 # BUILD_STEP parse
 ########################################
 
@@ -231,7 +261,7 @@
     DEPENDS y_tab.h y_tab.c
     SOURCES ${parse_src}
 )
-project_group(parse "Custom build steps")
+project_group(parse "Boot/Custom build steps")
 set_source_files_properties(dsql/parse.cpp include/gen/parse.h PROPERTIES GENERATED TRUE)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -384,6 +414,7 @@
     PUBLIC ${LIB_iconv}
     PUBLIC ${LIB_CoreFoundation}
 )
+add_dependencies_cc         (yvalve databases)
 set_exported_symbols        (yvalve firebird)
 set_output_directory_unix   (yvalve lib)
 set_target_properties       (yvalve PROPERTIES OUTPUT_NAME fbclient)
@@ -454,7 +485,7 @@
 
 add_library                 (engine12 SHARED ${engine12_generated_src_master} ${VERSION_RC})
 target_link_libraries       (engine12 engine12_common alice burp common yvalve)
-add_dependencies_cc         (engine12 messages) # possible build during build_msg or codes run
+add_dependencies_cc         (engine12 messages)
 set_target_properties       (engine12 PROPERTIES OUTPUT_NAME Engine12)
 set_output_directory        (engine12 plugins)
 set_exported_symbols        (engine12 fbplugin)
@@ -468,7 +499,7 @@
 
 add_library                 (intl SHARED ${intl_src} ${VERSION_RC})
 target_link_libraries       (intl common yvalve)
-add_dependencies_cc         (intl messages) # possible build during build_msg or codes run
+add_dependencies_cc         (intl messages)
 set_target_properties       (intl PROPERTIES OUTPUT_NAME fbintl)
 set_output_directory        (intl intl)
 
@@ -648,11 +679,6 @@
 add_executable              (codes ${codes_generated_src_master} ${VERSION_RC})
 target_link_libraries       (codes yvalve)
 project_group               (codes Boot)
-add_custom_command(
-    TARGET codes
-    POST_BUILD
-    COMMAND codes ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_SOURCE_DIR}/lang_helpers
-)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
 
@@ -674,6 +700,7 @@
 
 add_executable              (gstat ${gstat_src} ${gstat_generated_src_master} ${VERSION_RC})
 target_link_libraries       (gstat common yvalve)
+add_dependencies_cc         (gstat engine12 messages)
 
 
 ########################################
@@ -856,7 +883,7 @@
 add_custom_target(copy_files
     #ALL # uncomment this to copy files every build
     # databases
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security3.fdb ${output_dir}/security3.fdb
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security3.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
     # configs, text files
     COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf    
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-02 00:13:03
       | 
| Revision: 60598
          http://sourceforge.net/p/firebird/code/60598
Author:   firebirds
Date:     2015-02-02 00:12:56 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-01 16:43:35 UTC (rev 60597)
+++ firebird/trunk/ChangeLog	2015-02-02 00:12:56 UTC (rev 60598)
@@ -1,3 +1,8 @@
+ 2015-02-01 16:43  egorpugin 
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+[build] [cmake] Move some projects to Boot folder. Improve generating of build_msg and codes. Fix Windows issue with databases.
+
  2015-01-31 15:04  egorpugin 
    M src/common/isc_file.cpp
 [build] Fix OS X build: removed extra qualification on member Mnt().
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-01 16:43:35 UTC (rev 60597)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-02 00:12:56 UTC (rev 60598)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31598
+  FORMAL BUILD NUMBER:31599
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31598"
-#define FILE_VER_STRING "WI-T3.0.0.31598"
-#define LICENSE_VER_STRING "WI-T3.0.0.31598"
-#define FILE_VER_NUMBER 3, 0, 0, 31598
+#define PRODUCT_VER_STRING "3.0.0.31599"
+#define FILE_VER_STRING "WI-T3.0.0.31599"
+#define LICENSE_VER_STRING "WI-T3.0.0.31599"
+#define FILE_VER_NUMBER 3, 0, 0, 31599
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31598"
+#define FB_BUILD_NO "31599"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-01 16:43:35 UTC (rev 60597)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-02 00:12:56 UTC (rev 60598)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31598
+BuildNum=31599
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-03 00:15:30
       | 
| Revision: 60605
          http://sourceforge.net/p/firebird/code/60605
Author:   firebirds
Date:     2015-02-03 00:15:22 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-02 17:14:06 UTC (rev 60604)
+++ firebird/trunk/ChangeLog	2015-02-03 00:15:22 UTC (rev 60605)
@@ -1,3 +1,22 @@
+ 2015-02-02 17:14  alexpeshkoff 
+   M src/common/classes/TempFile.cpp
+   M src/common/file_params.h
+   M src/common/isc.cpp
+   M src/include/cross/android.arme
+WIP on CORE-3885: Firebird for Android, databases may be created, trivial requests run in embedded mode
+
+ 2015-02-02 15:25  alexpeshkoff 
+   M src/common/classes/semaphore.cpp
+WIP on CORE-3885: Firebird for Android, ignore pseudo-error caused by Google bug
+
+ 2015-02-02 09:27  dimitr 
+   M src/jrd/idx.cpp
+Fixed CORE-4075: Server bugchecks or crashes on exception in calculated index. First part of the fix.
+
+ 2015-02-02 08:53  dimitr 
+   M src/jrd/par.cpp
+Additional fix for CORE-4673: Computed index based on a computed column stores NULL for all its keys.
+
  2015-02-01 16:43  egorpugin 
    M examples/CMakeLists.txt
    M src/CMakeLists.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-02 17:14:06 UTC (rev 60604)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-03 00:15:22 UTC (rev 60605)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31599
+  FORMAL BUILD NUMBER:31603
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31599"
-#define FILE_VER_STRING "WI-T3.0.0.31599"
-#define LICENSE_VER_STRING "WI-T3.0.0.31599"
-#define FILE_VER_NUMBER 3, 0, 0, 31599
+#define PRODUCT_VER_STRING "3.0.0.31603"
+#define FILE_VER_STRING "WI-T3.0.0.31603"
+#define LICENSE_VER_STRING "WI-T3.0.0.31603"
+#define FILE_VER_NUMBER 3, 0, 0, 31603
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31599"
+#define FB_BUILD_NO "31603"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-02 17:14:06 UTC (rev 60604)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-03 00:15:22 UTC (rev 60605)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31599
+BuildNum=31603
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-03 07:10:49
       | 
| Revision: 60609
          http://sourceforge.net/p/firebird/code/60609
Author:   egorpugin
Date:     2015-02-03 07:10:47 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
[build] [cmake] Add 'gfix -write async' command on databases during build. Fix clang+linux build.
Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/CMakeLists.txt	2015-02-03 07:10:47 UTC (rev 60609)
@@ -181,7 +181,7 @@
     endif()
 endif()
 
-if (CLANG OR IOS)
+if (NOT LINUX AND (CLANG OR IOS))
     set(LIB_iconv iconv)
 endif()
 
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-03 07:10:47 UTC (rev 60609)
@@ -113,6 +113,7 @@
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different security.fdb ${dir}/security.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different msg.fdb ${dir}/msg.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different help.fdb ${dir}/help.fdb
+                COMMAND boot_gfix -write async ${dir}/security.fdb
                 COMMAND ${ARGN} -b ${dir}/ ${in} ${out}
             )
         endif()
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-03 07:10:47 UTC (rev 60609)
@@ -119,8 +119,10 @@
     COMMAND ${CMAKE_COMMAND} -E remove security_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'security_.fdb';" > create_db_security.sql
     COMMAND boot_isql -q -i create_db_security.sql
+    COMMAND boot_gfix -write async security_.fdb
     COMMAND boot_isql -q security_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
     COMMAND ${CMAKE_COMMAND} -E copy_if_different security_.fdb security.fdb
+    COMMAND boot_gfix -write sync security.fdb
 )
 add_custom_command(
     OUTPUT metadata.fdb
@@ -205,6 +207,7 @@
     COMMAND ${CMAKE_COMMAND} -E remove msg_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'msg_.fdb';" > create_db_msg.sql
     COMMAND boot_isql -q -i create_db_msg.sql
+    COMMAND boot_gfix -write async msg_.fdb
     COMMAND ${isql_exec_msg}/msg.sql
     #
     COMMAND echo loading facilities
@@ -745,6 +748,15 @@
 
 
 ########################################
+# EXECUTABLE boot_gfix
+########################################
+
+add_executable              (boot_gfix alice/main/aliceMain.cpp ${VERSION_RC})
+target_link_libraries       (boot_gfix boot_alice common boot_yvalve)
+project_group               (boot_gfix Boot)
+
+
+########################################
 # EXECUTABLE gfix
 ########################################
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <asf...@us...> - 2015-02-03 14:56:23
       | 
| Revision: 60615
          http://sourceforge.net/p/firebird/code/60615
Author:   asfernandes
Date:     2015-02-03 14:56:20 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
Fix Windows (cmake only) build. Linux build currently is not using udr_plugin.vers when linking examples/udr.
Modified Paths:
--------------
    firebird/trunk/builds/posix/make.defaults
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/examples/udr/Functions.cpp
    firebird/trunk/src/include/firebird/UdrCppEngine.h
Added Paths:
-----------
    firebird/trunk/builds/posix/udr_plugin.vers
    firebird/trunk/builds/win32/defs/udr_plugin.def
Removed Paths:
-------------
    firebird/trunk/builds/posix/udr_engine.vers
    firebird/trunk/builds/win32/defs/udr_engine.def
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/posix/make.defaults	2015-02-03 14:56:20 UTC (rev 60615)
@@ -259,17 +259,17 @@
 FIREBIRD_VERS = firebird.vers
 FBINTL_VERS = fbintl.vers
 IB_UTIL_VERS = ib_util.vers
-UDR_ENGINE_VERS = udr_engine.vers
+UDR_PLUGIN_VERS = udr_plugin.vers
 EMPTY_VERS = empty.vers
 PLUGIN_VERS = fbplugin.vers
 
 ALLVERS = $(FIREBIRD_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
-ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
+ALLVERS += $(UDR_PLUGIN_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
 
 LINK_FIREBIRD_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FIREBIRD_VERS))
 LINK_FBINTL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(FBINTL_VERS))
 LINK_IBUTIL_SYMBOLS = $(call LIB_LINK_MAPFILE,$(IB_UTIL_VERS))
-LINK_UDRENG_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_ENGINE_VERS))
+LINK_UDR_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(UDR_PLUGIN_VERS))
 LINK_EMPTY_SYMBOLS = $(call LIB_LINK_MAPFILE,$(EMPTY_VERS))
 LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,$(PLUGIN_VERS))
 LINK_EXEC_EXPORT=-rdynamic
@@ -320,7 +320,7 @@
  $(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib)
 LINK_ENGINE_LIBS = $(LINK_FIREBIRD_LIBS) $(FIREBIRD_LIBRARY_LINK)
 
-LINK_UDRENG = $(LIB_LINK) $(LINK_UDRENG_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
+LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
 LINK_UDRENG_LIBS = -L$(LIB) $(SO_LINK_LIBS)
 
 LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
Deleted: firebird/trunk/builds/posix/udr_engine.vers
===================================================================
--- firebird/trunk/builds/posix/udr_engine.vers	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/posix/udr_engine.vers	2015-02-03 14:56:20 UTC (rev 60615)
@@ -1,31 +0,0 @@
-#
-#   Version script to hide private symbols from Firebird libraries
-#   GNU and Solaris linkers should understand it
-#
-#   The contents of this file are subject to the Initial
-#   Developer's Public License Version 1.0 (the "License");
-#   you may not use this file except in compliance with the
-#   License. You may obtain a copy of the License at
-#   http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-# 
-#   Software distributed under the License is distributed AS IS,
-#   WITHOUT WARRANTY OF ANY KIND, either express or implied.
-#   See the License for the specific language governing rights
-#   and limitations under the License.
-# 
-#   The Original Code was created by Nickolay Samofatov
-#   for the Firebird Open Source RDBMS project.
-# 
-#   Copyright (c) 2004 Nickolay Samofatov <nic...@br...>
-#   and all contributors signed below.
-# 
-#   All Rights Reserved.
-#   Contributor(s): ______________________________________.
-#   Adriano dos Santos Fernandes
-# 
-#
-
-firebird_plugin
-fbUdrRegFunction
-fbUdrRegProcedure
-fbUdrRegTrigger
Copied: firebird/trunk/builds/posix/udr_plugin.vers (from rev 60611, firebird/trunk/builds/posix/udr_engine.vers)
===================================================================
--- firebird/trunk/builds/posix/udr_plugin.vers	                        (rev 0)
+++ firebird/trunk/builds/posix/udr_plugin.vers	2015-02-03 14:56:20 UTC (rev 60615)
@@ -0,0 +1,28 @@
+#
+#   Version script to hide private symbols from Firebird libraries
+#   GNU and Solaris linkers should understand it
+#
+#   The contents of this file are subject to the Initial
+#   Developer's Public License Version 1.0 (the "License");
+#   you may not use this file except in compliance with the
+#   License. You may obtain a copy of the License at
+#   http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+#
+#   Software distributed under the License is distributed AS IS,
+#   WITHOUT WARRANTY OF ANY KIND, either express or implied.
+#   See the License for the specific language governing rights
+#   and limitations under the License.
+#
+#   The Original Code was created by Nickolay Samofatov
+#   for the Firebird Open Source RDBMS project.
+#
+#   Copyright (c) 2015 Adriano dos Santos Fernandes <adr...@gm...>
+#   and all contributors signed below.
+#
+#   All Rights Reserved.
+#   Contributor(s): ______________________________________.
+#   Adriano dos Santos Fernandes
+#
+#
+
+firebird_udr_plugin
Property changes on: firebird/trunk/builds/posix/udr_plugin.vers
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: firebird/trunk/builds/win32/defs/udr_engine.def
===================================================================
--- firebird/trunk/builds/win32/defs/udr_engine.def	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/builds/win32/defs/udr_engine.def	2015-02-03 14:56:20 UTC (rev 60615)
@@ -1,22 +0,0 @@
-;  The contents of this file are subject to the Initial
-;  Developer's Public License Version 1.0 (the "License");
-;  you may not use this file except in compliance with the
-;  License. You may obtain a copy of the License at
-;  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-;
-;  Software distributed under the License is distributed AS IS,
-;  WITHOUT WARRANTY OF ANY KIND, either express or implied.
-;  See the License for the specific language governing rights
-;  and limitations under the License.
-;
-;  The Original Code was created by Adriano dos Santos Fernandes
-;  for the Firebird Open Source RDBMS project.
-;
-;  Copyright (c) 2008 Adriano dos Santos Fernandes <adr...@uo...>
-;  and all contributors signed below.
-;
-;  All Rights Reserved.
-;  Contributor(s): ______________________________________.
-
-EXPORTS
-	firebird_plugin
Copied: firebird/trunk/builds/win32/defs/udr_plugin.def (from rev 60611, firebird/trunk/builds/win32/defs/udr_engine.def)
===================================================================
--- firebird/trunk/builds/win32/defs/udr_plugin.def	                        (rev 0)
+++ firebird/trunk/builds/win32/defs/udr_plugin.def	2015-02-03 14:56:20 UTC (rev 60615)
@@ -0,0 +1,22 @@
+;  The contents of this file are subject to the Initial
+;  Developer's Public License Version 1.0 (the "License");
+;  you may not use this file except in compliance with the
+;  License. You may obtain a copy of the License at
+;  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+;
+;  Software distributed under the License is distributed AS IS,
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied.
+;  See the License for the specific language governing rights
+;  and limitations under the License.
+;
+;  The Original Code was created by Adriano dos Santos Fernandes
+;  for the Firebird Open Source RDBMS project.
+;
+;  Copyright (c) 2015 Adriano dos Santos Fernandes <adr...@gm...>
+;  and all contributors signed below.
+;
+;  All Rights Reserved.
+;  Contributor(s): ______________________________________.
+
+EXPORTS
+	firebird_udr_plugin
Property changes on: firebird/trunk/builds/win32/defs/udr_plugin.def
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/examples/CMakeLists.txt	2015-02-03 14:56:20 UTC (rev 60615)
@@ -79,6 +79,7 @@
 
 add_library             (udrcpp_example SHARED ${udrcpp_example_src})
 target_link_libraries   (udrcpp_example yvalve)
+set_exported_symbols    (udrcpp_example udr_plugin)
 set_output_directory    (udrcpp_example plugins/udr)
 project_group           (udrcpp_example Examples)
 
Modified: firebird/trunk/examples/udr/Functions.cpp
===================================================================
--- firebird/trunk/examples/udr/Functions.cpp	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/examples/udr/Functions.cpp	2015-02-03 14:56:20 UTC (rev 60615)
@@ -157,4 +157,5 @@
 
 
 // This should be used in only one of the UDR library files.
+// Build must export firebird_udr_plugin function.
 FB_UDR_IMPLEMENT_ENTRY_POINT
Modified: firebird/trunk/src/include/firebird/UdrCppEngine.h
===================================================================
--- firebird/trunk/src/include/firebird/UdrCppEngine.h	2015-02-03 14:24:54 UTC (rev 60614)
+++ firebird/trunk/src/include/firebird/UdrCppEngine.h	2015-02-03 14:56:20 UTC (rev 60615)
@@ -31,6 +31,7 @@
 #include <string.h>
 
 
+// Build must export firebird_udr_plugin function.
 #define FB_UDR_IMPLEMENT_ENTRY_POINT	\
 	namespace Firebird	\
 	{	\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-04 00:12:40
       | 
| Revision: 60619
          http://sourceforge.net/p/firebird/code/60619
Author:   firebirds
Date:     2015-02-04 00:12:32 +0000 (Wed, 04 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-03 16:31:05 UTC (rev 60618)
+++ firebird/trunk/ChangeLog	2015-02-04 00:12:32 UTC (rev 60619)
@@ -1,3 +1,65 @@
+ 2015-02-03 16:31  dimitr 
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/exe.cpp
+   M src/jrd/exe_proto.h
+   M src/jrd/vio.cpp
+Replace a verb-cleanup bugcheck with regular error + transaction invalidation.
+
+ 2015-02-03 16:16  dimitr 
+   M src/include/gen/codetext.h
+   M src/include/gen/iberror.h
+   M src/include/gen/msgs.h
+   M src/include/gen/sql_code.h
+   M src/include/gen/sql_state.h
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/msgs/system_errors2.sql
+Added new error message.
+
+ 2015-02-03 16:12  dimitr 
+   M src/common/StatusArg.cpp
+   M src/common/StatusArg.h
+Minor improvements to Arg::StatusVector.
+
+ 2015-02-03 14:56  asfernandes 
+   M builds/posix/make.defaults
+   D builds/posix/udr_engine.vers
+   A builds/posix/udr_plugin.vers (from /firebird/trunk/builds/posix/udr_engine.vers:60611)
+   D builds/win32/defs/udr_engine.def
+   A builds/win32/defs/udr_plugin.def (from /firebird/trunk/builds/win32/defs/udr_engine.def:60611)
+   M examples/CMakeLists.txt
+   M examples/udr/Functions.cpp
+   M src/include/firebird/UdrCppEngine.h
+Fix Windows (cmake only) build. Linux build currently is not using udr_plugin.vers when linking examples/udr.
+
+ 2015-02-03 14:24  alexpeshkoff 
+   M src/common/os/posix/os_utils.cpp
+   M src/remote/inet.cpp
+WIP on CORE-3885: Firebird for Android, AI_V4MAPPED flag not supported, now server startup succeeds
+
+ 2015-02-03 11:03  dimitr 
+   M src/common/StatusArg.h
+Fixed a mistake.
+
+ 2015-02-03 10:33  dimitr 
+   M src/jrd/par.cpp
+Small refactoring.
+
+ 2015-02-03 07:10  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M src/CMakeLists.txt
+[build] [cmake] Add 'gfix -write async' command on databases during build. Fix clang+linux build.
+
+ 2015-02-03 06:48  dimitr 
+   M src/jrd/par.cpp
+Fixed one of my last commits, thanks to Adriano.
+
+ 2015-02-03 00:43  asfernandes 
+   M src/jrd/SysFunction.cpp
+   M src/jrd/pag.h
+Warnings.
+
  2015-02-02 17:14  alexpeshkoff 
    M src/common/classes/TempFile.cpp
    M src/common/file_params.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-03 16:31:05 UTC (rev 60618)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-04 00:12:32 UTC (rev 60619)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31603
+  FORMAL BUILD NUMBER:31613
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31603"
-#define FILE_VER_STRING "WI-T3.0.0.31603"
-#define LICENSE_VER_STRING "WI-T3.0.0.31603"
-#define FILE_VER_NUMBER 3, 0, 0, 31603
+#define PRODUCT_VER_STRING "3.0.0.31613"
+#define FILE_VER_STRING "WI-T3.0.0.31613"
+#define LICENSE_VER_STRING "WI-T3.0.0.31613"
+#define FILE_VER_NUMBER 3, 0, 0, 31613
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31603"
+#define FB_BUILD_NO "31613"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-03 16:31:05 UTC (rev 60618)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-04 00:12:32 UTC (rev 60619)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31603
+BuildNum=31613
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-05 00:44:58
       | 
| Revision: 60628
          http://sourceforge.net/p/firebird/code/60628
Author:   firebirds
Date:     2015-02-05 00:44:51 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-04 14:52:23 UTC (rev 60627)
+++ firebird/trunk/ChangeLog	2015-02-05 00:44:51 UTC (rev 60628)
@@ -1,3 +1,72 @@
+ 2015-02-04 14:03  hvlad 
+   M builds/win32/msvc12/Firebird3.sln
+   M builds/win32/msvc12/alice.vcxproj
+   M builds/win32/msvc12/btyacc.vcxproj
+   M builds/win32/msvc12/build_msg.vcxproj
+   M builds/win32/msvc12/burp.vcxproj
+   M builds/win32/msvc12/codes.vcxproj
+   M builds/win32/msvc12/common.vcxproj
+   M builds/win32/msvc12/empbuild.vcxproj
+   M builds/win32/msvc12/engine.vcxproj
+   M builds/win32/msvc12/engine.vcxproj.filters
+   M builds/win32/msvc12/fb2control.vcxproj
+   M builds/win32/msvc12/fb_lock_print.vcxproj
+   M builds/win32/msvc12/fbguard.vcxproj
+   M builds/win32/msvc12/fbrmclib.vcxproj
+   M builds/win32/msvc12/fbserver.vcxproj
+   M builds/win32/msvc12/fbsvcmgr.vcxproj
+   M builds/win32/msvc12/fbtrace.vcxproj
+   M builds/win32/msvc12/fbtracemgr.vcxproj
+   M builds/win32/msvc12/fbudf.vcxproj
+   M builds/win32/msvc12/gbak.vcxproj
+   M builds/win32/msvc12/gfix.vcxproj
+   M builds/win32/msvc12/gpre.vcxproj
+   M builds/win32/msvc12/gpre_boot.vcxproj
+   M builds/win32/msvc12/gpre_common.vcxproj
+   M builds/win32/msvc12/gsec.vcxproj
+   M builds/win32/msvc12/gsplit.vcxproj
+   M builds/win32/msvc12/gstat.vcxproj
+   M builds/win32/msvc12/ib_udf.vcxproj
+   M builds/win32/msvc12/ib_util.vcxproj
+   M builds/win32/msvc12/instclient.vcxproj
+   M builds/win32/msvc12/instreg.vcxproj
+   M builds/win32/msvc12/instsvc.vcxproj
+   M builds/win32/msvc12/intl.vcxproj
+   M builds/win32/msvc12/intlbuild.vcxproj
+   M builds/win32/msvc12/isql.vcxproj
+   M builds/win32/msvc12/legacy_auth.vcxproj
+   M builds/win32/msvc12/legacy_usermanager.vcxproj
+   M builds/win32/msvc12/nbackup.vcxproj
+   M builds/win32/msvc12/qli.vcxproj
+   M builds/win32/msvc12/remote.vcxproj
+   M builds/win32/msvc12/srp.vcxproj
+   M builds/win32/msvc12/udr_engine.vcxproj
+   M builds/win32/msvc12/udr_engine.vcxproj.filters
+   M builds/win32/msvc12/udrcpp_example.vcxproj
+   M builds/win32/msvc12/udrcpp_example.vcxproj.filters
+   M builds/win32/msvc12/yvalve.vcxproj
+MSVC12 build system:
+- use XP-compatible toolset for 32-bit builds
+- set linker option "Subsystem" where it was missing
+- misc
+
+ 2015-02-04 13:37  smirnoffjr 
+   M src/common/isc_file.cpp
+Small fix for generic UNIX Mnt::get() implementation
+
+ 2015-02-04 12:53  dimitr 
+   M src/common/StatusArg.cpp
+   M src/common/StatusArg.h
+Misc improvements.
+
+ 2015-02-04 12:43  dimitr 
+   M src/jrd/jrd.cpp
+Cleanup and simplification.
+
+ 2015-02-04 11:51  hvlad 
+   M builds/win32/msvc10/udr_engine.vcxproj
+This should fix MSVC10 build
+
  2015-02-03 16:31  dimitr 
    M src/dsql/StmtNodes.cpp
    M src/jrd/exe.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-04 14:52:23 UTC (rev 60627)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-05 00:44:51 UTC (rev 60628)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31613
+  FORMAL BUILD NUMBER:31618
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31613"
-#define FILE_VER_STRING "WI-T3.0.0.31613"
-#define LICENSE_VER_STRING "WI-T3.0.0.31613"
-#define FILE_VER_NUMBER 3, 0, 0, 31613
+#define PRODUCT_VER_STRING "3.0.0.31618"
+#define FILE_VER_STRING "WI-T3.0.0.31618"
+#define LICENSE_VER_STRING "WI-T3.0.0.31618"
+#define FILE_VER_NUMBER 3, 0, 0, 31618
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31613"
+#define FB_BUILD_NO "31618"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-04 14:52:23 UTC (rev 60627)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-05 00:44:51 UTC (rev 60628)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31613
+BuildNum=31618
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-05 06:36:31
       | 
| Revision: 60630
          http://sourceforge.net/p/firebird/code/60630
Author:   egorpugin
Date:     2015-02-05 06:36:23 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
[build] [cmake] Do not place boot targets into output directory.
Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/src/CMakeLists.txt
    firebird/trunk/src/utilities/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-05 01:08:27 UTC (rev 60629)
+++ firebird/trunk/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
@@ -1,6 +1,14 @@
 #
 # firebird (trunk)
 #
+#  This file has following organization:
+#  1. cmake settings
+#  2. project settings
+#  3. configure
+#  4. compiler & linker settings
+#  5. pre-build
+#  6. build
+#
 
 ################################################################################
 #
@@ -123,7 +131,7 @@
 
 ################################################################################
 #
-# compiler & linker
+# compiler & linker settings
 #
 ################################################################################
 
@@ -205,7 +213,7 @@
 
 ################################################################################
 #
-# pre build
+# pre-build
 #
 ################################################################################
 
@@ -291,7 +299,7 @@
 
 add_executable          (btyacc ${btyacc_src})
 project_group           (btyacc Extern)
-set_output_directory    (btyacc . FORCE)
+set_output_directory    (btyacc . CURRENT_DIR)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
 
@@ -313,4 +321,3 @@
 add_subdirectory("src")
 
 ################################################################################
-
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-05 01:08:27 UTC (rev 60629)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-05 06:36:23 UTC (rev 60630)
@@ -12,12 +12,10 @@
     if (MSVC OR XCODE) # multiconfiguration builds
         set(out ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     endif()
-    if ("${ARGV2}" STREQUAL "FORCE")
-        if (MSVC OR XCODE)
-            set(out ${dir})
-            set(dir)
-        else()
-            set(out .)
+    if ("${ARGV2}" STREQUAL "CURRENT_DIR")
+        set(out .)
+        if (UNIX AND "${dir}" STREQUAL ".")
+            set(dir bin)
         endif()
     endif()
     if (MSVC OR XCODE)
@@ -98,6 +96,7 @@
                 OUTPUT ${out}
                 DEPENDS gpre_boot ${in}
                 COMMENT "Calling GPRE boot for ${F}"
+                #
                 COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
                 COMMAND ${ARGN} ${in} ${out}
             )
@@ -106,14 +105,14 @@
             set(dir ${dir}/${file}.d)
             add_custom_command(
                 OUTPUT ${out}
-                DEPENDS ${in} databases
+                DEPENDS databases ${in}
                 COMMENT "Calling GPRE master for ${F}"
+                #
                 COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different metadata.fdb ${dir}/yachts.lnk
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different security.fdb ${dir}/security.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different msg.fdb ${dir}/msg.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different help.fdb ${dir}/help.fdb
-                COMMAND boot_gfix -write async ${dir}/security.fdb
                 COMMAND ${ARGN} -b ${dir}/ ${in} ${out}
             )
         endif()
@@ -217,7 +216,7 @@
 #######################################
 # FUNCTION set_generated_directory
 #######################################
-function(set_generated_directory)    
+function(set_generated_directory)
     if (NOT CMAKE_CROSSCOMPILING)
         set(GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
     else()
@@ -229,7 +228,7 @@
 #######################################
 # FUNCTION add_dependencies_cc (cross compile)
 #######################################
-function(add_dependencies_cc target)    
+function(add_dependencies_cc target)
     if (NOT CMAKE_CROSSCOMPILING)
         add_dependencies(${target} ${ARGN})
     endif()
@@ -238,7 +237,7 @@
 #######################################
 # FUNCTION add_dependencies_unix_cc (cross compile)
 #######################################
-function(add_dependencies_unix_cc target)    
+function(add_dependencies_unix_cc target)
     if (UNIX)
         add_dependencies_cc(${target} ${ARGN})
     endif()
@@ -247,10 +246,21 @@
 #######################################
 # FUNCTION crosscompile_prebuild_steps
 #######################################
-function(crosscompile_prebuild_steps)    
+function(crosscompile_prebuild_steps)
     if (CMAKE_CROSSCOMPILING)
         execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NATIVE_BUILD_DIR}/src/include/gen/parse.h ${CMAKE_BINARY_DIR}/src/include/gen/parse.h)
     endif()
 endfunction(crosscompile_prebuild_steps)
 
+#######################################
+# FUNCTION wrap_command_with_path
+#######################################
+function(wrap_command_with_path command)
+    set(cmd ${ARGN})
+    set_win32(cmd set PATH=%PATH%\\\\;${output_dir} COMMAND ${cmd})
+    set_unix (cmd PATH=${output_dir}/bin ${cmd})
+    set_apple(cmd DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${cmd})
+    set(${command} "${cmd}" PARENT_SCOPE)
+endfunction(wrap_command_with_path)
+
 ###############################################################################
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-02-05 01:08:27 UTC (rev 60629)
+++ firebird/trunk/examples/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
@@ -27,7 +27,6 @@
     OUTPUT empbuild.c
     DEPENDS
         gpre
-        messages
         ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e
         empbuild.fdb
     COMMENT "Calling GPRE for empbuild.e"
@@ -36,8 +35,8 @@
 
 add_executable          (empbuild empbuild.c empbuild.fdb ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e)
 target_link_libraries   (empbuild yvalve)
-set_output_directory    (empbuild . FORCE)
-add_dependencies_cc     (empbuild gfix engine12 fbtrace)
+set_output_directory    (empbuild . CURRENT_DIR)
+add_dependencies_cc     (empbuild engine12)
 project_group           (empbuild Examples)
 
 file(GLOB files
@@ -50,11 +49,12 @@
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${F} ${name})
 endforeach()
 
-set(EMPBUILD_CMD empbuild employe2_.fdb)
-set_win32(EMPBUILD_CMD set PATH=%PATH%\\\\;${output_dir} COMMAND ${EMPBUILD_CMD})
-set_unix (EMPBUILD_CMD PATH=${output_dir}/bin ${EMPBUILD_CMD})
-set_apple(EMPBUILD_CMD DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${EMPBUILD_CMD})
 
+########################################
+# BUILD STEP employee_db
+########################################
+
+wrap_command_with_path(EMPBUILD_CMD $<TARGET_FILE:empbuild> employe2_.fdb)
 add_custom_command(
     OUTPUT employe2.fdb
     DEPENDS
@@ -65,12 +65,12 @@
     COMMAND ${EMPBUILD_CMD}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different employe2_.fdb employe2.fdb
 )
-add_custom_target       (employee_db DEPENDS employe2.fdb SOURCES ${files})
-add_dependencies_cc     (employee_db engine12)
-project_group           (employee_db Examples)
+add_custom_target       (employee_db ALL DEPENDS employe2.fdb SOURCES ${files})
+project_group           (employee_db "Examples/Custom build steps")
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
 
+
 ########################################
 # SHARED LIBRARY udrcpp_example
 ########################################
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-05 01:08:27 UTC (rev 60629)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
@@ -171,8 +171,8 @@
         msg_fdb
     #
     COMMAND ${CMAKE_COMMAND} -E remove firebird.msg
-    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg -L all
-    COMMAND build_msg -D msg.fdb -P ./ -F firebird.msg
+    COMMAND build_msg -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg -L all
+    COMMAND build_msg -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg
     COMMAND ${CMAKE_COMMAND} -E copy_if_different firebird.msg ${output_dir}/firebird.msg
 )
 add_custom_command(
@@ -186,7 +186,7 @@
     COMMAND ${CMAKE_COMMAND} -E echo Building codes header...
     COMMAND codes ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_SOURCE_DIR}/lang_helpers
 )
-add_custom_target(messages DEPENDS firebird.msg codes_headers.dummy)
+add_custom_target(messages ALL DEPENDS firebird.msg codes_headers.dummy)
 project_group(messages "Boot/Custom build steps")
 
 
@@ -395,7 +395,8 @@
     PUBLIC ${LIB_CoreFoundation}
 )
 set_exported_symbols        (boot_yvalve firebird)
-set_output_directory_unix   (boot_yvalve lib)
+set_output_directory        (boot_yvalve . CURRENT_DIR)
+set_output_directory_unix   (boot_yvalve lib CURRENT_DIR)
 project_group               (boot_yvalve Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -474,7 +475,7 @@
 
 add_library                 (boot_engine12 SHARED ${engine12_generated_src_boot} ${VERSION_RC})
 target_link_libraries       (boot_engine12 engine12_common boot_alice boot_burp common boot_yvalve)
-set_output_directory        (boot_engine12 plugins)
+set_output_directory        (boot_engine12 plugins CURRENT_DIR)
 set_exported_symbols        (boot_engine12 fbplugin)
 copy_and_rename_lib         (boot_engine12 Engine12)
 project_group               (boot_engine12 Boot)
@@ -488,7 +489,6 @@
 
 add_library                 (engine12 SHARED ${engine12_generated_src_master} ${VERSION_RC})
 target_link_libraries       (engine12 engine12_common alice burp common yvalve)
-add_dependencies_cc         (engine12 messages)
 set_target_properties       (engine12 PROPERTIES OUTPUT_NAME Engine12)
 set_output_directory        (engine12 plugins)
 set_exported_symbols        (engine12 fbplugin)
@@ -502,7 +502,6 @@
 
 add_library                 (intl SHARED ${intl_src} ${VERSION_RC})
 target_link_libraries       (intl common yvalve)
-add_dependencies_cc         (intl messages)
 set_target_properties       (intl PROPERTIES OUTPUT_NAME fbintl)
 set_output_directory        (intl intl)
 
@@ -618,6 +617,7 @@
 
 add_executable              (gpre_boot ${gpre_boot_src} ${VERSION_RC})
 target_link_libraries       (gpre_boot gpre_common common ${LIB_Ws2_32})
+set_output_directory        (gpre_boot . CURRENT_DIR)
 project_group               (gpre_boot Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -637,6 +637,7 @@
 
 add_executable              (boot_gpre ${gpre_generated_src_boot} ${VERSION_RC})
 target_link_libraries       (boot_gpre gpre_common common boot_yvalve)
+set_output_directory        (boot_gpre . CURRENT_DIR)
 project_group               (boot_gpre Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -662,7 +663,8 @@
 if (NOT CMAKE_CROSSCOMPILING)
 
 add_executable              (build_msg ${build_msg_generated_src_master} ${VERSION_RC})
-target_link_libraries       (build_msg common yvalve)
+target_link_libraries       (build_msg boot_yvalve)
+set_output_directory        (build_msg . CURRENT_DIR)
 project_group               (build_msg Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -680,7 +682,8 @@
 if (NOT CMAKE_CROSSCOMPILING)
 
 add_executable              (codes ${codes_generated_src_master} ${VERSION_RC})
-target_link_libraries       (codes yvalve)
+target_link_libraries       (codes boot_yvalve)
+set_output_directory        (codes . CURRENT_DIR)
 project_group               (codes Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -703,7 +706,7 @@
 
 add_executable              (gstat ${gstat_src} ${gstat_generated_src_master} ${VERSION_RC})
 target_link_libraries       (gstat common yvalve)
-add_dependencies_cc         (gstat engine12 messages)
+add_dependencies_cc         (gstat engine12)
 
 
 ########################################
@@ -751,11 +754,16 @@
 # EXECUTABLE boot_gfix
 ########################################
 
+if (NOT CMAKE_CROSSCOMPILING)
+
 add_executable              (boot_gfix alice/main/aliceMain.cpp ${VERSION_RC})
 target_link_libraries       (boot_gfix boot_alice common boot_yvalve)
+set_output_directory        (boot_gfix . CURRENT_DIR)
 project_group               (boot_gfix Boot)
 
+endif() # if (NOT CMAKE_CROSSCOMPILING)
 
+
 ########################################
 # EXECUTABLE gfix
 ########################################
@@ -774,6 +782,7 @@
 
 add_executable              (boot_gbak burp/main/burpMain.cpp ${gbak_include} ${VERSION_RC})
 target_link_libraries       (boot_gbak boot_burp common boot_yvalve)
+set_output_directory        (boot_gbak . CURRENT_DIR)
 project_group               (boot_gbak Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -813,6 +822,7 @@
 
 add_executable              (boot_isql ${isql_src} ${isql_generated_src_boot} ${VERSION_RC})
 target_link_libraries       (boot_isql common boot_yvalve)
+set_output_directory        (boot_isql . CURRENT_DIR)
 project_group               (boot_isql Boot)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -821,11 +831,13 @@
     add_custom_command(
         TARGET boot_isql
         POST_BUILD
-        # remove
-        COMMAND ${CMAKE_COMMAND} -E remove ${output_dir}/icudt52l.dat ${output_dir}/icudt52l_empty.dat
         #
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l.dat ${output_dir}/icudt52l.dat
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l_empty.dat ${output_dir}/icudt52l_empty.dat
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l.dat ${output_dir}/icudt52l.dat
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l_empty.dat ${output_dir}/icudt52l_empty.dat
+        #
+        # one copy to boot directory
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l.dat $<TARGET_FILE_DIR:boot_isql>/icudt52l.dat
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/icudt52l_empty.dat $<TARGET_FILE_DIR:boot_isql>/icudt52l_empty.dat
     )
 
     string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "/machine:x64" arch)
@@ -838,15 +850,19 @@
         TARGET boot_isql
         POST_BUILD
         # icu
-        # remove
-        COMMAND ${CMAKE_COMMAND} -E remove ${output_dir}/icudt52.dll ${output_dir}/icuin52.dll ${output_dir}/icuuc52.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icudt52.dll ${output_dir}/icudt52.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuin52.dll ${output_dir}/icuin52.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuuc52.dll ${output_dir}/icuuc52.dll
+        # zlib
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/zlib/${arch}/zlib1.dll ${output_dir}/zlib1.dll
         #
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icudt52.dll ${output_dir}/icudt52.dll
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuin52.dll ${output_dir}/icuin52.dll
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuuc52.dll ${output_dir}/icuuc52.dll
+        # one copy to boot directory
+        # icu
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icudt52.dll $<TARGET_FILE_DIR:boot_isql>/icudt52.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuin52.dll $<TARGET_FILE_DIR:boot_isql>/icuin52.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/icu/${arch}/Release/bin/icuuc52.dll $<TARGET_FILE_DIR:boot_isql>/icuuc52.dll
         # zlib
-        COMMAND ${CMAKE_COMMAND} -E remove ${output_dir}/zlib1.dll
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/extern/zlib/${arch}/zlib1.dll ${output_dir}/zlib1.dll
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/extern/zlib/${arch}/zlib1.dll $<TARGET_FILE_DIR:boot_isql>/zlib1.dll
     )
 endif()
 
@@ -931,7 +947,7 @@
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/include/gen/iberror.h ${output_dir}/include/iberror.h
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/yvalve/perf.h ${output_dir}/include/perf.h
 )
-add_dependencies_cc     (copy_files databases employee_db)
+add_dependencies_cc     (copy_files databases)
 add_dependencies_unix_cc(copy_files makeHeader)
 project_group(copy_files "Custom build steps")
 
@@ -1020,7 +1036,7 @@
     if (NOT CMAKE_CROSSCOMPILING)
 
     add_executable          (makeHeader misc/makeHeader.cpp)
-    set_output_directory    (makeHeader . FORCE)
+    set_output_directory    (makeHeader . CURRENT_DIR)
     set(files
         ${CMAKE_SOURCE_DIR}/src/include/types_pub.h
         ${CMAKE_SOURCE_DIR}/src/include/consts_pub.h
Modified: firebird/trunk/src/utilities/CMakeLists.txt
===================================================================
--- firebird/trunk/src/utilities/CMakeLists.txt	2015-02-05 01:08:27 UTC (rev 60629)
+++ firebird/trunk/src/utilities/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
@@ -57,7 +57,6 @@
 
 add_library             (fbtrace SHARED ${fbtrace_src} ${fbtrace_os_src} ${fbtrace_include} ${VERSION_RC})
 target_link_libraries   (fbtrace common yvalve)
-add_dependencies_cc     (fbtrace engine12 build_msg codes) # try to wait all generators stop
 set_output_directory    (fbtrace plugins)
 set_exported_symbols    (fbtrace fbplugin)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-05 17:10:44
       | 
| Revision: 60631
          http://sourceforge.net/p/firebird/code/60631
Author:   egorpugin
Date:     2015-02-05 17:10:41 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
[build] [cmake] Bump minimal cmake version. Add missed dependency.
Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/examples/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
+++ firebird/trunk/CMakeLists.txt	2015-02-05 17:10:41 UTC (rev 60631)
@@ -16,7 +16,7 @@
 #
 ################################################################################
 
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.12)
 
 # In-source builds are not possible and so disabled.
 if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-02-05 06:36:23 UTC (rev 60630)
+++ firebird/trunk/examples/CMakeLists.txt	2015-02-05 17:10:41 UTC (rev 60631)
@@ -59,6 +59,7 @@
     OUTPUT employe2.fdb
     DEPENDS
         empbuild
+        gfix
         ${files}
     COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
     COMMAND ${CMAKE_COMMAND} -E remove employe2_.fdb
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-06 00:14:20
       | 
| Revision: 60633
          http://sourceforge.net/p/firebird/code/60633
Author:   firebirds
Date:     2015-02-06 00:14:11 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-05 23:04:36 UTC (rev 60632)
+++ firebird/trunk/ChangeLog	2015-02-06 00:14:11 UTC (rev 60633)
@@ -1,3 +1,21 @@
+ 2015-02-05 23:04  hvlad 
+   M src/jrd/recsrc/RecordSource.h
+   M src/jrd/recsrc/SingularStream.cpp
+It should fix regression CORE-4653 : Crash on infinite mutual SP calls (instead of "Too many concurrent executions of the same request.")
+
+ 2015-02-05 17:10  egorpugin 
+   M CMakeLists.txt
+   M examples/CMakeLists.txt
+[build] [cmake] Bump minimal cmake version. Add missed dependency.
+
+ 2015-02-05 06:36  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+   M src/utilities/CMakeLists.txt
+[build] [cmake] Do not place boot targets into output directory.
+
  2015-02-04 14:03  hvlad 
    M builds/win32/msvc12/Firebird3.sln
    M builds/win32/msvc12/alice.vcxproj
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-05 23:04:36 UTC (rev 60632)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-06 00:14:11 UTC (rev 60633)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31618
+  FORMAL BUILD NUMBER:31621
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31618"
-#define FILE_VER_STRING "WI-T3.0.0.31618"
-#define LICENSE_VER_STRING "WI-T3.0.0.31618"
-#define FILE_VER_NUMBER 3, 0, 0, 31618
+#define PRODUCT_VER_STRING "3.0.0.31621"
+#define FILE_VER_STRING "WI-T3.0.0.31621"
+#define LICENSE_VER_STRING "WI-T3.0.0.31621"
+#define FILE_VER_NUMBER 3, 0, 0, 31621
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31618"
+#define FB_BUILD_NO "31621"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-05 23:04:36 UTC (rev 60632)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-06 00:14:11 UTC (rev 60633)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31618
+BuildNum=31621
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-06 12:58:25
       | 
| Revision: 60634
          http://sourceforge.net/p/firebird/code/60634
Author:   egorpugin
Date:     2015-02-06 12:58:17 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
[build] [cmake] Call custom commands via scripts.
Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-06 00:14:11 UTC (rev 60633)
+++ firebird/trunk/CMakeLists.txt	2015-02-06 12:58:17 UTC (rev 60634)
@@ -75,12 +75,14 @@
 ########################################
 
 set(output_dir ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
+set(boot_dir ${CMAKE_BINARY_DIR}/src)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${output_dir})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${output_dir})
 
 if (MSVC OR XCODE)
     set(output_dir ${output_dir}/$<CONFIG>)
+    set(boot_dir ${boot_dir}/$<CONFIG>)
 endif()
 
 if (MSVC AND DEFAULT_CONFIGURATION)
@@ -278,6 +280,13 @@
 
 include(BuildFunctions)
 
+if (NOT CMAKE_CROSSCOMPILING)
+
+create_boot_commands()
+create_master_commands()
+
+endif() # if (NOT CMAKE_CROSSCOMPILING)
+
 crosscompile_prebuild_steps()
 
 include_directories("extern/libtommath")
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-06 00:14:11 UTC (rev 60633)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-06 12:58:17 UTC (rev 60634)
@@ -90,7 +90,10 @@
         set(out ${CMAKE_CURRENT_BINARY_DIR}/${F}${epp_suffix})
         
         get_filename_component(dir ${out} PATH)
-        
+        if (MSVC OR XCODE)
+            set(dir ${dir}/$<CONFIG>)
+        endif()
+
         if ("${type}" STREQUAL "boot")
             add_custom_command(
                 OUTPUT ${out}
@@ -253,14 +256,89 @@
 endfunction(crosscompile_prebuild_steps)
 
 #######################################
-# FUNCTION wrap_command_with_path
+# FUNCTION create_command
 #######################################
-function(wrap_command_with_path command)
-    set(cmd ${ARGN})
-    set_win32(cmd set PATH=%PATH%\\\\;${output_dir} COMMAND ${cmd})
-    set_unix (cmd PATH=${output_dir}/bin ${cmd})
-    set_apple(cmd DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${cmd})
-    set(${command} "${cmd}" PARENT_SCOPE)
-endfunction(wrap_command_with_path)
+function(create_command command type out)
+    set(dir ${output_dir})
+    if ("${type}" STREQUAL "boot")
+        set(dir ${boot_dir})
+    endif()
+    
+    set_win32(env "PATH=%PATH%\;${dir}")
+    set_unix (env "PATH=$PATH:${dir}/bin")
+    set(env "${env}"
+        FIREBIRD=${dir}
+    )
+    
+    set(cmd_name ${command})
+    if (MSVC OR XCODE)
+        set(conf _$<CONFIG>)
+    endif()
 
+    set(pre_cmd)
+    set(ext .sh)
+    set(export export)
+    set(options $*)
+    set(perm)
+    if (WIN32)
+        set(pre_cmd @)
+        set(ext .bat)
+        set(export set)
+        set(options %*)
+    endif()
+    set(cmd_name ${cmd_name}${conf}${ext})
+    set(cmd_name ${CMAKE_BINARY_DIR}/src/${cmd_name})
+    
+    set(content)
+    foreach(e ${env})
+        set(content "${content}${pre_cmd}${export} ${e}\n")
+    endforeach()
+    
+    set(cmd $<TARGET_FILE:${cmd}>)
+    set(content "${content}${pre_cmd}${cmd} ${options}")
+    file(GENERATE OUTPUT ${cmd_name} CONTENT "${content}")
+    
+    if (UNIX)
+        set(cmd_name chmod u+x ${cmd_name} COMMAND ${cmd_name})
+    endif()
+
+    string(TOUPPER ${command} CMD)
+    set(${CMD}_CMD ${cmd_name} PARENT_SCOPE)
+    set(${out} ${CMD}_CMD PARENT_SCOPE)
+endfunction(create_command)
+
+#######################################
+# FUNCTION create_boot_commands
+#######################################
+function(create_boot_commands)
+    set(cmd_list
+        boot_isql
+        boot_gpre
+        boot_gbak
+        boot_gfix
+        build_msg
+        codes
+        gpre_boot
+    )
+    foreach(cmd ${cmd_list})
+        create_command(${cmd} boot out)
+        set(${out} ${${out}} PARENT_SCOPE)
+    endforeach()
+endfunction(create_boot_commands)
+
+#######################################
+# FUNCTION create_master_commands
+#######################################
+function(create_master_commands)
+    set(cmd_list
+        isql
+        gpre
+        empbuild
+    )
+    foreach(cmd ${cmd_list})
+        create_command(${cmd} master out)
+        set(${out} ${${out}} PARENT_SCOPE)
+    endforeach()
+endfunction(create_master_commands)
+
 ###############################################################################
Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-02-06 00:14:11 UTC (rev 60633)
+++ firebird/trunk/examples/CMakeLists.txt	2015-02-06 12:58:17 UTC (rev 60634)
@@ -18,7 +18,7 @@
         isql
         ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbld.sql
     COMMAND ${CMAKE_COMMAND} -E remove empbuild.fdb
-    COMMAND isql -q -i ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbld.sql
+    COMMAND ${ISQL_CMD} -q -i ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbld.sql
     COMMAND ${CMAKE_COMMAND} -E copy_if_different empbuild.fdb empbuild_.fdb
     COMMAND ${CMAKE_COMMAND} -E remove empbuild.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different empbuild_.fdb empbuild.fdb
@@ -30,7 +30,7 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e
         empbuild.fdb
     COMMENT "Calling GPRE for empbuild.e"
-    COMMAND gpre -r -m -n -z ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e empbuild.c
+    COMMAND ${GPRE_CMD} -r -m -n ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e empbuild.c
 )
 
 add_executable          (empbuild empbuild.c empbuild.fdb ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e)
@@ -54,7 +54,6 @@
 # BUILD STEP employee_db
 ########################################
 
-wrap_command_with_path(EMPBUILD_CMD $<TARGET_FILE:empbuild> employe2_.fdb)
 add_custom_command(
     OUTPUT employe2.fdb
     DEPENDS
@@ -63,7 +62,7 @@
         ${files}
     COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
     COMMAND ${CMAKE_COMMAND} -E remove employe2_.fdb
-    COMMAND ${EMPBUILD_CMD}
+    COMMAND ${EMPBUILD_CMD} employe2_.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different employe2_.fdb employe2.fdb
 )
 add_custom_target       (employee_db ALL DEPENDS employe2.fdb SOURCES ${files})
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-06 00:14:11 UTC (rev 60633)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-06 12:58:17 UTC (rev 60634)
@@ -70,16 +70,16 @@
 
 if (NOT CMAKE_CROSSCOMPILING)
 
-epp_process(boot    epp_boot_internal_files gpre_boot -lang_internal -n -m)
-epp_process(boot    epp_boot_ocxx_files     gpre_boot -lang_internal -n -ids -ocxx)
-epp_process(boot    epp_boot_files          gpre_boot -n -m)
-epp_process(boot    epp_boot_gds_files      gpre_boot -n -ids -gds_cxx)
+epp_process(boot    epp_boot_internal_files ${GPRE_BOOT_CMD} -lang_internal -n -m)
+epp_process(boot    epp_boot_ocxx_files     ${GPRE_BOOT_CMD} -lang_internal -n -ids -ocxx)
+epp_process(boot    epp_boot_files          ${GPRE_BOOT_CMD} -n -m)
+epp_process(boot    epp_boot_gds_files      ${GPRE_BOOT_CMD} -n -ids -gds_cxx)
 
-epp_process(master  epp_boot_internal_files boot_gpre -n -m)
-epp_process(master  epp_boot_ocxx_files     boot_gpre -n -ids -ocxx)
-epp_process(master  epp_boot_files          boot_gpre -n -m)
-epp_process(master  epp_boot_gds_files      boot_gpre -n -ids -gds_cxx)
-epp_process(master  epp_master_files        boot_gpre -n -m)
+epp_process(master  epp_boot_internal_files ${BOOT_GPRE_CMD} -n -m)
+epp_process(master  epp_boot_ocxx_files     ${BOOT_GPRE_CMD} -n -ids -ocxx)
+epp_process(master  epp_boot_files          ${BOOT_GPRE_CMD} -n -m)
+epp_process(master  epp_boot_gds_files      ${BOOT_GPRE_CMD} -n -ids -gds_cxx)
+epp_process(master  epp_master_files        ${BOOT_GPRE_CMD} -n -m)
 
 
 ################################################################################
@@ -118,11 +118,11 @@
     COMMAND ${CMAKE_COMMAND} -E remove security.fdb
     COMMAND ${CMAKE_COMMAND} -E remove security_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'security_.fdb';" > create_db_security.sql
-    COMMAND boot_isql -q -i create_db_security.sql
-    COMMAND boot_gfix -write async security_.fdb
-    COMMAND boot_isql -q security_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
+    COMMAND ${BOOT_ISQL_CMD} -q -i create_db_security.sql
+    COMMAND ${BOOT_GFIX_CMD} -write async security_.fdb
+    COMMAND ${BOOT_ISQL_CMD} -q security_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
     COMMAND ${CMAKE_COMMAND} -E copy_if_different security_.fdb security.fdb
-    COMMAND boot_gfix -write sync security.fdb
+    COMMAND ${BOOT_GFIX_CMD} -write sync security.fdb
 )
 add_custom_command(
     OUTPUT metadata.fdb
@@ -132,7 +132,7 @@
     #
     COMMAND ${CMAKE_COMMAND} -E remove metadata.fdb
     COMMAND ${CMAKE_COMMAND} -E remove metadata_.fdb
-    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/metadata.gbak metadata_.fdb
+    COMMAND ${BOOT_GBAK_CMD} -r ${CMAKE_SOURCE_DIR}/builds/misc/metadata.gbak metadata_.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different metadata_.fdb metadata.fdb
 )
 add_custom_command(
@@ -144,7 +144,7 @@
     #
     COMMAND ${CMAKE_COMMAND} -E remove help.fdb
     COMMAND ${CMAKE_COMMAND} -E remove help_.fdb
-    COMMAND boot_gbak -r ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak help_.fdb
+    COMMAND ${BOOT_GBAK_CMD} -r ${CMAKE_SOURCE_DIR}/builds/misc/help.gbak help_.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different help_.fdb help.fdb
 )
 add_custom_target(databases
@@ -171,8 +171,8 @@
         msg_fdb
     #
     COMMAND ${CMAKE_COMMAND} -E remove firebird.msg
-    COMMAND build_msg -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg -L all
-    COMMAND build_msg -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg
+    COMMAND ${BUILD_MSG_CMD} -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg -L all
+    COMMAND ${BUILD_MSG_CMD} -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg
     COMMAND ${CMAKE_COMMAND} -E copy_if_different firebird.msg ${output_dir}/firebird.msg
 )
 add_custom_command(
@@ -184,7 +184,7 @@
     #
     COMMAND ${CMAKE_COMMAND} -E echo "" > codes_headers.dummy
     COMMAND ${CMAKE_COMMAND} -E echo Building codes header...
-    COMMAND codes ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_SOURCE_DIR}/lang_helpers
+    COMMAND ${CODES_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_SOURCE_DIR}/lang_helpers
 )
 add_custom_target(messages ALL DEPENDS firebird.msg codes_headers.dummy)
 project_group(messages "Boot/Custom build steps")
@@ -194,7 +194,7 @@
 # BUILD STEP msg_fdb
 ########################################
 
-set(isql_exec_msg boot_isql -q msg_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/msgs)
+set(isql_exec_msg ${BOOT_ISQL_CMD} -q msg_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/msgs)
 
 add_custom_command(
     OUTPUT msg.fdb
@@ -206,8 +206,8 @@
     COMMAND ${CMAKE_COMMAND} -E remove msg.fdb
     COMMAND ${CMAKE_COMMAND} -E remove msg_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'msg_.fdb';" > create_db_msg.sql
-    COMMAND boot_isql -q -i create_db_msg.sql
-    COMMAND boot_gfix -write async msg_.fdb
+    COMMAND ${BOOT_ISQL_CMD} -q -i create_db_msg.sql
+    COMMAND ${BOOT_GFIX_CMD} -write async msg_.fdb
     COMMAND ${isql_exec_msg}/msg.sql
     #
     COMMAND echo loading facilities
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <asf...@us...> - 2015-02-06 14:39:21
       | 
| Revision: 60636
          http://sourceforge.net/p/firebird/code/60636
Author:   asfernandes
Date:     2015-02-06 14:39:19 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
Warning.
Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/jrd/par.cpp
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn	2015-02-06 14:28:54 UTC (rev 60635)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2015-02-06 14:39:19 UTC (rev 60636)
@@ -1614,6 +1614,8 @@
       PARAMETER (GDS__interface_version_too_old        = 335545100)
       INTEGER*4 GDS__fun_param_mismatch              
       PARAMETER (GDS__fun_param_mismatch               = 335545101)
+      INTEGER*4 GDS__savepoint_backout_err           
+      PARAMETER (GDS__savepoint_backout_err            = 335545102)
       INTEGER*4 GDS__gfix_db_name                    
       PARAMETER (GDS__gfix_db_name                     = 335740929)
       INTEGER*4 GDS__gfix_invalid_sw                 
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2015-02-06 14:28:54 UTC (rev 60635)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2015-02-06 14:39:19 UTC (rev 60636)
@@ -814,6 +814,7 @@
 	gds_crdb_notable                     = 335545099;
 	gds_interface_version_too_old        = 335545100;
 	gds_fun_param_mismatch               = 335545101;
+	gds_savepoint_backout_err            = 335545102;
 	gds_gfix_db_name                     = 335740929;
 	gds_gfix_invalid_sw                  = 335740930;
 	gds_gfix_incmp_sw                    = 335740932;
Modified: firebird/trunk/src/jrd/par.cpp
===================================================================
--- firebird/trunk/src/jrd/par.cpp	2015-02-06 14:28:54 UTC (rev 60635)
+++ firebird/trunk/src/jrd/par.cpp	2015-02-06 14:39:19 UTC (rev 60636)
@@ -79,8 +79,6 @@
 static NodeParseFunc blr_parsers[256] = {NULL};
 
 
-static CompilerScratch* par_start(thread_db* tdbb, jrd_rel* relation, CompilerScratch* view_csb,
-	CompilerScratch** csb_ptr, const bool trigger, USHORT flags);
 static void par_error(BlrReader& blrReader, const Arg::StatusVector& v, bool isSyntaxError = true);
 static PlanNode* par_plan(thread_db*, CompilerScratch*);
 static void getBlrVersion(CompilerScratch* csb);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-07 00:15:37
       | 
| Revision: 60637
          http://sourceforge.net/p/firebird/code/60637
Author:   firebirds
Date:     2015-02-07 00:15:29 +0000 (Sat, 07 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-06 14:39:19 UTC (rev 60636)
+++ firebird/trunk/ChangeLog	2015-02-07 00:15:29 UTC (rev 60637)
@@ -1,3 +1,20 @@
+ 2015-02-06 14:39  asfernandes 
+   M lang_helpers/gds_codes.ftn
+   M lang_helpers/gds_codes.pas
+   M src/jrd/par.cpp
+Warning.
+
+ 2015-02-06 14:28  egorpugin 
+   M src/CMakeLists.txt
+[build] [cmake] Add missed dependencies.
+
+ 2015-02-06 12:58  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M examples/CMakeLists.txt
+   M src/CMakeLists.txt
+[build] [cmake] Call custom commands via scripts.
+
  2015-02-05 23:04  hvlad 
    M src/jrd/recsrc/RecordSource.h
    M src/jrd/recsrc/SingularStream.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-06 14:39:19 UTC (rev 60636)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-07 00:15:29 UTC (rev 60637)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31621
+  FORMAL BUILD NUMBER:31624
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31621"
-#define FILE_VER_STRING "WI-T3.0.0.31621"
-#define LICENSE_VER_STRING "WI-T3.0.0.31621"
-#define FILE_VER_NUMBER 3, 0, 0, 31621
+#define PRODUCT_VER_STRING "3.0.0.31624"
+#define FILE_VER_STRING "WI-T3.0.0.31624"
+#define LICENSE_VER_STRING "WI-T3.0.0.31624"
+#define FILE_VER_NUMBER 3, 0, 0, 31624
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31621"
+#define FB_BUILD_NO "31624"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-06 14:39:19 UTC (rev 60636)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-07 00:15:29 UTC (rev 60637)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31621
+BuildNum=31624
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-07 16:07:06
       | 
| Revision: 60649
          http://sourceforge.net/p/firebird/code/60649
Author:   egorpugin
Date:     2015-02-07 16:07:04 +0000 (Sat, 07 Feb 2015)
Log Message:
-----------
[build] [cmake] Add ICU setup section. Add clang ifdef.
Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/src/common/classes/alloc.h
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-07 14:58:31 UTC (rev 60648)
+++ firebird/trunk/CMakeLists.txt	2015-02-07 16:07:04 UTC (rev 60649)
@@ -4,10 +4,11 @@
 #  This file has following organization:
 #  1. cmake settings
 #  2. project settings
-#  3. configure
-#  4. compiler & linker settings
-#  5. pre-build
-#  6. build
+#  3. packages
+#  4. configure
+#  5. compiler & linker settings
+#  6. pre-build
+#  7. build
 #
 
 ################################################################################
@@ -104,6 +105,41 @@
 
 ################################################################################
 #
+# packages
+#
+################################################################################
+
+########################################
+# icu
+########################################
+
+if (UNIX)
+    if (NOT ICU_INCLUDE_DIR)
+        find_path(ICU_INCLUDE_DIR unicode/ucnv.h
+            PATHS
+                /usr/include
+                /usr/include/x86_64-linux-gnu
+                /usr/local/include
+                /opt/local/include
+            CMAKE_FIND_ROOT_PATH_BOTH
+        )
+        if ("${ICU_INCLUDE_DIR}" STREQUAL "ICU_INCLUDE_DIR-NOTFOUND")
+            message(FATAL_ERROR "ICU headers not found!")
+        endif()
+    endif()
+    if (CMAKE_CROSSCOMPILING)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${ICU_INCLUDE_DIR}/unicode
+            ${CMAKE_BINARY_DIR}/unicode
+        )
+        set(ICU_INCLUDE_DIR ${CMAKE_BINARY_DIR})
+    endif()
+    set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+    include_directories(${ICU_INCLUDE_DIRS})
+endif()
+
+################################################################################
+#
 # configure
 #
 ################################################################################
@@ -160,24 +196,6 @@
 endif()
 
 if (UNIX)
-    if (CMAKE_CROSSCOMPILING)
-        find_path(ICU_INCLUDE_DIR unicode/ucnv.h
-            PATHS
-                /usr/include
-                /usr/include/x86_64-linux-gnu
-                /usr/local/include
-                /opt/local/include
-            CMAKE_FIND_ROOT_PATH_BOTH
-        )
-        if (ICU_INCLUDE_DIR)
-            execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
-                ${ICU_INCLUDE_DIR}/unicode
-                ${CMAKE_BINARY_DIR}/unicode
-            )
-            include_directories(${CMAKE_BINARY_DIR})
-        endif()
-    endif()
-
     set(OS_DIR posix)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
Modified: firebird/trunk/src/common/classes/alloc.h
===================================================================
--- firebird/trunk/src/common/classes/alloc.h	2015-02-07 14:58:31 UTC (rev 60648)
+++ firebird/trunk/src/common/classes/alloc.h	2015-02-07 16:07:04 UTC (rev 60649)
@@ -48,7 +48,7 @@
 
 #include <stdio.h>
 
-#if defined(MVS) || defined (DARWIN)
+#if defined(MVS) || defined(DARWIN) || defined(__clang__)
 #include <stdlib.h>
 #else
 #include <malloc.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-08 00:20:52
       | 
| Revision: 60654
          http://sourceforge.net/p/firebird/code/60654
Author:   firebirds
Date:     2015-02-08 00:20:44 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-07 21:03:23 UTC (rev 60653)
+++ firebird/trunk/ChangeLog	2015-02-08 00:20:44 UTC (rev 60654)
@@ -1,3 +1,27 @@
+ 2015-02-07 16:07  egorpugin 
+   M CMakeLists.txt
+   M src/common/classes/alloc.h
+[build] [cmake] Add ICU setup section. Add clang ifdef.
+
+ 2015-02-07 14:57  alexpeshkoff 
+   M src/gpre/obj_cxx.cpp
+warnings
+
+ 2015-02-07 14:52  alexpeshkoff 
+   M configure.ac
+misc
+
+ 2015-02-07 12:57  alexpeshkoff 
+   M src/alice/main/aliceMain.cpp
+   M src/burp/main/burpMain.cpp
+   M src/utilities/gsec/main/gsecMain.cpp
+   M src/utilities/gstat/main/gstatMain.cpp
+Use last chance to catch exceptions in utilities - sometimes it may be useful
+
+ 2015-02-07 10:57  dimitr 
+   M src/dsql/DsqlCompilerScratch.cpp
+Fixed CORE-4684: Error while preparing a complex query ("Too many Contexts of Relation/Procedure/Views. Maximum allowed is 256").
+
  2015-02-06 14:39  asfernandes 
    M lang_helpers/gds_codes.ftn
    M lang_helpers/gds_codes.pas
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-07 21:03:23 UTC (rev 60653)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-08 00:20:44 UTC (rev 60654)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31624
+  FORMAL BUILD NUMBER:31629
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31624"
-#define FILE_VER_STRING "WI-T3.0.0.31624"
-#define LICENSE_VER_STRING "WI-T3.0.0.31624"
-#define FILE_VER_NUMBER 3, 0, 0, 31624
+#define PRODUCT_VER_STRING "3.0.0.31629"
+#define FILE_VER_STRING "WI-T3.0.0.31629"
+#define LICENSE_VER_STRING "WI-T3.0.0.31629"
+#define FILE_VER_NUMBER 3, 0, 0, 31629
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31624"
+#define FB_BUILD_NO "31629"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-07 21:03:23 UTC (rev 60653)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-08 00:20:44 UTC (rev 60654)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31624
+BuildNum=31629
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-10 00:15:13
       | 
| Revision: 60662
          http://sourceforge.net/p/firebird/code/60662
Author:   firebirds
Date:     2015-02-10 00:15:10 +0000 (Tue, 10 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-09 18:27:09 UTC (rev 60661)
+++ firebird/trunk/ChangeLog	2015-02-10 00:15:10 UTC (rev 60662)
@@ -1,3 +1,29 @@
+ 2015-02-09 14:39  asfernandes 
+   M src/yvalve/why.cpp
+Misc.
+
+ 2015-02-09 14:24  asfernandes 
+   M src/yvalve/why.cpp
+Fixed fb_get_database_handle and fb_get_transaction_handle.
+
+ 2015-02-09 14:08  alexpeshkoff 
+   M src/common/classes/array.h
+   M src/common/config/config.cpp
+   M src/common/config/config.h
+   M src/common/db_alias.cpp
+   M src/common/db_alias.h
+   M src/common/os/os_utils.h
+   M src/common/os/posix/os_utils.cpp
+   M src/common/os/win32/os_utils.cpp
+   M src/jrd/Database.cpp
+   M src/jrd/Database.h
+   M src/jrd/jrd.cpp
+   M src/jrd/os/pio_proto.h
+   M src/jrd/os/posix/unix.cpp
+   M src/jrd/os/win32/winnt.cpp
+   M src/yvalve/why.cpp
+Fixed CORE-4685: Accessing DB in invalid manner when links (hard or symbolic) are used for it
+
  2015-02-07 16:07  egorpugin 
    M CMakeLists.txt
    M src/common/classes/alloc.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-09 18:27:09 UTC (rev 60661)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-10 00:15:10 UTC (rev 60662)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31629
+  FORMAL BUILD NUMBER:31632
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31629"
-#define FILE_VER_STRING "WI-T3.0.0.31629"
-#define LICENSE_VER_STRING "WI-T3.0.0.31629"
-#define FILE_VER_NUMBER 3, 0, 0, 31629
+#define PRODUCT_VER_STRING "3.0.0.31632"
+#define FILE_VER_STRING "WI-T3.0.0.31632"
+#define LICENSE_VER_STRING "WI-T3.0.0.31632"
+#define FILE_VER_NUMBER 3, 0, 0, 31632
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31629"
+#define FB_BUILD_NO "31632"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-09 18:27:09 UTC (rev 60661)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-10 00:15:10 UTC (rev 60662)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31629
+BuildNum=31632
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <asf...@us...> - 2015-02-11 15:12:20
       | 
| Revision: 60669
          http://sourceforge.net/p/firebird/code/60669
Author:   asfernandes
Date:     2015-02-11 15:12:18 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
Move Helper class from UDR to the main interface header. Use proper (argh) ref. counting in the ExternalContext::get* methods.
Modified Paths:
--------------
    firebird/trunk/examples/udr/Functions.cpp
    firebird/trunk/examples/udr/Triggers.cpp
    firebird/trunk/src/include/firebird/Interface.h
    firebird/trunk/src/include/firebird/UdrCppEngine.h
    firebird/trunk/src/jrd/ExtEngineManager.cpp
Modified: firebird/trunk/examples/udr/Functions.cpp
===================================================================
--- firebird/trunk/examples/udr/Functions.cpp	2015-02-11 15:11:54 UTC (rev 60668)
+++ firebird/trunk/examples/udr/Functions.cpp	2015-02-11 15:12:18 UTC (rev 60669)
@@ -57,7 +57,7 @@
 		delete [] s;
 
 		ISC_STATUS_ARRAY statusVector = {0};
-		isc_db_handle dbHandle = getIscDbHandle(status, context);
+		isc_db_handle dbHandle = Helper::getIscDbHandle(status, context);
 		ISC_ULONG counter = 0;
 
 		FbException::check(isc_wait_for_event(
Modified: firebird/trunk/examples/udr/Triggers.cpp
===================================================================
--- firebird/trunk/examples/udr/Triggers.cpp	2015-02-11 15:11:54 UTC (rev 60668)
+++ firebird/trunk/examples/udr/Triggers.cpp	2015-02-11 15:12:18 UTC (rev 60669)
@@ -73,8 +73,8 @@
 		, triggerMetadata(metadata->getTriggerMetadata(status))
 	{
 		ISC_STATUS_ARRAY statusVector = {0};
-		isc_db_handle dbHandle = getIscDbHandle(status, context);
-		isc_tr_handle trHandle = getIscTrHandle(status, context);
+		isc_db_handle dbHandle = Helper::getIscDbHandle(status, context);
+		isc_tr_handle trHandle = Helper::getIscTrHandle(status, context);
 
 		isc_stmt_handle stmtHandle = 0;
 		FbException::check(isc_dsql_allocate_statement(
@@ -224,8 +224,8 @@
 		, triggerMetadata(metadata->getTriggerMetadata(status))
 	{
 		ISC_STATUS_ARRAY statusVector = {0};
-		isc_db_handle dbHandle = getIscDbHandle(status, context);
-		isc_tr_handle trHandle = getIscTrHandle(status, context);
+		isc_db_handle dbHandle = Helper::getIscDbHandle(status, context);
+		isc_tr_handle trHandle = Helper::getIscTrHandle(status, context);
 
 		isc_stmt_handle stmtHandle = 0;
 		FbException::check(isc_dsql_allocate_statement(
Modified: firebird/trunk/src/include/firebird/Interface.h
===================================================================
--- firebird/trunk/src/include/firebird/Interface.h	2015-02-11 15:11:54 UTC (rev 60668)
+++ firebird/trunk/src/include/firebird/Interface.h	2015-02-11 15:12:18 UTC (rev 60669)
@@ -231,6 +231,94 @@
 		}
 	};
 
+#ifdef FB_API_VER	// internal hack
+	class Helper
+	{
+	public:
+		template <typename StatusType>
+		static isc_db_handle getIscDbHandle(StatusType* status, IAttachment* attachment)
+		{
+			if (!attachment)
+				return 0;
+
+			ISC_STATUS_ARRAY statusVector = {0};
+			isc_db_handle handle = 0;
+
+			fb_get_database_handle(statusVector, &handle, attachment);
+
+			if (!handle)
+			{
+				status->setErrors(statusVector);
+				StatusType::checkException(status);
+			}
+
+			return handle;
+		}
+
+		template <typename StatusType>
+		static isc_db_handle getIscDbHandle(StatusType* status, IExternalContext* context)
+		{
+			IAttachment* attachment = context->getAttachment(status);
+
+			if (!attachment)
+				return 0;
+
+			try
+			{
+				isc_db_handle handle = getIscDbHandle(status, attachment);
+				attachment->release();
+				return handle;
+			}
+			catch (...)
+			{
+				attachment->release();
+				throw;
+			}
+		}
+
+		template <typename StatusType>
+		static isc_tr_handle getIscTrHandle(StatusType* status, ITransaction* transaction)
+		{
+			if (!transaction)
+				return 0;
+
+			ISC_STATUS_ARRAY statusVector = {0};
+			isc_tr_handle handle = 0;
+
+			fb_get_transaction_handle(statusVector, &handle, transaction);
+
+			if (!handle)
+			{
+				status->setErrors(statusVector);
+				StatusType::checkException(status);
+			}
+
+			return handle;
+		}
+
+		template <typename StatusType>
+		static isc_tr_handle getIscTrHandle(StatusType* status, IExternalContext* context)
+		{
+			ITransaction* transaction = context->getTransaction(status);
+
+			if (!transaction)
+				return 0;
+
+			try
+			{
+				isc_tr_handle handle = getIscTrHandle(status, transaction);
+				transaction->release();
+				return handle;
+			}
+			catch (...)
+			{
+				transaction->release();
+				throw;
+			}
+		}
+	};
+#endif	// FB_API_VER
+
 	// Additional API function.
 	// Should be used only in non-plugin modules.
 	// All plugins including providers should use passed at init time interface instead.
Modified: firebird/trunk/src/include/firebird/UdrCppEngine.h
===================================================================
--- firebird/trunk/src/include/firebird/UdrCppEngine.h	2015-02-11 15:11:54 UTC (rev 60668)
+++ firebird/trunk/src/include/firebird/UdrCppEngine.h	2015-02-11 15:12:18 UTC (rev 60669)
@@ -218,57 +218,8 @@
 template <typename T, typename StatusType> class Procedure;
 
 
-class Helper
-{
-public:
-	template <typename StatusType>
-	static isc_db_handle getIscDbHandle(StatusType* status, IExternalContext* context)
-	{
-		IAttachment* attachment = context->getAttachment(status);
-
-		if (!attachment)
-			return 0;
-
-		ISC_STATUS_ARRAY statusVector = {0};
-		isc_db_handle handle = 0;
-
-		fb_get_database_handle(statusVector, &handle, attachment);
-
-		if (!handle)
-		{
-			status->setErrors(statusVector);
-			StatusType::checkException(status);
-		}
-
-		return handle;
-	}
-
-	template <typename StatusType>
-	static isc_tr_handle getIscTrHandle(StatusType* status, IExternalContext* context)
-	{
-		ITransaction* transaction = context->getTransaction(status);
-
-		if (!transaction)
-			return 0;
-
-		ISC_STATUS_ARRAY statusVector = {0};
-		isc_tr_handle handle = 0;
-
-		fb_get_transaction_handle(statusVector, &handle, transaction);
-
-		if (!handle)
-		{
-			status->setErrors(statusVector);
-			StatusType::checkException(status);
-		}
-
-		return handle;
-	}
-};
-
-
 template <typename This, typename Procedure, typename InMessage, typename OutMessage, typename StatusType>
-class ResultSet : public IExternalResultSetImpl<This, StatusType>, public Helper
+class ResultSet : public IExternalResultSetImpl<This, StatusType>
 {
 public:
 	ResultSet(IExternalContext* aContext, Procedure* aProcedure,
@@ -295,7 +246,7 @@
 
 
 template <typename This, typename StatusType>
-class Function : public IExternalFunctionImpl<This, StatusType>, public Helper
+class Function : public IExternalFunctionImpl<This, StatusType>
 {
 public:
 	FB__UDR_COMMON_TYPE(InMessage);
@@ -314,7 +265,7 @@
 
 
 template <typename This, typename StatusType>
-class Procedure : public IExternalProcedureImpl<This, StatusType>, public Helper
+class Procedure : public IExternalProcedureImpl<This, StatusType>
 {
 public:
 	FB__UDR_COMMON_TYPE(InMessage);
@@ -333,7 +284,7 @@
 
 
 template <typename This, typename StatusType>
-class Trigger : public IExternalTriggerImpl<This, StatusType>, public Helper
+class Trigger : public IExternalTriggerImpl<This, StatusType>
 {
 public:
 	FB__UDR_COMMON_TYPE(FieldsMessage);
Modified: firebird/trunk/src/jrd/ExtEngineManager.cpp
===================================================================
--- firebird/trunk/src/jrd/ExtEngineManager.cpp	2015-02-11 15:11:54 UTC (rev 60668)
+++ firebird/trunk/src/jrd/ExtEngineManager.cpp	2015-02-11 15:12:18 UTC (rev 60669)
@@ -640,13 +640,17 @@
 	return engine;
 }
 
-Firebird::IAttachment* ExtEngineManager::ExternalContextImpl::getAttachment(CheckStatusWrapper* /*status*/)
+Firebird::IAttachment* ExtEngineManager::ExternalContextImpl::getAttachment(
+	CheckStatusWrapper* /*status*/)
 {
+	externalAttachment->addRef();
 	return externalAttachment;
 }
 
-Firebird::ITransaction* ExtEngineManager::ExternalContextImpl::getTransaction(CheckStatusWrapper* /*status*/)
+Firebird::ITransaction* ExtEngineManager::ExternalContextImpl::getTransaction(
+	CheckStatusWrapper* /*status*/)
 {
+	externalTransaction->addRef();
 	return externalTransaction;
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-12 00:15:12
       | 
| Revision: 60675
          http://sourceforge.net/p/firebird/code/60675
Author:   firebirds
Date:     2015-02-12 00:15:04 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-11 17:00:58 UTC (rev 60674)
+++ firebird/trunk/ChangeLog	2015-02-12 00:15:04 UTC (rev 60675)
@@ -1,3 +1,53 @@
+ 2015-02-11 17:00  egorpugin 
+   M src/CMakeLists.txt
+[build] [cmake] Fix Windows build.
+
+ 2015-02-11 16:31  alexpeshkoff 
+   M src/common/os/os_utils.h
+   M src/common/os/win32/os_utils.cpp
+One more attempt to fix windows build
+
+ 2015-02-11 15:30  alexpeshkoff 
+   M src/common/os/win32/os_utils.cpp
+This should fix windows build
+
+ 2015-02-11 15:12  asfernandes 
+   M examples/udr/Functions.cpp
+   M examples/udr/Triggers.cpp
+   M src/include/firebird/Interface.h
+   M src/include/firebird/UdrCppEngine.h
+   M src/jrd/ExtEngineManager.cpp
+Move Helper class from UDR to the main interface header. Use proper (argh) ref. counting in the ExternalContext::get* methods.
+
+ 2015-02-11 15:11  asfernandes 
+   M src/jrd/ibase.h
+Increase FB_API_VER to 30.
+
+ 2015-02-11 10:19  alexpeshkoff 
+   M src/jrd/ibsetjmp.h
+Fixed posix build
+
+ 2015-02-11 09:20  dimitr 
+   M src/jrd/cch.cpp
+   M src/jrd/jrd.h
+Change the status handling a little.
+
+ 2015-02-10 14:17  hvlad 
+   M src/common/isc_s_proto.h
+   M src/common/isc_sync.cpp
+   M src/jrd/blob_filter.cpp
+   M src/jrd/ibsetjmp.h
+   M src/jrd/jrd.h
+Fixed bug CORE-4688 : Recovery after stack overflow exception is not complete
+
+ 2015-02-10 13:32  alexpeshkoff 
+   M examples/interfaces/01.create.cpp
+   M examples/interfaces/02.update.cpp
+   M examples/interfaces/03.select.cpp
+   M examples/interfaces/04.print_table.cpp
+   M examples/interfaces/ifaceExamples.h
+Bring examples up-to-date, use ThrowStatusWrapper in them
+
  2015-02-09 14:39  asfernandes 
    M src/yvalve/why.cpp
 Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-11 17:00:58 UTC (rev 60674)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-12 00:15:04 UTC (rev 60675)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31632
+  FORMAL BUILD NUMBER:31641
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31632"
-#define FILE_VER_STRING "WI-T3.0.0.31632"
-#define LICENSE_VER_STRING "WI-T3.0.0.31632"
-#define FILE_VER_NUMBER 3, 0, 0, 31632
+#define PRODUCT_VER_STRING "3.0.0.31641"
+#define FILE_VER_STRING "WI-T3.0.0.31641"
+#define LICENSE_VER_STRING "WI-T3.0.0.31641"
+#define FILE_VER_NUMBER 3, 0, 0, 31641
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31632"
+#define FB_BUILD_NO "31641"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-11 17:00:58 UTC (rev 60674)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-12 00:15:04 UTC (rev 60675)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31632
+BuildNum=31641
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ego...@us...> - 2015-02-12 15:50:42
       | 
| Revision: 60676
          http://sourceforge.net/p/firebird/code/60676
Author:   egorpugin
Date:     2015-02-12 15:50:35 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
[build] [cmake] Fix issue with PATH on linux.
Modified Paths:
--------------
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-12 00:15:04 UTC (rev 60675)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-12 15:50:35 UTC (rev 60676)
@@ -264,8 +264,8 @@
         set(dir ${boot_dir})
     endif()
     
-    set_win32(env "PATH=%PATH%\;${dir}")
-    set_unix (env "PATH=$PATH:${dir}/bin")
+    set_win32(env "PATH=${dir}\;%PATH%")
+    set_unix (env "PATH=${dir}/bin:$PATH")
     set(env "${env}"
         FIREBIRD=${dir}
     )
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-12 00:15:04 UTC (rev 60675)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-12 15:50:35 UTC (rev 60676)
@@ -347,7 +347,7 @@
 endif()
 
 add_library                 (common ${common_src} ${common_os_src} ${common_include})
-target_link_libraries       (common PRIVATE ${LIB_mpr})
+target_link_libraries       (common ${LIB_mpr})
 
 
 ################################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-13 00:14:22
       | 
| Revision: 60678
          http://sourceforge.net/p/firebird/code/60678
Author:   firebirds
Date:     2015-02-13 00:14:18 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-12 19:56:14 UTC (rev 60677)
+++ firebird/trunk/ChangeLog	2015-02-13 00:14:18 UTC (rev 60678)
@@ -1,3 +1,8 @@
+ 2015-02-12 15:50  egorpugin 
+   M builds/cmake/BuildFunctions.cmake
+   M src/CMakeLists.txt
+[build] [cmake] Fix issue with PATH on linux.
+
  2015-02-11 17:00  egorpugin 
    M src/CMakeLists.txt
 [build] [cmake] Fix Windows build.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-12 19:56:14 UTC (rev 60677)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-13 00:14:18 UTC (rev 60678)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31641
+  FORMAL BUILD NUMBER:31642
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31641"
-#define FILE_VER_STRING "WI-T3.0.0.31641"
-#define LICENSE_VER_STRING "WI-T3.0.0.31641"
-#define FILE_VER_NUMBER 3, 0, 0, 31641
+#define PRODUCT_VER_STRING "3.0.0.31642"
+#define FILE_VER_STRING "WI-T3.0.0.31642"
+#define LICENSE_VER_STRING "WI-T3.0.0.31642"
+#define FILE_VER_NUMBER 3, 0, 0, 31642
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31641"
+#define FB_BUILD_NO "31642"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-12 19:56:14 UTC (rev 60677)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-13 00:14:18 UTC (rev 60678)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31641
+BuildNum=31642
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-14 00:14:02
       | 
| Revision: 60682
          http://sourceforge.net/p/firebird/code/60682
Author:   firebirds
Date:     2015-02-14 00:13:55 +0000 (Sat, 14 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-13 19:45:15 UTC (rev 60681)
+++ firebird/trunk/ChangeLog	2015-02-14 00:13:55 UTC (rev 60682)
@@ -1,3 +1,10 @@
+ 2015-02-13 13:46  hvlad 
+   M builds/win32/msvc10/legacy_auth.vcxproj
+   M builds/win32/msvc10/legacy_usermanager.vcxproj
+   M builds/win32/msvc12/legacy_auth.vcxproj
+   M builds/win32/msvc12/legacy_usermanager.vcxproj
+This should fix msvc10 and msvc12 builds
+
  2015-02-12 15:50  egorpugin 
    M builds/cmake/BuildFunctions.cmake
    M src/CMakeLists.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-13 19:45:15 UTC (rev 60681)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-14 00:13:55 UTC (rev 60682)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31642
+  FORMAL BUILD NUMBER:31643
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31642"
-#define FILE_VER_STRING "WI-T3.0.0.31642"
-#define LICENSE_VER_STRING "WI-T3.0.0.31642"
-#define FILE_VER_NUMBER 3, 0, 0, 31642
+#define PRODUCT_VER_STRING "3.0.0.31643"
+#define FILE_VER_STRING "WI-T3.0.0.31643"
+#define LICENSE_VER_STRING "WI-T3.0.0.31643"
+#define FILE_VER_NUMBER 3, 0, 0, 31643
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31642"
+#define FB_BUILD_NO "31643"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-13 19:45:15 UTC (rev 60681)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-14 00:13:55 UTC (rev 60682)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31642
+BuildNum=31643
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <asf...@us...> - 2015-02-14 18:55:02
       | 
| Revision: 60690
          http://sourceforge.net/p/firebird/code/60690
Author:   asfernandes
Date:     2015-02-14 18:55:00 +0000 (Sat, 14 Feb 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
    firebird/trunk/builds/posix/udr_plugin.vers
    firebird/trunk/examples/interfaces/01.create.cpp
    firebird/trunk/examples/interfaces/02.update.cpp
    firebird/trunk/src/alice/main/aliceMain.cpp
    firebird/trunk/src/burp/main/burpMain.cpp
    firebird/trunk/src/common/isc.cpp
    firebird/trunk/src/dsql/DsqlCursor.cpp
    firebird/trunk/src/dsql/DsqlCursor.h
    firebird/trunk/src/jrd/cch.cpp
    firebird/trunk/src/jrd/jrd.cpp
    firebird/trunk/src/lock/lock.cpp
    firebird/trunk/src/lock/print.cpp
    firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
    firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
    firebird/trunk/src/remote/remote.cpp
    firebird/trunk/src/remote/remote.h
    firebird/trunk/src/utilities/gsec/main/gsecMain.cpp
    firebird/trunk/src/utilities/gstat/main/gstatMain.cpp
    firebird/trunk/src/yvalve/DistributedTransaction.cpp
    firebird/trunk/src/yvalve/DistributedTransaction.h
Modified: firebird/trunk/builds/posix/udr_plugin.vers
===================================================================
--- firebird/trunk/builds/posix/udr_plugin.vers	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/builds/posix/udr_plugin.vers	2015-02-14 18:55:00 UTC (rev 60690)
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing rights
 #   and limitations under the License.
 #
-#   The Original Code was created by Nickolay Samofatov
+#   The Original Code was created by Adriano dos Santos Fernandes
 #   for the Firebird Open Source RDBMS project.
 #
 #   Copyright (c) 2015 Adriano dos Santos Fernandes <adr...@gm...>
Modified: firebird/trunk/examples/interfaces/01.create.cpp
===================================================================
--- firebird/trunk/examples/interfaces/01.create.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/examples/interfaces/01.create.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -3,7 +3,7 @@
  *	MODULE:		01.create.cpp
  *	DESCRIPTION:	A sample of creating new database and new table in it.
  *					Run second time (whene database already exists) to see
- *					how FbException is caught and handled by thid code.
+ *					how FbException is caught and handled by this code.
  *
  *					Example for the following interfaces:
  *					IMaster - main inteface to access all the rest
Modified: firebird/trunk/examples/interfaces/02.update.cpp
===================================================================
--- firebird/trunk/examples/interfaces/02.update.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/examples/interfaces/02.update.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -131,7 +131,7 @@
 			{
 			    stmt->execute(&status, tra, meta, buffer, NULL, NULL);
 			}
-			catch(const FbException& error)
+			catch (const FbException& error)
 			{
 				// Handle exception raised during statement execution
 				int sqlcode = isc_sqlcode(error.getStatus()->getErrors());
@@ -210,4 +210,3 @@
  
     return 1;
 }
-
Modified: firebird/trunk/src/alice/main/aliceMain.cpp
===================================================================
--- firebird/trunk/src/alice/main/aliceMain.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/alice/main/aliceMain.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
 		Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
  		return alice(uSvc);
  	}
- 	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
  	{
  		ISC_STATUS_ARRAY st;
  		ex.stuff_exception(st);
Modified: firebird/trunk/src/burp/main/burpMain.cpp
===================================================================
--- firebird/trunk/src/burp/main/burpMain.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/burp/main/burpMain.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
 		Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
  		return gbak(uSvc);
  	}
- 	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
  	{
  		ISC_STATUS_ARRAY st;
  		ex.stuff_exception(st);
Modified: firebird/trunk/src/common/isc.cpp
===================================================================
--- firebird/trunk/src/common/isc.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/common/isc.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -355,7 +355,7 @@
 		p = password->pw_name;
 	else
 		p = "";
-#ifndef ANDROID		// Why do they print silly unimplemted message for this function?
+#ifndef ANDROID		// Why do they print silly unimplemented message for this function?
 	endpwent();
 #endif
 
Modified: firebird/trunk/src/dsql/DsqlCursor.cpp
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/dsql/DsqlCursor.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -30,8 +30,8 @@
 using namespace Firebird;
 using namespace Jrd;
 
-const char* const SCRATCH = "fb_cursor_";
-const ULONG PREFETCH_SIZE = 65536; // 64 KB
+static const char* const SCRATCH = "fb_cursor_";
+static const ULONG PREFETCH_SIZE = 65536; // 64 KB
 
 DsqlCursor::DsqlCursor(dsql_req* req, ULONG flags)
 	: m_request(req), m_flags(flags),
Modified: firebird/trunk/src/dsql/DsqlCursor.h
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.h	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/dsql/DsqlCursor.h	2015-02-14 18:55:00 UTC (rev 60690)
@@ -75,4 +75,3 @@
 } // namespace
 
 #endif // DSQL_CURSOR_H
-
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/jrd/cch.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -3242,8 +3242,8 @@
 			return; // false;
 
 		// hvlad: buffer is in use and we can't downgrade its lock. But if this
-		// buffer blocks some lower precedence buffer, it is enough to just write 
-		// our (high) buffer to clear precedence and thus allow blocked (low) 
+		// buffer blocks some lower precedence buffer, it is enough to just write
+		// our (high) buffer to clear precedence and thus allow blocked (low)
 		// buffer to be downgraded. IO lock guarantees that there is no buffer
 		// modification in progress currently and it is safe to write it right now.
 		// No need to mark our buffer as blocking nor to change state of our lock.
@@ -3255,9 +3255,9 @@
 			return; // true
 		}
 
-		if (!oldBlocking) {
+		if (!oldBlocking)
 			bdb->bdb_ast_flags &= ~BDB_blocking;
-		}
+
 		justWrite = true;
 	}
 
@@ -3397,6 +3397,7 @@
 	} // syncPrec scope
 
 	bdb->bdb_flags &= ~BDB_not_valid;
+
 	if (justWrite)
 		bdb->unLockIO(tdbb);
 	else
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/jrd/jrd.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -4495,10 +4495,8 @@
 				}
 			}
 
-			DsqlCursor* const cursor =
-				DSQL_open(tdbb, &tra, getHandle(),
-						  inMetadata, static_cast<UCHAR*>(inBuffer),
-						  outMetadata, flags);
+			DsqlCursor* const cursor = DSQL_open(tdbb, &tra, getHandle(),
+				inMetadata, static_cast<UCHAR*>(inBuffer), outMetadata, flags);
 
 			rs = new JResultSet(cursor, this);
 			rs->addRef();
Modified: firebird/trunk/src/lock/lock.cpp
===================================================================
--- firebird/trunk/src/lock/lock.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/lock/lock.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -1686,8 +1686,8 @@
 	{
 		TEXT bug_buffer[BUFFER_TINY];
 		sprintf(bug_buffer, "inconsistent lock table type/version; found %d/%d:%d, expected %d/%d:%d",
-			m_sharedMemory->getHeader()->mhb_type, 
-			m_sharedMemory->getHeader()->mhb_header_version, 
+			m_sharedMemory->getHeader()->mhb_type,
+			m_sharedMemory->getHeader()->mhb_header_version,
 			m_sharedMemory->getHeader()->mhb_version,
 			SharedMemoryBase::SRAM_LOCK_MANAGER, MemoryHeader::HEADER_VERSION, LHB_VERSION);
 		bug(&statusVector, bug_buffer);
Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/lock/print.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -762,7 +762,7 @@
 
 	// if we can't read this version - admit there's nothing to say and return.
 
-	if (LOCK_header->mhb_header_version != MemoryHeader::HEADER_VERSION || 
+	if (LOCK_header->mhb_header_version != MemoryHeader::HEADER_VERSION ||
 		LOCK_header->mhb_version != LHB_VERSION)
 	{
 		if (LOCK_header->mhb_type == 0 && LOCK_header->mhb_header_version == 0 && LOCK_header->mhb_version == 0)
Modified: firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
===================================================================
--- firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -127,7 +127,7 @@
 	    k = key->getDecryptKey(&l);
 		de = createCypher(l, k);
 	}
-	catch(const Exception& ex)
+	catch (const Exception& ex)
 	{
 		ex.stuffException(status);
 	}
Modified: firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
===================================================================
--- firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -199,8 +199,6 @@
 			for (bool cont = accessor.getFirst(); cont; cont = accessor.getNext())
 				accessor.current()->second->dispose();
 		}
-
-		delete module;
 	}
 
 public:
@@ -265,7 +263,7 @@
 
 private:
 	PathName moduleName;
-	ModuleLoader::Module* module;
+	AutoPtr<ModuleLoader::Module> module;
 
 public:
 	FB_BOOLEAN myUnloadFlag;
Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/remote/remote.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -1676,7 +1676,8 @@
 }
 
 
-void InternalCryptKey::setSymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned keyLength, const void* key)
+void InternalCryptKey::setSymmetric(Firebird::CheckStatusWrapper* status, const char* type,
+	unsigned keyLength, const void* key)
 {
 	try
 	{
@@ -1685,14 +1686,15 @@
 		encrypt.set(keyLength, key);
 		decrypt.clear();
 	}
-	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
 	{
 		ex.stuffException(status);
 	}
 }
 
-void InternalCryptKey::setAsymmetric(Firebird::CheckStatusWrapper* status, const char* type, unsigned encryptKeyLength,
-	const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey)
+void InternalCryptKey::setAsymmetric(Firebird::CheckStatusWrapper* status, const char* type,
+	unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength,
+	const void* decryptKey)
 {
 	try
 	{
@@ -1701,7 +1703,7 @@
 		encrypt.set(encryptKeyLength, encryptKey);
 		decrypt.set(decryptKeyLength, decryptKey);
 	}
-	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
 	{
 		ex.stuffException(status);
 	}
Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/remote/remote.h	2015-02-14 18:55:00 UTC (rev 60690)
@@ -637,7 +637,8 @@
 };
 
 // CryptKey implementation
-class InternalCryptKey FB_FINAL : public Firebird::VersionedIface<Firebird::ICryptKeyImpl<InternalCryptKey, Firebird::CheckStatusWrapper> >,
+class InternalCryptKey FB_FINAL :
+	public Firebird::VersionedIface<Firebird::ICryptKeyImpl<InternalCryptKey, Firebird::CheckStatusWrapper> >,
 	public Firebird::GlobalStorage
 {
 public:
Modified: firebird/trunk/src/utilities/gsec/main/gsecMain.cpp
===================================================================
--- firebird/trunk/src/utilities/gsec/main/gsecMain.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/utilities/gsec/main/gsecMain.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
 		Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
  		return gsec(uSvc);
  	}
- 	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
  	{
  		ISC_STATUS_ARRAY st;
  		ex.stuff_exception(st);
Modified: firebird/trunk/src/utilities/gstat/main/gstatMain.cpp
===================================================================
--- firebird/trunk/src/utilities/gstat/main/gstatMain.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/utilities/gstat/main/gstatMain.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -48,7 +48,7 @@
 		Firebird::AutoPtr<Firebird::UtilSvc> uSvc(Firebird::UtilSvc::createStandalone(argc, argv));
  		return gstat(uSvc);
  	}
- 	catch(const Firebird::Exception& ex)
+	catch (const Firebird::Exception& ex)
  	{
  		ISC_STATUS_ARRAY st;
  		ex.stuff_exception(st);
Modified: firebird/trunk/src/yvalve/DistributedTransaction.cpp
===================================================================
--- firebird/trunk/src/yvalve/DistributedTransaction.cpp	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/yvalve/DistributedTransaction.cpp	2015-02-14 18:55:00 UTC (rev 60690)
@@ -502,7 +502,8 @@
 	this->addWithTpb(status, att, 0, NULL);
 }
 
-void DtcStart::addWithTpb(CheckStatusWrapper* status, IAttachment* att, unsigned length, const unsigned char* tpb)
+void DtcStart::addWithTpb(CheckStatusWrapper* status, IAttachment* att,
+	unsigned length, const unsigned char* tpb)
 {
 	try
 	{
Modified: firebird/trunk/src/yvalve/DistributedTransaction.h
===================================================================
--- firebird/trunk/src/yvalve/DistributedTransaction.h	2015-02-14 14:56:16 UTC (rev 60689)
+++ firebird/trunk/src/yvalve/DistributedTransaction.h	2015-02-14 18:55:00 UTC (rev 60690)
@@ -62,7 +62,8 @@
 
 	// IDtcStart implementation
 	void addAttachment(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att);
-	void addWithTpb(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att, unsigned length, const unsigned char* tpb);
+	void addWithTpb(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att,
+		unsigned length, const unsigned char* tpb);
 	YTransaction* start(Firebird::CheckStatusWrapper* status);
 	void dispose();
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2015-02-15 00:13:03
       | 
| Revision: 60691
          http://sourceforge.net/p/firebird/code/60691
Author:   firebirds
Date:     2015-02-15 00:13:01 +0000 (Sun, 15 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-02-14 18:55:00 UTC (rev 60690)
+++ firebird/trunk/ChangeLog	2015-02-15 00:13:01 UTC (rev 60691)
@@ -1,3 +1,26 @@
+ 2015-02-14 18:55  asfernandes 
+   M builds/posix/udr_plugin.vers
+   M examples/interfaces/01.create.cpp
+   M examples/interfaces/02.update.cpp
+   M src/alice/main/aliceMain.cpp
+   M src/burp/main/burpMain.cpp
+   M src/common/isc.cpp
+   M src/dsql/DsqlCursor.cpp
+   M src/dsql/DsqlCursor.h
+   M src/jrd/cch.cpp
+   M src/jrd/jrd.cpp
+   M src/lock/lock.cpp
+   M src/lock/print.cpp
+   M src/plugins/crypt/arc4/Arc4.cpp
+   M src/plugins/udr_engine/UdrEngine.cpp
+   M src/remote/remote.cpp
+   M src/remote/remote.h
+   M src/utilities/gsec/main/gsecMain.cpp
+   M src/utilities/gstat/main/gstatMain.cpp
+   M src/yvalve/DistributedTransaction.cpp
+   M src/yvalve/DistributedTransaction.h
+Misc.
+
  2015-02-13 13:46  hvlad 
    M builds/win32/msvc10/legacy_auth.vcxproj
    M builds/win32/msvc10/legacy_usermanager.vcxproj
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-02-14 18:55:00 UTC (rev 60690)
+++ firebird/trunk/src/jrd/build_no.h	2015-02-15 00:13:01 UTC (rev 60691)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31643
+  FORMAL BUILD NUMBER:31644
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31643"
-#define FILE_VER_STRING "WI-T3.0.0.31643"
-#define LICENSE_VER_STRING "WI-T3.0.0.31643"
-#define FILE_VER_NUMBER 3, 0, 0, 31643
+#define PRODUCT_VER_STRING "3.0.0.31644"
+#define FILE_VER_STRING "WI-T3.0.0.31644"
+#define LICENSE_VER_STRING "WI-T3.0.0.31644"
+#define FILE_VER_NUMBER 3, 0, 0, 31644
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31643"
+#define FB_BUILD_NO "31644"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-02-14 18:55:00 UTC (rev 60690)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-02-15 00:13:01 UTC (rev 60691)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31643
+BuildNum=31644
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 |