Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2014-07-16 00:26:36
|
Revision: 59877
http://sourceforge.net/p/firebird/code/59877
Author: firebirds
Date: 2014-07-16 00:26:28 +0000 (Wed, 16 Jul 2014)
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 2014-07-15 19:41:56 UTC (rev 59876)
+++ firebird/trunk/ChangeLog 2014-07-16 00:26:28 UTC (rev 59877)
@@ -1,3 +1,11 @@
+ 2014-07-15 19:41 dimitr
+ M src/jrd/recsrc/IndexTableScan.cpp
+Fixed the crash I accidentally introduced a few days ago.
+
+ 2014-07-15 14:47 asfernandes
+ M src/jrd/recsrc/ExternalTableScan.cpp
+Warning.
+
2014-07-14 19:33 dimitr
M builds/win32/make_all.bat
Added the missing but required (by ICU) runtime lib.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-15 19:41:56 UTC (rev 59876)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-16 00:26:28 UTC (rev 59877)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31226
+ FORMAL BUILD NUMBER:31228
*/
-#define PRODUCT_VER_STRING "3.0.0.31226"
-#define FILE_VER_STRING "WI-T3.0.0.31226"
-#define LICENSE_VER_STRING "WI-T3.0.0.31226"
-#define FILE_VER_NUMBER 3, 0, 0, 31226
+#define PRODUCT_VER_STRING "3.0.0.31228"
+#define FILE_VER_STRING "WI-T3.0.0.31228"
+#define LICENSE_VER_STRING "WI-T3.0.0.31228"
+#define FILE_VER_NUMBER 3, 0, 0, 31228
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31226"
+#define FB_BUILD_NO "31228"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-15 19:41:56 UTC (rev 59876)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-16 00:26:28 UTC (rev 59877)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31226
+BuildNum=31228
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...> - 2014-07-17 00:27:14
|
Revision: 59880
http://sourceforge.net/p/firebird/code/59880
Author: firebirds
Date: 2014-07-17 00:27:11 +0000 (Thu, 17 Jul 2014)
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 2014-07-16 12:51:22 UTC (rev 59879)
+++ firebird/trunk/ChangeLog 2014-07-17 00:27:11 UTC (rev 59880)
@@ -1,3 +1,14 @@
+ 2014-07-16 12:51 dimitr
+ M src/jrd/recsrc/BitmapTableScan.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+More fixes for the explained plan output.
+
+ 2014-07-16 10:09 roman-simakov
+ M src/jrd/grant.epp
+ M src/jrd/irq.h
+ M src/jrd/obj.h
+Fixed crash due restore from backup after DDL permissions implementation and changed prefix of SC to general SQL$ to skip backuping such classes by standard way.
+
2014-07-15 19:41 dimitr
M src/jrd/recsrc/IndexTableScan.cpp
Fixed the crash I accidentally introduced a few days ago.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-16 12:51:22 UTC (rev 59879)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-17 00:27:11 UTC (rev 59880)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31228
+ FORMAL BUILD NUMBER:31230
*/
-#define PRODUCT_VER_STRING "3.0.0.31228"
-#define FILE_VER_STRING "WI-T3.0.0.31228"
-#define LICENSE_VER_STRING "WI-T3.0.0.31228"
-#define FILE_VER_NUMBER 3, 0, 0, 31228
+#define PRODUCT_VER_STRING "3.0.0.31230"
+#define FILE_VER_STRING "WI-T3.0.0.31230"
+#define LICENSE_VER_STRING "WI-T3.0.0.31230"
+#define FILE_VER_NUMBER 3, 0, 0, 31230
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31228"
+#define FB_BUILD_NO "31230"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-16 12:51:22 UTC (rev 59879)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-17 00:27:11 UTC (rev 59880)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31228
+BuildNum=31230
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2014-07-17 18:48:53
|
Revision: 59881
http://sourceforge.net/p/firebird/code/59881
Author: skidder
Date: 2014-07-17 18:48:46 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Fix build warnings
Modified Paths:
--------------
firebird/trunk/builds/win32/defs/intl.def
firebird/trunk/builds/win32/make_all.bat
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/builds/win32/msvc10/alice.vcxproj
firebird/trunk/builds/win32/msvc10/burp.vcxproj
firebird/trunk/builds/win32/msvc10/common.vcxproj
firebird/trunk/builds/win32/msvc10/engine.vcxproj
firebird/trunk/builds/win32/msvc10/fb2control.vcxproj
firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj
firebird/trunk/builds/win32/msvc10/fbguard.vcxproj
firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj
firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj
firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj
firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj
firebird/trunk/builds/win32/msvc10/fbudf.vcxproj
firebird/trunk/builds/win32/msvc10/gbak.vcxproj
firebird/trunk/builds/win32/msvc10/gfix.vcxproj
firebird/trunk/builds/win32/msvc10/gpre.vcxproj
firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj
firebird/trunk/builds/win32/msvc10/gsec.vcxproj
firebird/trunk/builds/win32/msvc10/gsplit.vcxproj
firebird/trunk/builds/win32/msvc10/gstat.vcxproj
firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj
firebird/trunk/builds/win32/msvc10/ib_util.vcxproj
firebird/trunk/builds/win32/msvc10/instclient.vcxproj
firebird/trunk/builds/win32/msvc10/instreg.vcxproj
firebird/trunk/builds/win32/msvc10/instsvc.vcxproj
firebird/trunk/builds/win32/msvc10/intl.vcxproj
firebird/trunk/builds/win32/msvc10/isql.vcxproj
firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj
firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj
firebird/trunk/builds/win32/msvc10/nbackup.vcxproj
firebird/trunk/builds/win32/msvc10/qli.vcxproj
firebird/trunk/builds/win32/msvc10/remote.vcxproj
firebird/trunk/builds/win32/msvc10/srp.vcxproj
firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj
firebird/trunk/builds/win32/msvc10/yvalve.vcxproj
firebird/trunk/builds/win32/msvc8/common.vcproj
firebird/trunk/builds/win32/msvc9/common.vcproj
firebird/trunk/builds/win32/set_build_target.bat
firebird/trunk/src/alice/alice_meta.epp
firebird/trunk/src/alice/exe.cpp
firebird/trunk/src/alice/tdr.cpp
firebird/trunk/src/auth/SecureRemotePassword/Message.h
firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/burp/backup.epp
firebird/trunk/src/burp/burp.cpp
firebird/trunk/src/burp/canonical.cpp
firebird/trunk/src/burp/restore.epp
firebird/trunk/src/burp/split/spit.cpp
firebird/trunk/src/common/IntlUtil.cpp
firebird/trunk/src/common/UtilSvc.cpp
firebird/trunk/src/common/UtilSvc.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/classes/AlignedBuffer.h
firebird/trunk/src/common/classes/BaseStream.cpp
firebird/trunk/src/common/classes/BlrWriter.h
firebird/trunk/src/common/classes/ByteChunk.h
firebird/trunk/src/common/classes/ClumpletReader.cpp
firebird/trunk/src/common/classes/ClumpletReader.h
firebird/trunk/src/common/classes/ClumpletWriter.cpp
firebird/trunk/src/common/classes/ClumpletWriter.h
firebird/trunk/src/common/classes/File.h
firebird/trunk/src/common/classes/Hash.h
firebird/trunk/src/common/classes/MetaName.cpp
firebird/trunk/src/common/classes/MetaName.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/classes/SafeArg.cpp
firebird/trunk/src/common/classes/SafeArg.h
firebird/trunk/src/common/classes/Switches.cpp
firebird/trunk/src/common/classes/Switches.h
firebird/trunk/src/common/classes/TempFile.cpp
firebird/trunk/src/common/classes/TempFile.h
firebird/trunk/src/common/classes/UserBlob.cpp
firebird/trunk/src/common/classes/UserBlob.h
firebird/trunk/src/common/classes/VaryStr.h
firebird/trunk/src/common/classes/alloc.cpp
firebird/trunk/src/common/classes/array.h
firebird/trunk/src/common/classes/fb_string.cpp
firebird/trunk/src/common/classes/fb_string.h
firebird/trunk/src/common/classes/misc/class_test.cpp
firebird/trunk/src/common/classes/objects_array.h
firebird/trunk/src/common/classes/semaphore.cpp
firebird/trunk/src/common/classes/semaphore.h
firebird/trunk/src/common/classes/stack.h
firebird/trunk/src/common/classes/tree.h
firebird/trunk/src/common/classes/vector.h
firebird/trunk/src/common/common.h
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/config/dir_list.cpp
firebird/trunk/src/common/config/dir_list.h
firebird/trunk/src/common/config/os/config_root.h
firebird/trunk/src/common/cvt.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/isc_f_proto.h
firebird/trunk/src/common/isc_file.cpp
firebird/trunk/src/common/isc_sync.cpp
firebird/trunk/src/common/os/guid.h
firebird/trunk/src/common/os/posix/guid.cpp
firebird/trunk/src/common/os/win32/guid.cpp
firebird/trunk/src/common/os/win32/os_utils.cpp
firebird/trunk/src/common/security.h
firebird/trunk/src/common/stuff.h
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/common/utils_proto.h
firebird/trunk/src/common/xdr.cpp
firebird/trunk/src/dsql/BlrDebugWriter.cpp
firebird/trunk/src/dsql/BoolNodes.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DsqlCompilerScratch.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/Nodes.h
firebird/trunk/src/dsql/PackageNodes.epp
firebird/trunk/src/dsql/Parser.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/errd.cpp
firebird/trunk/src/dsql/gen.cpp
firebird/trunk/src/dsql/make.cpp
firebird/trunk/src/dsql/metd.epp
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/dsql/pass1.cpp
firebird/trunk/src/extlib/fbudf/fbudf.cpp
firebird/trunk/src/extlib/ib_udf.cpp
firebird/trunk/src/extlib/ib_util.cpp
firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp
firebird/trunk/src/gpre/c_cxx.cpp
firebird/trunk/src/gpre/cmd.cpp
firebird/trunk/src/gpre/cme.cpp
firebird/trunk/src/gpre/cmp.cpp
firebird/trunk/src/gpre/exp.cpp
firebird/trunk/src/gpre/gpre.cpp
firebird/trunk/src/gpre/gpre.h
firebird/trunk/src/gpre/languages/ada.cpp
firebird/trunk/src/gpre/languages/cob.cpp
firebird/trunk/src/gpre/languages/fbrmclib.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/languages/pas.cpp
firebird/trunk/src/gpre/languages/rmc.cpp
firebird/trunk/src/gpre/msc.cpp
firebird/trunk/src/gpre/obj_cxx.cpp
firebird/trunk/src/gpre/par.cpp
firebird/trunk/src/gpre/sqe.cpp
firebird/trunk/src/gpre/sql.cpp
firebird/trunk/src/gpre/std/gpre_meta.epp
firebird/trunk/src/include/firebird/UdrEngine.h
firebird/trunk/src/include/types_pub.h
firebird/trunk/src/intl/cv_big5.cpp
firebird/trunk/src/intl/cv_gb2312.cpp
firebird/trunk/src/intl/cv_icu.cpp
firebird/trunk/src/intl/cv_jis.cpp
firebird/trunk/src/intl/cv_ksc.cpp
firebird/trunk/src/intl/cv_narrow.cpp
firebird/trunk/src/intl/cv_unicode_fss.cpp
firebird/trunk/src/iscguard/iscguard.cpp
firebird/trunk/src/isql/extract.epp
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/Attachment.cpp
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/Collation.cpp
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/DataTypeUtil.cpp
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/Database.h
firebird/trunk/src/jrd/DatabaseSnapshot.cpp
firebird/trunk/src/jrd/DatabaseSnapshot.h
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/GarbageCollector.cpp
firebird/trunk/src/jrd/GlobalRWLock.cpp
firebird/trunk/src/jrd/GlobalRWLock.h
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/JrdStatement.cpp
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/Optimizer.cpp
firebird/trunk/src/jrd/Optimizer.h
firebird/trunk/src/jrd/PreparedStatement.cpp
firebird/trunk/src/jrd/PreparedStatement.h
firebird/trunk/src/jrd/RandomGenerator.cpp
firebird/trunk/src/jrd/RandomGenerator.h
firebird/trunk/src/jrd/RecordSourceNodes.cpp
firebird/trunk/src/jrd/RecordSourceNodes.h
firebird/trunk/src/jrd/Relation.cpp
firebird/trunk/src/jrd/Relation.h
firebird/trunk/src/jrd/RuntimeStatistics.cpp
firebird/trunk/src/jrd/RuntimeStatistics.h
firebird/trunk/src/jrd/SimilarToMatcher.h
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/TempSpace.cpp
firebird/trunk/src/jrd/TempSpace.h
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/blb.cpp
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/btr.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/cmp.cpp
firebird/trunk/src/jrd/constants.h
firebird/trunk/src/jrd/cvt2.cpp
firebird/trunk/src/jrd/dfw.epp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/dyn_util.epp
firebird/trunk/src/jrd/err.cpp
firebird/trunk/src/jrd/event.cpp
firebird/trunk/src/jrd/evl_string.h
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/exe.h
firebird/trunk/src/jrd/extds/ExtDS.cpp
firebird/trunk/src/jrd/extds/IscDS.cpp
firebird/trunk/src/jrd/filters.cpp
firebird/trunk/src/jrd/flu.cpp
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/grant.epp
firebird/trunk/src/jrd/idx.cpp
firebird/trunk/src/jrd/inf.cpp
firebird/trunk/src/jrd/ini.epp
firebird/trunk/src/jrd/intl.cpp
firebird/trunk/src/jrd/intl_builtin.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/met.epp
firebird/trunk/src/jrd/nbak.cpp
firebird/trunk/src/jrd/ntrace.h
firebird/trunk/src/jrd/ods.cpp
firebird/trunk/src/jrd/ods_proto.h
firebird/trunk/src/jrd/opt.cpp
firebird/trunk/src/jrd/os/pio_proto.h
firebird/trunk/src/jrd/os/posix/unix.cpp
firebird/trunk/src/jrd/os/win32/winnt.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/jrd/par.cpp
firebird/trunk/src/jrd/par_proto.h
firebird/trunk/src/jrd/recsrc/BufferedStream.cpp
firebird/trunk/src/jrd/recsrc/HashJoin.cpp
firebird/trunk/src/jrd/recsrc/IndexTableScan.cpp
firebird/trunk/src/jrd/recsrc/MergeJoin.cpp
firebird/trunk/src/jrd/recsrc/NestedLoopJoin.cpp
firebird/trunk/src/jrd/recsrc/RecordSource.h
firebird/trunk/src/jrd/recsrc/RecursiveStream.cpp
firebird/trunk/src/jrd/recsrc/SingularStream.cpp
firebird/trunk/src/jrd/recsrc/Union.cpp
firebird/trunk/src/jrd/rpb_chain.cpp
firebird/trunk/src/jrd/scl.epp
firebird/trunk/src/jrd/sdw.cpp
firebird/trunk/src/jrd/sort.cpp
firebird/trunk/src/jrd/sort.h
firebird/trunk/src/jrd/sqz.cpp
firebird/trunk/src/jrd/sqz.h
firebird/trunk/src/jrd/status.cpp
firebird/trunk/src/jrd/status.h
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/svc.h
firebird/trunk/src/jrd/tpc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp
firebird/trunk/src/jrd/trace/TraceDSQLHelpers.h
firebird/trunk/src/jrd/trace/TraceLog.cpp
firebird/trunk/src/jrd/trace/TraceLog.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/jrd/trace/TraceService.cpp
firebird/trunk/src/jrd/validation.cpp
firebird/trunk/src/jrd/vio.cpp
firebird/trunk/src/lock/print.cpp
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/all.cpp
firebird/trunk/src/qli/dtr.cpp
firebird/trunk/src/qli/err.cpp
firebird/trunk/src/qli/err_proto.h
firebird/trunk/src/qli/exe.cpp
firebird/trunk/src/qli/expand.cpp
firebird/trunk/src/qli/format.cpp
firebird/trunk/src/qli/gener.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/qli/hsh.cpp
firebird/trunk/src/qli/lex.cpp
firebird/trunk/src/qli/meta.epp
firebird/trunk/src/qli/mov.cpp
firebird/trunk/src/qli/picstr.cpp
firebird/trunk/src/qli/show.epp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/merge.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/fbcpl/fbcontrol.def
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/utilities/gstat/dba.epp
firebird/trunk/src/utilities/install/services.cpp
firebird/trunk/src/utilities/nbackup/nbackup.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/utilities/ntrace/TraceConfiguration.cpp
firebird/trunk/src/utilities/ntrace/TracePluginConfig.h
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/YObjects.h
firebird/trunk/src/yvalve/alt.cpp
firebird/trunk/src/yvalve/array.epp
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/preparse.cpp
firebird/trunk/src/yvalve/utl.cpp
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/builds/win32/defs/intl.def
===================================================================
--- firebird/trunk/builds/win32/defs/intl.def 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/defs/intl.def 2014-07-17 18:48:46 UTC (rev 59881)
@@ -18,6 +18,9 @@
; INTERNATIONAL DLL MODULE DEFINITION FILE
;------------------------------------------------------------
+; NS 2014-07-10: This file is actually not used during build process
+; All INTL exports are specified in source code using FB_DLL_EXPORT
+
LIBRARY INTL
DESCRIPTION 'INTERBASE INTERNATIONAL DLL'
Modified: firebird/trunk/builds/win32/make_all.bat
===================================================================
--- firebird/trunk/builds/win32/make_all.bat 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/make_all.bat 2014-07-17 18:48:46 UTC (rev 59881)
@@ -48,10 +48,6 @@
@mkdir %FB_OUTPUT_DIR%\system32 2>nul
@mkdir %FB_OUTPUT_DIR%\plugins 2>nul
-for %%v in ( icuuc30 icudt30 icuin30 ) do (
-@copy %FB_ICU_SOURCE_BIN%\%%v.dll %FB_OUTPUT_DIR% >nul
-)
-
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\* %FB_OUTPUT_DIR% >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\intl\* %FB_OUTPUT_DIR%\intl >nul
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\udf\* %FB_OUTPUT_DIR%\udf >nul
@@ -61,7 +57,7 @@
@copy %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\ib_util\ib_util.lib %FB_OUTPUT_DIR%\lib\ib_util_ms.lib >nul
for %%v in (gpre_boot build_msg codes) do (
-@del %FB_OUTPUT_DIR%\%%v.exe >nul
+@del %FB_OUTPUT_DIR%\%%v.* 2>nul
)
:: Firebird.conf, etc
@@ -127,6 +123,7 @@
:: MSVC runtime
if %MSVC_VERSION% == 10 (
+@copy "%VS100COMNTOOLS%\..\..\VC\redist\%FB_VC10CRT_DIR%\Microsoft.VC100.CRT\msvcp100.dll" %FB_OUTPUT_DIR% >nul
@copy "%VS100COMNTOOLS%\..\..\VC\redist\%FB_VC10CRT_DIR%\Microsoft.VC100.CRT\msvcr100.dll" %FB_OUTPUT_DIR% >nul
@copy "%VS100COMNTOOLS%\..\..\VC\redist\%FB_VC10CRT_DIR%\Microsoft.VC100.CRT\msvcp100.dll" %FB_OUTPUT_DIR% >nul
) else (
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/make_boot.bat 2014-07-17 18:48:46 UTC (rev 59881)
@@ -69,9 +69,21 @@
@findstr /V "@UDF_COMMENT@" %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in > %FB_BIN_DIR%\firebird.conf
+:: Copy ICU both to Debug and Release configurations
+
+@call set_build_target.bat %* RELEASE
+@mkdir -p %FB_BIN_DIR%
@copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
@copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
+@call set_build_target.bat %* DEBUG
+@mkdir -p %FB_BIN_DIR%
+@copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
+@copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
+
+@call set_build_target.bat %*
+
+
::=======
@call :databases
@@ -105,12 +117,18 @@
::===================
:: BUILD LibTomMath
+:: NS: Note we need both debug and non-debug version as it is a static library linked to CRT
+:: and linking executable with both debug and non-debug CRT results in undefined behavior
:LibTomMath
@echo.
-@call set_build_target.bat %* libtommath
+@call set_build_target.bat %* RELEASE
@echo Building LibTomMath (%FB_OBJ_DIR%)...
-@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_TARGET_PLATFORM%.log libtommath
-if errorlevel 1 call :boot2 LibTomMath
+@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtommath
+if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
+@call set_build_target.bat %* DEBUG
+@echo Building LibTomMath (%FB_OBJ_DIR%)...
+@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log libtommath
+if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
@call set_build_target.bat %*
goto :EOF
Modified: firebird/trunk/builds/win32/msvc10/alice.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/alice.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/alice.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -118,6 +118,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/burp.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/burp.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/burp.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -102,6 +102,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -280,13 +280,14 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;DEV_BUILD;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
- <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -323,7 +324,7 @@
<Culture>0x041d</Culture>
</ResourceCompile>
<Lib>
- <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -463,11 +463,13 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;SUPERSERVER;DEV_BUILD;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fb2control.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fb2control.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fb2control.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -76,7 +76,7 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(Platform)\$(Configuration)\firebird\system32\</OutDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -177,6 +177,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<UndefinePreprocessorDefinitions>TRACE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_AFXDLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -73,7 +73,7 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -117,6 +117,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;DEV_BUILD;_WINDOWS;CLIENT;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbguard.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -153,6 +153,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;SUPERCLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -42,7 +42,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -65,6 +65,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;CLIENT;SUPERCLIENT;WIN32;_X86_;GDS32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -164,6 +164,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;SUPERSERVER;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;SUPERCLIENT;CLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
Modified: firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -99,6 +99,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;SUPERCLIENT;CLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/fbudf.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbudf.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/fbudf.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -92,6 +92,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -149,6 +150,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SUPERCLIENT;FBUDF_EXPORTS;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gbak.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gbak.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gbak.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -98,6 +98,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;DEV_BUILD;WIN32;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gfix.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gfix.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gfix.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -73,7 +73,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -98,6 +98,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gpre.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -75,7 +75,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -146,6 +146,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;_DEBUG;_CONSOLE;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -144,6 +144,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;_DEBUG;_CONSOLE;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -141,6 +141,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gsplit.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsplit.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gsplit.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -73,7 +73,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -99,6 +99,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;DEV_BUILD;WIN32;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/gstat.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;SUPERCLIENT;CLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -76,7 +76,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -106,6 +106,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/ib_util.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/ib_util.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/ib_util.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -78,7 +78,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -157,6 +157,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/instclient.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -121,6 +121,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/instreg.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instreg.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/instreg.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -73,7 +73,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -98,6 +98,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/instsvc.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instsvc.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/instsvc.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -74,7 +74,7 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -120,6 +120,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/intl.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/intl.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -78,7 +78,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -166,6 +166,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/isql.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/isql.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/isql.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -73,7 +73,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -99,6 +99,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
Modified: firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
Modified: firebird/trunk/builds/win32/msvc10/nbackup.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/nbackup.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/nbackup.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;SUPERCLIENT;CLIENT;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/qli.vcxproj 2014-07-17 00:27:11 UTC (rev 59880)
+++ firebird/trunk/builds/win32/msvc10/qli.vcxproj 2014-07-17 18:48:46 UTC (rev 59881)
@@ -72,7 +72,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -97,6 +97,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOL...
[truncated message content] |
|
From: <fir...@us...> - 2014-07-18 00:34:01
|
Revision: 59885
http://sourceforge.net/p/firebird/code/59885
Author: firebirds
Date: 2014-07-18 00:33:51 +0000 (Fri, 18 Jul 2014)
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 2014-07-17 21:17:15 UTC (rev 59884)
+++ firebird/trunk/ChangeLog 2014-07-18 00:33:51 UTC (rev 59885)
@@ -1,3 +1,353 @@
+ 2014-07-17 21:17 skidder
+ M src/common/classes/alloc.cpp
+ M src/common/common.h
+ M src/common/isc_sync.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/event.cpp
+ M src/jrd/msg.h
+ M src/jrd/ods.cpp
+ M src/jrd/ods.h
+ M src/jrd/pag.cpp
+ M src/jrd/recsrc/SingularStream.cpp
+ M src/jrd/sort.cpp
+ M src/jrd/validation.cpp
+ M src/jrd/vio.cpp
+ M src/lock/lock.cpp
+ M src/lock/print.cpp
+ M src/msgs/build_file.epp
+ M src/remote/server/server.cpp
+ M src/utilities/print_event.cpp
+ M src/utilities/rebuild/rebuild.cpp
+Fix GCC warnings
+
+ 2014-07-17 20:35 skidder
+ M builds/win32/make_boot.bat
+Vanilla mkdir program does not recognize -p switch on Windows. It is the default, so remove it
+
+ 2014-07-17 19:17 skidder
+ M src/common/classes/array.h
+ M src/common/classes/objects_array.h
+ M src/include/firebird/UdrEngine.h
+Fix GCC build broken with last commit
+
+ 2014-07-17 18:48 skidder
+ M builds/win32/defs/intl.def
+ M builds/win32/make_all.bat
+ M builds/win32/make_boot.bat
+ M builds/win32/msvc10/alice.vcxproj
+ M builds/win32/msvc10/burp.vcxproj
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/fb2control.vcxproj
+ M builds/win32/msvc10/fb_lock_print.vcxproj
+ M builds/win32/msvc10/fbguard.vcxproj
+ M builds/win32/msvc10/fbrmclib.vcxproj
+ M builds/win32/msvc10/fbserver.vcxproj
+ M builds/win32/msvc10/fbsvcmgr.vcxproj
+ M builds/win32/msvc10/fbtrace.vcxproj
+ M builds/win32/msvc10/fbtracemgr.vcxproj
+ M builds/win32/msvc10/fbudf.vcxproj
+ M builds/win32/msvc10/gbak.vcxproj
+ M builds/win32/msvc10/gfix.vcxproj
+ M builds/win32/msvc10/gpre.vcxproj
+ M builds/win32/msvc10/gpre_common.vcxproj
+ M builds/win32/msvc10/gsec.vcxproj
+ M builds/win32/msvc10/gsplit.vcxproj
+ M builds/win32/msvc10/gstat.vcxproj
+ M builds/win32/msvc10/ib_udf.vcxproj
+ M builds/win32/msvc10/ib_util.vcxproj
+ M builds/win32/msvc10/instclient.vcxproj
+ M builds/win32/msvc10/instreg.vcxproj
+ M builds/win32/msvc10/instsvc.vcxproj
+ M builds/win32/msvc10/intl.vcxproj
+ M builds/win32/msvc10/isql.vcxproj
+ M builds/win32/msvc10/legacy_auth.vcxproj
+ M builds/win32/msvc10/legacy_usermanager.vcxproj
+ M builds/win32/msvc10/nbackup.vcxproj
+ M builds/win32/msvc10/qli.vcxproj
+ M builds/win32/msvc10/remote.vcxproj
+ M builds/win32/msvc10/srp.vcxproj
+ M builds/win32/msvc10/udr_engine.vcxproj
+ M builds/win32/msvc10/yvalve.vcxproj
+ M builds/win32/msvc8/common.vcproj
+ M builds/win32/msvc9/common.vcproj
+ M builds/win32/set_build_target.bat
+ M src/alice/alice_meta.epp
+ M src/alice/exe.cpp
+ M src/alice/tdr.cpp
+ M src/auth/SecureRemotePassword/Message.h
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/burp/backup.epp
+ M src/burp/burp.cpp
+ M src/burp/canonical.cpp
+ M src/burp/restore.epp
+ M src/burp/split/spit.cpp
+ M src/common/IntlUtil.cpp
+ M src/common/UtilSvc.cpp
+ M src/common/UtilSvc.h
+ M src/common/call_service.cpp
+ M src/common/classes/AlignedBuffer.h
+ M src/common/classes/BaseStream.cpp
+ M src/common/classes/BlrWriter.h
+ M src/common/classes/ByteChunk.h
+ M src/common/classes/ClumpletReader.cpp
+ M src/common/classes/ClumpletReader.h
+ M src/common/classes/ClumpletWriter.cpp
+ M src/common/classes/ClumpletWriter.h
+ M src/common/classes/File.h
+ M src/common/classes/Hash.h
+ M src/common/classes/MetaName.cpp
+ M src/common/classes/MetaName.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/classes/SafeArg.cpp
+ M src/common/classes/SafeArg.h
+ M src/common/classes/Switches.cpp
+ M src/common/classes/Switches.h
+ M src/common/classes/TempFile.cpp
+ M src/common/classes/TempFile.h
+ M src/common/classes/UserBlob.cpp
+ M src/common/classes/UserBlob.h
+ M src/common/classes/VaryStr.h
+ M src/common/classes/alloc.cpp
+ M src/common/classes/array.h
+ M src/common/classes/fb_string.cpp
+ M src/common/classes/fb_string.h
+ M src/common/classes/misc/class_test.cpp
+ M src/common/classes/objects_array.h
+ M src/common/classes/semaphore.cpp
+ M src/common/classes/semaphore.h
+ M src/common/classes/stack.h
+ M src/common/classes/tree.h
+ M src/common/classes/vector.h
+ M src/common/common.h
+ M src/common/config/config_file.cpp
+ M src/common/config/dir_list.cpp
+ M src/common/config/dir_list.h
+ M src/common/config/os/config_root.h
+ M src/common/cvt.cpp
+ M src/common/db_alias.cpp
+ M src/common/isc_f_proto.h
+ M src/common/isc_file.cpp
+ M src/common/isc_sync.cpp
+ M src/common/os/guid.h
+ M src/common/os/posix/guid.cpp
+ M src/common/os/win32/guid.cpp
+ M src/common/os/win32/os_utils.cpp
+ M src/common/security.h
+ M src/common/stuff.h
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/common/utils_proto.h
+ M src/common/xdr.cpp
+ M src/dsql/BlrDebugWriter.cpp
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/Nodes.h
+ M src/dsql/PackageNodes.epp
+ M src/dsql/Parser.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/errd.cpp
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/metd.epp
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/extlib/fbudf/fbudf.cpp
+ M src/extlib/ib_udf.cpp
+ M src/extlib/ib_util.cpp
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/gpre/c_cxx.cpp
+ M src/gpre/cmd.cpp
+ M src/gpre/cme.cpp
+ M src/gpre/cmp.cpp
+ M src/gpre/exp.cpp
+ M src/gpre/gpre.cpp
+ M src/gpre/gpre.h
+ M src/gpre/languages/ada.cpp
+ M src/gpre/languages/cob.cpp
+ M src/gpre/languages/fbrmclib.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/languages/pas.cpp
+ M src/gpre/languages/rmc.cpp
+ M src/gpre/msc.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/gpre/par.cpp
+ M src/gpre/sqe.cpp
+ M src/gpre/sql.cpp
+ M src/gpre/std/gpre_meta.epp
+ M src/include/firebird/UdrEngine.h
+ M src/include/types_pub.h
+ M src/intl/cv_big5.cpp
+ M src/intl/cv_gb2312.cpp
+ M src/intl/cv_icu.cpp
+ M src/intl/cv_jis.cpp
+ M src/intl/cv_ksc.cpp
+ M src/intl/cv_narrow.cpp
+ M src/intl/cv_unicode_fss.cpp
+ M src/iscguard/iscguard.cpp
+ M src/isql/extract.epp
+ M src/isql/isql.epp
+ M src/isql/show.epp
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/Collation.cpp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/DataTypeUtil.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/DatabaseSnapshot.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/GarbageCollector.cpp
+ M src/jrd/GlobalRWLock.cpp
+ M src/jrd/GlobalRWLock.h
+ M src/jrd/IntlManager.cpp
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+ M src/jrd/PreparedStatement.cpp
+ M src/jrd/PreparedStatement.h
+ M src/jrd/RandomGenerator.cpp
+ M src/jrd/RandomGenerator.h
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/RecordSourceNodes.h
+ M src/jrd/Relation.cpp
+ M src/jrd/Relation.h
+ M src/jrd/RuntimeStatistics.cpp
+ M src/jrd/RuntimeStatistics.h
+ M src/jrd/SimilarToMatcher.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/TempSpace.cpp
+ M src/jrd/TempSpace.h
+ M src/jrd/UserManagement.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/blb.h
+ M src/jrd/btr.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/constants.h
+ M src/jrd/cvt2.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/dpm.epp
+ M src/jrd/dyn_util.epp
+ M src/jrd/err.cpp
+ M src/jrd/event.cpp
+ M src/jrd/evl_string.h
+ M src/jrd/exe.cpp
+ M src/jrd/exe.h
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/filters.cpp
+ M src/jrd/flu.cpp
+ M src/jrd/fun.epp
+ M src/jrd/grant.epp
+ M src/jrd/idx.cpp
+ M src/jrd/inf.cpp
+ M src/jrd/ini.epp
+ M src/jrd/intl.cpp
+ M src/jrd/intl_builtin.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/met.epp
+ M src/jrd/nbak.cpp
+ M src/jrd/ntrace.h
+ M src/jrd/ods.cpp
+ M src/jrd/ods_proto.h
+ M src/jrd/opt.cpp
+ M src/jrd/os/pio_proto.h
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/os/win32/winnt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/par.cpp
+ M src/jrd/par_proto.h
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/recsrc/MergeJoin.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/jrd/recsrc/RecordSource.h
+ M src/jrd/recsrc/RecursiveStream.cpp
+ M src/jrd/recsrc/SingularStream.cpp
+ M src/jrd/recsrc/Union.cpp
+ M src/jrd/rpb_chain.cpp
+ M src/jrd/scl.epp
+ M src/jrd/sdw.cpp
+ M src/jrd/sort.cpp
+ M src/jrd/sort.h
+ M src/jrd/sqz.cpp
+ M src/jrd/sqz.h
+ M src/jrd/status.cpp
+ M src/jrd/status.h
+ M src/jrd/svc.cpp
+ M src/jrd/svc.h
+ M src/jrd/tpc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceLog.cpp
+ M src/jrd/trace/TraceLog.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/jrd/trace/TraceService.cpp
+ M src/jrd/validation.cpp
+ M src/jrd/vio.cpp
+ M src/lock/print.cpp
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/all.cpp
+ M src/qli/dtr.cpp
+ M src/qli/err.cpp
+ M src/qli/err_proto.h
+ M src/qli/exe.cpp
+ M src/qli/expand.cpp
+ M src/qli/format.cpp
+ M src/qli/gener.cpp
+ M src/qli/help.epp
+ M src/qli/hsh.cpp
+ M src/qli/lex.cpp
+ M src/qli/meta.epp
+ M src/qli/mov.cpp
+ M src/qli/picstr.cpp
+ M src/qli/show.epp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/merge.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+ M src/utilities/fbcpl/fbcontrol.def
+ M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/install/services.cpp
+ M src/utilities/nbackup/nbackup.cpp
+ M src/utilities/ntrace/PluginLogWriter.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/utilities/ntrace/TraceConfiguration.cpp
+ M src/utilities/ntrace/TracePluginConfig.h
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/alt.cpp
+ M src/yvalve/array.epp
+ M src/yvalve/gds.cpp
+ M src/yvalve/preparse.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Fix build warnings
+
2014-07-16 12:51 dimitr
M src/jrd/recsrc/BitmapTableScan.cpp
M src/jrd/recsrc/IndexTableScan.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-17 21:17:15 UTC (rev 59884)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-18 00:33:51 UTC (rev 59885)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31230
+ FORMAL BUILD NUMBER:31234
*/
-#define PRODUCT_VER_STRING "3.0.0.31230"
-#define FILE_VER_STRING "WI-T3.0.0.31230"
-#define LICENSE_VER_STRING "WI-T3.0.0.31230"
-#define FILE_VER_NUMBER 3, 0, 0, 31230
+#define PRODUCT_VER_STRING "3.0.0.31234"
+#define FILE_VER_STRING "WI-T3.0.0.31234"
+#define LICENSE_VER_STRING "WI-T3.0.0.31234"
+#define FILE_VER_NUMBER 3, 0, 0, 31234
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31230"
+#define FB_BUILD_NO "31234"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-17 21:17:15 UTC (rev 59884)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-18 00:33:51 UTC (rev 59885)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31230
+BuildNum=31234
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...> - 2014-07-18 01:52:32
|
Revision: 59886
http://sourceforge.net/p/firebird/code/59886
Author: asfernandes
Date: 2014-07-18 01:52:24 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/doc/sql.extensions/README.ddl_access.txt
firebird/trunk/src/common/classes/Switches.h
firebird/trunk/src/common/common.h
firebird/trunk/src/common/xdr.cpp
firebird/trunk/src/include/types_pub.h
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/jrd/ods.h
Modified: firebird/trunk/doc/sql.extensions/README.ddl_access.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl_access.txt 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/doc/sql.extensions/README.ddl_access.txt 2014-07-18 01:52:24 UTC (rev 59886)
@@ -7,13 +7,13 @@
Syntax is:
-GRANT CREATE <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
-GRANT ALTER ANY <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
-GRANT DROP ANY <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
+GRANT CREATE <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
+GRANT ALTER ANY <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
+GRANT DROP ANY <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
-REVOKE [grant option for] CREATE <OBJECT> FROM [USER | ROLE] <user/role name>;
-REVOKE [grant option for] ALTER ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
-REVOKE [grant option for] DROP ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] CREATE <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] ALTER ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] DROP ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
Where <OBJECT> could be:
TABLE, VIEW, PROCEDURE, FUNCTION, PACKAGE, GENERATOR, SEQUENCE, DOMAIN,
Modified: firebird/trunk/src/common/classes/Switches.h
===================================================================
--- firebird/trunk/src/common/classes/Switches.h 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/classes/Switches.h 2014-07-18 01:52:24 UTC (rev 59886)
@@ -108,7 +108,7 @@
const bool m_copy; // was m_base copied into m_table for modifications?
const bool m_minLength; // is the field in_sw_min_length meaningful?
in_sw_tab_t* m_table; // modifiable copy
- FB_SIZE_T* m_opLengths; // array of in_sw_name's lengths to avoid recalculation
+ FB_SIZE_T* m_opLengths; // array of in_sw_name's lengths to avoid recalculation
};
#endif // CLASSES_SWITCHES
Modified: firebird/trunk/src/common/common.h
===================================================================
--- firebird/trunk/src/common/common.h 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/common.h 2014-07-18 01:52:24 UTC (rev 59886)
@@ -888,7 +888,7 @@
#endif
#define FB_UNUSED(value) do { if (value) {} } while (false)
-#define FB_UNUSED_VAR(value) (void)value;
+#define FB_UNUSED_VAR(value) (void) value
// 30 Dec 2002. Nickolay Samofatov
// This needs to be checked for all supported platforms
@@ -977,7 +977,10 @@
const FB_SIZE_T FB_MAX_SIZEOF = ~FB_SIZE_T(0); // Assume FB_SIZE_T is unsigned
-inline FB_SIZE_T fb_strlen(const char* str) { return static_cast<FB_SIZE_T>(strlen(str)); }
+inline FB_SIZE_T fb_strlen(const char* str)
+{
+ return static_cast<FB_SIZE_T>(strlen(str));
+}
#endif /* COMMON_COMMON_H */
Modified: firebird/trunk/src/common/xdr.cpp
===================================================================
--- firebird/trunk/src/common/xdr.cpp 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/xdr.cpp 2014-07-18 01:52:24 UTC (rev 59886)
@@ -387,7 +387,6 @@
**************************************/
fb_assert(sizeof(float) == sizeof(SLONG));
-
switch (xdrs->x_op)
{
case XDR_ENCODE:
Modified: firebird/trunk/src/include/types_pub.h
===================================================================
--- firebird/trunk/src/include/types_pub.h 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/include/types_pub.h 2014-07-18 01:52:24 UTC (rev 59886)
@@ -64,9 +64,9 @@
#ifdef FB_USE_SIZE_T
/* NS: This is how things were done in original Firebird port to 64-bit platforms
Basic classes use these quantities. However in many places in the engine and
- external libraries 32-bit quantities are used to hold sizes of objects.
+ external libraries 32-bit quantities are used to hold sizes of objects.
This produces many warnings. This also produces incredibly dirty interfaces,
- when functions take size_t as argument, but only handle 32 bits internally
+ when functions take size_t as argument, but only handle 32 bits internally
without any bounds checking. */
typedef size_t FB_SIZE_T;
typedef intptr_t FB_SSIZE_T;
Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/isql/isql.epp 2014-07-18 01:52:24 UTC (rev 59886)
@@ -7417,7 +7417,7 @@
isqlGlob.printf("%-*.*s%s", var->length, var->length, str2, NEWLINE);
else
{
- IcuUtil::pad(p, var->charSet,
+ IcuUtil::pad(p, var->charSet,
static_cast<unsigned>(strnlen(var->value.asChar, var->length)), var->value.asChar, length, false);
strcat(p, " ");
}
Modified: firebird/trunk/src/jrd/ods.h
===================================================================
--- firebird/trunk/src/jrd/ods.h 2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/jrd/ods.h 2014-07-18 01:52:24 UTC (rev 59886)
@@ -263,7 +263,7 @@
UCHAR btr_nodes[1];
};
-// NS 2014-07-17: You can define this thing as "const FB_SIZE_t ...", and it works
+// NS 2014-07-17: You can define this thing as "const FB_SIZE_t ...", and it works
// for standards-conforming compilers (recent GCC and MSVC will do)
// But older versions might have a problem, so I leave #define in place for now
#define BTR_SIZE static_cast<FB_SIZE_T>(offsetof(Ods::btree_page, btr_nodes[0]))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-19 00:31:04
|
Revision: 59891
http://sourceforge.net/p/firebird/code/59891
Author: firebirds
Date: 2014-07-19 00:31:00 +0000 (Sat, 19 Jul 2014)
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 2014-07-18 14:34:47 UTC (rev 59890)
+++ firebird/trunk/ChangeLog 2014-07-19 00:31:00 UTC (rev 59891)
@@ -1,3 +1,31 @@
+ 2014-07-18 14:34 hvlad
+ M src/jrd/pag.cpp
+Correction
+
+ 2014-07-18 12:42 hvlad
+ M src/jrd/jrd.cpp
+Correction
+
+ 2014-07-18 12:25 hvlad
+ M src/jrd/cch.cpp
+Misc
+
+ 2014-07-18 12:24 hvlad
+ M src/jrd/jrd.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/pag.h
+Avoid races (and AV as result) when two attachments starts to use temporary page space simultaneously.
+
+ 2014-07-18 01:52 asfernandes
+ M doc/sql.extensions/README.ddl_access.txt
+ M src/common/classes/Switches.h
+ M src/common/common.h
+ M src/common/xdr.cpp
+ M src/include/types_pub.h
+ M src/isql/isql.epp
+ M src/jrd/ods.h
+Misc.
+
2014-07-17 21:17 skidder
M src/common/classes/alloc.cpp
M src/common/common.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-18 14:34:47 UTC (rev 59890)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-19 00:31:00 UTC (rev 59891)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31234
+ FORMAL BUILD NUMBER:31239
*/
-#define PRODUCT_VER_STRING "3.0.0.31234"
-#define FILE_VER_STRING "WI-T3.0.0.31234"
-#define LICENSE_VER_STRING "WI-T3.0.0.31234"
-#define FILE_VER_NUMBER 3, 0, 0, 31234
+#define PRODUCT_VER_STRING "3.0.0.31239"
+#define FILE_VER_STRING "WI-T3.0.0.31239"
+#define LICENSE_VER_STRING "WI-T3.0.0.31239"
+#define FILE_VER_NUMBER 3, 0, 0, 31239
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31234"
+#define FB_BUILD_NO "31239"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-18 14:34:47 UTC (rev 59890)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-19 00:31:00 UTC (rev 59891)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31234
+BuildNum=31239
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...> - 2014-07-21 00:32:34
|
Revision: 59897
http://sourceforge.net/p/firebird/code/59897
Author: firebirds
Date: 2014-07-21 00:32:30 +0000 (Mon, 21 Jul 2014)
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 2014-07-20 15:44:47 UTC (rev 59896)
+++ firebird/trunk/ChangeLog 2014-07-21 00:32:30 UTC (rev 59897)
@@ -1,3 +1,32 @@
+ 2014-07-20 15:44 asfernandes
+ M src/remote/remote.h
+Misc.
+
+ 2014-07-20 02:19 asfernandes
+ M src/dsql/metd.epp
+ M src/jrd/cch.cpp
+ M src/jrd/recsrc/VirtualTableScan.cpp
+Warnings.
+
+ 2014-07-20 02:19 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/parse.y
+ M src/gpre/std/gpre_meta.epp
+ M src/isql/isql.epp
+ M src/jrd/Attachment.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/RecordSourceNodes.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/blb.h
+ M src/jrd/cch.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/dyn_util.epp
+ M src/jrd/evl_string.h
+ M src/jrd/ods.cpp
+ M src/jrd/par_proto.h
+ M src/jrd/status.cpp
+Misc.
+
2014-07-18 14:34 hvlad
M src/jrd/pag.cpp
Correction
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-20 15:44:47 UTC (rev 59896)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-21 00:32:30 UTC (rev 59897)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31239
+ FORMAL BUILD NUMBER:31242
*/
-#define PRODUCT_VER_STRING "3.0.0.31239"
-#define FILE_VER_STRING "WI-T3.0.0.31239"
-#define LICENSE_VER_STRING "WI-T3.0.0.31239"
-#define FILE_VER_NUMBER 3, 0, 0, 31239
+#define PRODUCT_VER_STRING "3.0.0.31242"
+#define FILE_VER_STRING "WI-T3.0.0.31242"
+#define LICENSE_VER_STRING "WI-T3.0.0.31242"
+#define FILE_VER_NUMBER 3, 0, 0, 31242
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31239"
+#define FB_BUILD_NO "31242"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-20 15:44:47 UTC (rev 59896)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-21 00:32:30 UTC (rev 59897)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31239
+BuildNum=31242
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...> - 2014-07-21 02:38:01
|
Revision: 59898
http://sourceforge.net/p/firebird/code/59898
Author: asfernandes
Date: 2014-07-21 02:37:58 +0000 (Mon, 21 Jul 2014)
Log Message:
-----------
Fixed CORE-4488 - Wrong results of FOR SELECT <L> FROM <T> AS CURSOR <C> and table <T> is modified inside cursor's begin...end block.
Modified Paths:
--------------
firebird/trunk/doc/sql.extensions/README.cursor_variables.txt
firebird/trunk/src/dsql/ExprNodes.cpp
Modified: firebird/trunk/doc/sql.extensions/README.cursor_variables.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.cursor_variables.txt 2014-07-21 00:32:30 UTC (rev 59897)
+++ firebird/trunk/doc/sql.extensions/README.cursor_variables.txt 2014-07-21 02:37:58 UTC (rev 59898)
@@ -21,7 +21,10 @@
4) Cursor variables are read-only.
5) A FOR SELECT without AS CURSOR needs the use of INTO, while with AS CURSOR it's not required,
but still allowed. With FETCH, INTO is now optional.
- 6) It's allowed now to use the colon prefix when assigning to variables or NEW's fields.
+ 6) It's allowed now to use the colon prefix when assigning to variables or NEW's fields.
+ 7) Reading from a cursor variable returns the current field values. That means an UPDATE (with
+ WHERE CURRENT OF) also updates the fields for subsequent reads. And DELETE (with WHERE
+ CURRENT OF) makes subsequent reads to return NULL.
Examples:
1.
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2014-07-21 00:32:30 UTC (rev 59897)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2014-07-21 02:37:58 UTC (rev 59898)
@@ -6820,6 +6820,16 @@
dsqlScratch->appendUChar(derivedContexts[i]);
}
}
+ else if ((context->ctx_flags & CTX_cursor) && val->is<FieldNode>())
+ {
+ // ASF: FieldNode::execute do not verify rpb_number.isValid(), and due to system triggers
+ // and also singular queries, we cannot start to do it. So to fix CORE-4488, we introduce
+ // the usage of blr_derived_expr for cursor fields, which in practice prefixes the
+ // FieldNode::execute by a test of rpb_number.isValid().
+ dsqlScratch->appendUChar(blr_derived_expr);
+ dsqlScratch->appendUChar(1);
+ GEN_stuff_context(dsqlScratch, val->as<FieldNode>()->dsqlContext);
+ }
GEN_expr(dsqlScratch, value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-22 00:31:30
|
Revision: 59901
http://sourceforge.net/p/firebird/code/59901
Author: firebirds
Date: 2014-07-22 00:31:22 +0000 (Tue, 22 Jul 2014)
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 2014-07-21 16:13:49 UTC (rev 59900)
+++ firebird/trunk/ChangeLog 2014-07-22 00:31:22 UTC (rev 59901)
@@ -1,3 +1,18 @@
+ 2014-07-21 16:13 asfernandes
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+Tweaks to CORE-4488.
+
+ 2014-07-21 08:10 alexpeshkoff
+ M src/include/types_pub.h
+Fixed build on linux64 - it was really bad that behavior of macro FB_ALIGN depended upon alignment parameter type
+
+ 2014-07-21 02:37 asfernandes
+ M doc/sql.extensions/README.cursor_variables.txt
+ M src/dsql/ExprNodes.cpp
+Fixed CORE-4488 - Wrong results of FOR SELECT <L> FROM <T> AS CURSOR <C> and table <T> is modified inside cursor's begin...end block.
+
2014-07-20 15:44 asfernandes
M src/remote/remote.h
Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-21 16:13:49 UTC (rev 59900)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-22 00:31:22 UTC (rev 59901)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31242
+ FORMAL BUILD NUMBER:31245
*/
-#define PRODUCT_VER_STRING "3.0.0.31242"
-#define FILE_VER_STRING "WI-T3.0.0.31242"
-#define LICENSE_VER_STRING "WI-T3.0.0.31242"
-#define FILE_VER_NUMBER 3, 0, 0, 31242
+#define PRODUCT_VER_STRING "3.0.0.31245"
+#define FILE_VER_STRING "WI-T3.0.0.31245"
+#define LICENSE_VER_STRING "WI-T3.0.0.31245"
+#define FILE_VER_NUMBER 3, 0, 0, 31245
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31242"
+#define FB_BUILD_NO "31245"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-21 16:13:49 UTC (rev 59900)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-22 00:31:22 UTC (rev 59901)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31242
+BuildNum=31245
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...> - 2014-07-23 00:28:30
|
Revision: 59904
http://sourceforge.net/p/firebird/code/59904
Author: firebirds
Date: 2014-07-23 00:28:27 +0000 (Wed, 23 Jul 2014)
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 2014-07-22 18:44:22 UTC (rev 59903)
+++ firebird/trunk/ChangeLog 2014-07-23 00:28:27 UTC (rev 59904)
@@ -1,3 +1,15 @@
+ 2014-07-22 18:44 skidder
+ M builds/win32/make_all.bat
+Revert my change, as Dmitry fixed the same error a before me
+
+ 2014-07-22 08:31 roman-simakov
+ M src/dsql/parse.y
+ M src/isql/extract.epp
+ M src/isql/show.epp
+ M src/jrd/obj.h
+Removed SHADOW permissions since they handled by ALTER DATABASE permission
+Added show of DDL permissions in isql
+
2014-07-21 16:13 asfernandes
M src/dsql/DsqlCompilerScratch.h
M src/dsql/ExprNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-22 18:44:22 UTC (rev 59903)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-23 00:28:27 UTC (rev 59904)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31245
+ FORMAL BUILD NUMBER:31247
*/
-#define PRODUCT_VER_STRING "3.0.0.31245"
-#define FILE_VER_STRING "WI-T3.0.0.31245"
-#define LICENSE_VER_STRING "WI-T3.0.0.31245"
-#define FILE_VER_NUMBER 3, 0, 0, 31245
+#define PRODUCT_VER_STRING "3.0.0.31247"
+#define FILE_VER_STRING "WI-T3.0.0.31247"
+#define LICENSE_VER_STRING "WI-T3.0.0.31247"
+#define FILE_VER_NUMBER 3, 0, 0, 31247
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31245"
+#define FB_BUILD_NO "31247"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-22 18:44:22 UTC (rev 59903)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-23 00:28:27 UTC (rev 59904)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31245
+BuildNum=31247
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...> - 2014-07-25 00:27:41
|
Revision: 59908
http://sourceforge.net/p/firebird/code/59908
Author: firebirds
Date: 2014-07-25 00:27:38 +0000 (Fri, 25 Jul 2014)
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 2014-07-24 19:37:58 UTC (rev 59907)
+++ firebird/trunk/ChangeLog 2014-07-25 00:27:38 UTC (rev 59908)
@@ -1,3 +1,82 @@
+ 2014-07-24 19:37 dimitr
+ M src/jrd/Optimizer.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/recsrc/BitmapTableScan.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/recsrc/RecordSource.h
+Fixed CORE-4498: FB 3.0 crashes when getting an explained plan for a DBKEY based retrieval.
+
+ 2014-07-24 08:38 roman-simakov
+ M doc/sql.extensions/README.ddl_access.txt
+Correction
+
+ 2014-07-24 06:41 alexpeshkoff
+ M src/alice/alice.cpp
+ M src/burp/backup.epp
+ M src/burp/burp.cpp
+ M src/burp/canonical.cpp
+ M src/burp/restore.epp
+ M src/common/StatusArg.cpp
+ M src/common/classes/AlignedBuffer.h
+ M src/common/classes/File.h
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+ M src/common/classes/init.cpp
+ M src/common/classes/init.h
+ M src/common/isc_sync.cpp
+ A src/common/msg_encode.h (from /firebird/trunk/src/jrd/msg_encode.h:59898)
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/gen.cpp
+ M src/gpre/msc.cpp
+ M src/include/fb_types.h
+ M src/jrd/CryptoManager.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/Function.epp
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/Routine.cpp
+ M src/jrd/SimilarToMatcher.h
+ M src/jrd/TempSpace.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/event.cpp
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/idx.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/met.epp
+ D src/jrd/msg.h
+ D src/jrd/msg_encode.h
+ M src/jrd/nbak.cpp
+ M src/jrd/ods.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/svc.cpp
+ M src/lock/lock.cpp
+ M src/misc/codes.epp
+ M src/msgs/build_file.epp
+ M src/qli/all.cpp
+ M src/qli/compile.cpp
+ M src/qli/gener.cpp
+ M src/remote/client/BlrFromMessage.cpp
+ M src/remote/parser.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/nbackup/nbackup.cpp
+ M src/yvalve/gds.cpp
+ A src/yvalve/msg.h (from /firebird/trunk/src/jrd/msg.h:59898)
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Replaced macro FB_ALIGN with function fbAlign, minor related cleanup
+
2014-07-22 18:44 skidder
M builds/win32/make_all.bat
Revert my change, as Dmitry fixed the same error a before me
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-24 19:37:58 UTC (rev 59907)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-25 00:27:38 UTC (rev 59908)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31247
+ FORMAL BUILD NUMBER:31250
*/
-#define PRODUCT_VER_STRING "3.0.0.31247"
-#define FILE_VER_STRING "WI-T3.0.0.31247"
-#define LICENSE_VER_STRING "WI-T3.0.0.31247"
-#define FILE_VER_NUMBER 3, 0, 0, 31247
+#define PRODUCT_VER_STRING "3.0.0.31250"
+#define FILE_VER_STRING "WI-T3.0.0.31250"
+#define LICENSE_VER_STRING "WI-T3.0.0.31250"
+#define FILE_VER_NUMBER 3, 0, 0, 31250
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31247"
+#define FB_BUILD_NO "31250"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-24 19:37:58 UTC (rev 59907)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-25 00:27:38 UTC (rev 59908)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31247
+BuildNum=31250
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...> - 2014-07-27 03:05:54
|
Revision: 59913
http://sourceforge.net/p/firebird/code/59913
Author: asfernandes
Date: 2014-07-27 03:05:44 +0000 (Sun, 27 Jul 2014)
Log Message:
-----------
Improvement CORE-4484 - Description (COMMENT ON) for package procedures and functions, and its parameters.
Modified Paths:
--------------
firebird/trunk/doc/sql.extensions/README.ddl.txt
firebird/trunk/src/common/classes/QualifiedName.h
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DdlNodes.h
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/isql/show.epp
Modified: firebird/trunk/doc/sql.extensions/README.ddl.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl.txt 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/doc/sql.extensions/README.ddl.txt 2014-07-27 03:05:44 UTC (rev 59913)
@@ -136,7 +136,8 @@
COMMENT ON DATABASE IS {'txt'|NULL};
COMMENT ON <basic_type> name IS {'txt'|NULL};
COMMENT ON COLUMN table_or_view_name.field_name IS {'txt'|NULL};
-COMMENT ON PARAMETER procedure_name.param_name IS {'txt'|NULL};
+COMMENT ON {PROCEDURE | FUNCTION} [<package_name> .] name.param_name IS {'txt'|NULL};
+COMMENT ON [PROCEDURE | FUNCTION] PARAMETER [<package_name> .] name.param_name IS {'txt'|NULL};
An empty literal string '' will act as NULL since the internal code (DYN in this case)
works this way with blobs.
Modified: firebird/trunk/src/common/classes/QualifiedName.h
===================================================================
--- firebird/trunk/src/common/classes/QualifiedName.h 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/src/common/classes/QualifiedName.h 2014-07-27 03:05:44 UTC (rev 59913)
@@ -47,6 +47,12 @@
{
}
+ QualifiedName(MemoryPool& p, const MetaName& aIdentifier)
+ : identifier(p, aIdentifier),
+ package(p)
+ {
+ }
+
explicit QualifiedName(const MetaName& aIdentifier)
: identifier(aIdentifier)
{
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2014-07-27 03:05:44 UTC (rev 59913)
@@ -1054,7 +1054,7 @@
" objType: %s\n"
" objName: %s\n"
" text: %s\n",
- objType, objName.c_str(), this->text.c_str());
+ objType, objName.toString().c_str(), this->text.c_str());
}
bool CommentOnNode::checkPermission(thread_db* tdbb, jrd_tra* transaction)
@@ -1078,54 +1078,52 @@
const char* subColumnClause = NULL;
const char* addWhereClause = NULL;
Arg::StatusVector status;
+ string objNameStr = objName.toString();
if (objType == obj_parameter)
{
fb_assert(subName.hasData());
- PreparedStatement::Builder sql;
- sql << "select 1 from rdb$procedures p join rdb$procedure_parameters pp using (rdb$procedure_name)" <<
- "where p.rdb$procedure_name =" << objName <<
- "and p.rdb$package_name is null and pp.rdb$package_name is null" <<
- "and pp.rdb$parameter_name =" << subName <<
- "union all" <<
- "select 2 from rdb$functions f join rdb$function_arguments fa using (rdb$function_name)" <<
- "where f.rdb$function_name =" << objName <<
- "and f.rdb$package_name is null and fa.rdb$package_name is null" <<
- "and fa.rdb$argument_name =" << subName;
+ AutoRequest requestHandle;
- AutoPreparedStatement ps(attachment->prepareStatement(tdbb, transaction, sql));
- AutoResultSet rs(ps->executeQuery(tdbb, transaction));
-
- if (!rs->fetch(tdbb))
+ FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
+ FUN IN RDB$FUNCTIONS CROSS
+ ARG IN RDB$FUNCTION_ARGUMENTS
+ WITH FUN.RDB$FUNCTION_NAME EQ objName.identifier.c_str() AND
+ FUN.RDB$PACKAGE_NAME EQUIV NULLIF(objName.package.c_str(), '') AND
+ ARG.RDB$FUNCTION_NAME EQ FUN.RDB$FUNCTION_NAME AND
+ ARG.RDB$PACKAGE_NAME EQUIV FUN.RDB$PACKAGE_NAME AND
+ ARG.RDB$ARGUMENT_NAME EQ subName.c_str()
{
- status_exception::raise(Arg::Gds(isc_dyn_routine_param_not_found) <<
- Arg::Str(subName) << Arg::Str(objName));
+ objType = obj_udf;
}
+ END_FOR
- fb_assert(!rs->isNull(1));
- dsc& desc = rs->getDesc(1);
- fb_assert(desc.dsc_dtype == dtype_long);
- const SLONG result = *reinterpret_cast<SLONG*>(desc.dsc_address);
+ requestHandle.reset();
- switch (result)
+ FOR (REQUEST_HANDLE requestHandle TRANSACTION_HANDLE transaction)
+ PRC IN RDB$PROCEDURES CROSS
+ PRM IN RDB$PROCEDURE_PARAMETERS
+ WITH PRC.RDB$PROCEDURE_NAME EQ objName.identifier.c_str() AND
+ PRC.RDB$PACKAGE_NAME EQUIV NULLIF(objName.package.c_str(), '') AND
+ PRM.RDB$PROCEDURE_NAME EQ PRC.RDB$PROCEDURE_NAME AND
+ PRM.RDB$PACKAGE_NAME EQUIV PRC.RDB$PACKAGE_NAME AND
+ PRM.RDB$PARAMETER_NAME EQ subName.c_str()
{
- case 1:
+ if (objType == obj_parameter)
objType = obj_procedure;
- break;
-
- case 2:
- objType = obj_udf;
- break;
-
- default:
- fb_assert(false);
+ else
+ {
+ status_exception::raise(Arg::Gds(isc_dyn_routine_param_ambiguous) <<
+ Arg::Str(subName) << Arg::Str(objNameStr));
+ }
}
+ END_FOR
- if (rs->fetch(tdbb))
+ if (objType == obj_parameter)
{
- status_exception::raise(Arg::Gds(isc_dyn_routine_param_ambiguous) <<
- Arg::Str(subName) << Arg::Str(objName));
+ status_exception::raise(Arg::Gds(isc_dyn_routine_param_not_found) <<
+ Arg::Str(subName) << Arg::Str(objNameStr));
}
}
@@ -1147,13 +1145,13 @@
tableClause = "rdb$relation_fields";
subColumnClause = "rdb$field_name";
status << Arg::Gds(isc_dyn_column_does_not_exist) <<
- Arg::Str(subName) << Arg::Str(objName);
+ Arg::Str(subName) << Arg::Str(objNameStr);
}
else
{
tableClause = "rdb$relations";
addWhereClause = "rdb$view_blr is null";
- status << Arg::Gds(isc_dyn_table_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_table_not_found) << Arg::Str(objNameStr);
}
columnClause = "rdb$relation_name";
break;
@@ -1161,7 +1159,7 @@
case obj_view:
tableClause = "rdb$relations";
columnClause = "rdb$relation_name";
- status << Arg::Gds(isc_dyn_view_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_view_not_found) << Arg::Str(objNameStr);
addWhereClause = "rdb$view_blr is not null";
break;
@@ -1171,22 +1169,21 @@
tableClause = "rdb$procedure_parameters";
subColumnClause = "rdb$parameter_name";
status << Arg::Gds(isc_dyn_proc_param_not_found) <<
- Arg::Str(subName) << Arg::Str(objName);
+ Arg::Str(subName) << Arg::Str(objNameStr);
}
else
{
tableClause = "rdb$procedures";
- status << Arg::Gds(isc_dyn_proc_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_proc_not_found) << Arg::Str(objNameStr);
}
- addWhereClause = "rdb$package_name is null";
columnClause = "rdb$procedure_name";
break;
case obj_trigger:
tableClause = "rdb$triggers";
columnClause = "rdb$trigger_name";
- status << Arg::Gds(isc_dyn_trig_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_trig_not_found) << Arg::Str(objNameStr);
break;
case obj_udf:
@@ -1195,70 +1192,69 @@
tableClause = "rdb$function_arguments";
subColumnClause = "rdb$argument_name";
status << Arg::Gds(isc_dyn_func_param_not_found) <<
- Arg::Str(subName) << Arg::Str(objName);
+ Arg::Str(subName) << Arg::Str(objNameStr);
}
else
{
tableClause = "rdb$functions";
- status << Arg::Gds(isc_dyn_func_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_func_not_found) << Arg::Str(objNameStr);
}
- addWhereClause = "rdb$package_name is null";
columnClause = "rdb$function_name";
break;
case obj_blob_filter:
tableClause = "rdb$filters";
columnClause = "rdb$function_name";
- status << Arg::Gds(isc_dyn_filter_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_filter_not_found) << Arg::Str(objNameStr);
break;
case obj_exception:
tableClause = "rdb$exceptions";
columnClause = "rdb$exception_name";
- status << Arg::Gds(isc_dyn_exception_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_exception_not_found) << Arg::Str(objNameStr);
break;
case obj_generator:
tableClause = "rdb$generators";
columnClause = "rdb$generator_name";
- status << Arg::Gds(isc_dyn_gen_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_gen_not_found) << Arg::Str(objNameStr);
break;
case obj_index:
tableClause = "rdb$indices";
columnClause = "rdb$index_name";
- status << Arg::Gds(isc_dyn_index_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_index_not_found) << Arg::Str(objNameStr);
break;
case obj_sql_role:
tableClause = "rdb$roles";
columnClause = "rdb$role_name";
- status << Arg::Gds(isc_dyn_role_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_role_not_found) << Arg::Str(objNameStr);
break;
case obj_charset:
tableClause = "rdb$character_sets";
columnClause = "rdb$character_set_name";
- status << Arg::Gds(isc_dyn_charset_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_charset_not_found) << Arg::Str(objNameStr);
break;
case obj_collation:
tableClause = "rdb$collations";
columnClause = "rdb$collation_name";
- status << Arg::Gds(isc_dyn_collation_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_collation_not_found) << Arg::Str(objNameStr);
break;
case obj_package_header:
tableClause = "rdb$packages";
columnClause = "rdb$package_name";
- status << Arg::Gds(isc_dyn_package_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_package_not_found) << Arg::Str(objNameStr);
break;
case obj_schema:
tableClause = "rdb$schemas";
columnClause = "rdb$schema_name";
- status << Arg::Gds(isc_dyn_schema_not_found) << Arg::Str(objName);
+ status << Arg::Gds(isc_dyn_schema_not_found) << Arg::Str(objNameStr);
break;
default:
@@ -1271,16 +1267,19 @@
description = text;
PreparedStatement::Builder sql;
- sql << "update" << tableClause << "set rdb$description =" << description;
+ sql << "update" << tableClause << "set rdb$description =" << description << "where 1 = 1";
if (columnClause)
{
- sql << "where" << columnClause << "=" << objName;
+ sql << "and" << columnClause << "=" << objName.identifier;
if (subColumnClause)
sql << "and" << subColumnClause << "=" << subName;
}
+ if (objType == obj_procedure || objType == obj_udf)
+ sql << "and rdb$package_name is not distinct from nullif(" << objName.package << ", '')";
+
if (addWhereClause)
sql << "and" << addWhereClause;
Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/src/dsql/DdlNodes.h 2014-07-27 03:05:44 UTC (rev 59913)
@@ -220,7 +220,7 @@
{
public:
CommentOnNode(MemoryPool& pool, int aObjType,
- const Firebird::MetaName& aObjName, const Firebird::MetaName& aSubName,
+ const Firebird::QualifiedName& aObjName, const Firebird::MetaName& aSubName,
const Firebird::string aText)
: DdlNode(pool),
objType(aObjType),
@@ -238,18 +238,21 @@
protected:
virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector)
{
- /*** ASF: FIXME: When returning, str is destroyed but its pointer is recorded.
- Firebird::string str(objName.c_str());
+ Firebird::string str(objName.toString());
+
if (subName.hasData())
str.append(".").append(subName.c_str());
- statusVector << Firebird::Arg::Gds(isc_dsql_comment_on_failed) << str;
- ***/
- statusVector << Firebird::Arg::Gds(isc_dsql_comment_on_failed) << objName;
+
+ //// ASF: What a hack, as StatusVector does not save the pointer content!
+ const char* p = Firebird::MasterInterfacePtr()->circularAlloc(str.c_str(), str.length(),
+ (intptr_t) getThreadId());
+
+ statusVector << Firebird::Arg::Gds(isc_dsql_comment_on_failed) << p;
}
private:
int objType;
- Firebird::MetaName objName;
+ Firebird::QualifiedName objName;
Firebird::MetaName subName;
Firebird::string text;
};
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/src/dsql/parse.y 2014-07-27 03:05:44 UTC (rev 59913)
@@ -619,6 +619,7 @@
Firebird::MetaName* metaNamePtr;
Firebird::ObjectsArray<Firebird::MetaName>* metaNameArray;
Firebird::PathName* pathNamePtr;
+ Firebird::QualifiedName* qualifiedNamePtr;
Firebird::string* stringPtr;
Jrd::IntlString* intlStringPtr;
Jrd::DbFileClause* dbFileClause;
@@ -4723,11 +4724,15 @@
%type <ddlNode> comment
comment
: COMMENT ON ddl_type0 IS ddl_desc
- { $$ = newNode<CommentOnNode>($3, "", "", *$5); }
+ { $$ = newNode<CommentOnNode>($3, QualifiedName(""), "", *$5); }
| COMMENT ON ddl_type1 symbol_ddl_name IS ddl_desc
- { $$ = newNode<CommentOnNode>($3, *$4, "", *$6); }
+ { $$ = newNode<CommentOnNode>($3, QualifiedName(*$4), "", *$6); }
| COMMENT ON ddl_type2 symbol_ddl_name ddl_subname IS ddl_desc
+ { $$ = newNode<CommentOnNode>($3, QualifiedName(*$4), *$5, *$7); }
+ | COMMENT ON ddl_type3 ddl_qualified_name ddl_subname IS ddl_desc
{ $$ = newNode<CommentOnNode>($3, *$4, *$5, *$7); }
+ | COMMENT ON ddl_type4 ddl_qualified_name IS ddl_desc
+ { $$ = newNode<CommentOnNode>($3, *$4, "", *$6); }
| COMMENT ON USER symbol_user_name IS ddl_desc
{
CreateAlterUserNode* node =
@@ -4748,10 +4753,7 @@
: KW_DOMAIN { $$ = obj_field; }
| TABLE { $$ = obj_relation; }
| VIEW { $$ = obj_view; }
- | PROCEDURE { $$ = obj_procedure; }
| TRIGGER { $$ = obj_trigger; }
- | EXTERNAL FUNCTION { $$ = obj_udf; }
- | FUNCTION { $$ = obj_udf; }
| FILTER { $$ = obj_blob_filter; }
| EXCEPTION { $$ = obj_exception; }
| GENERATOR { $$ = obj_generator; }
@@ -4769,21 +4771,39 @@
%type <intVal> ddl_type2
ddl_type2
: COLUMN { $$ = obj_relation; }
- | ddl_param_opt PARAMETER { $$ = $1; }
;
-%type <intVal> ddl_param_opt
-ddl_param_opt
- : { $$ = obj_parameter; }
- | PROCEDURE { $$ = obj_procedure; }
- | FUNCTION { $$ = obj_udf; }
+%type <intVal> ddl_type3
+ddl_type3
+ : PARAMETER { $$ = obj_parameter; }
+ | PROCEDURE PARAMETER { $$ = obj_procedure; }
+ | FUNCTION PARAMETER { $$ = obj_udf; }
;
+%type <intVal> ddl_type4
+ddl_type4
+ : PROCEDURE { $$ = obj_procedure; }
+ | EXTERNAL FUNCTION { $$ = obj_udf; }
+ | FUNCTION { $$ = obj_udf; }
+ ;
+
%type <metaNamePtr> ddl_subname
ddl_subname
: '.' symbol_ddl_name { $$ = $2; }
;
+%type <metaNamePtr> ddl_subname_opt
+ddl_subname_opt
+ : /* nothing */ { $$ = NULL; }
+ | ddl_subname
+ ;
+
+%type <qualifiedNamePtr> ddl_qualified_name
+ddl_qualified_name
+ : symbol_ddl_name { $$ = newNode<QualifiedName>(*$1); }
+ | symbol_ddl_name '.' symbol_ddl_name { $$ = newNode<QualifiedName>(*$3, *$1); }
+ ;
+
%type <stringPtr> ddl_desc
ddl_desc
: utf_string { $$ = $1; }
Modified: firebird/trunk/src/isql/show.epp
===================================================================
--- firebird/trunk/src/isql/show.epp 2014-07-26 20:29:52 UTC (rev 59912)
+++ firebird/trunk/src/isql/show.epp 2014-07-27 03:05:44 UTC (rev 59913)
@@ -85,7 +85,7 @@
static void show_charsets(const SCHAR*, const SCHAR*, const bool, bool, bool, bool);
static processing_state show_check(const SCHAR*);
static processing_state show_collations(const SCHAR*, SSHORT sys_flag, const char* msg = 0, bool compact = false);
-static void show_comment(const char* objtype, char* name1, char* name2,
+static void show_comment(const char* objtype, char* packageName, char* name1, char* name2,
ISC_QUAD* blobfld, const commentMode showextract, const char* banner);
static processing_state show_comments(const commentMode showextract, const char* banner);
static void show_db();
@@ -2668,7 +2668,7 @@
// Helper that displays in correct syntax the COMMENT ON command for each object.
// It escapes identifiers with embedded double quotes and escapes the comment
// itself if it contains single quotes when we are honoring script extraction.
-static void show_comment(const char* objtype, char* name1, char* name2,
+static void show_comment(const char* objtype, char* packageName, char* name1, char* name2,
ISC_QUAD* blobfld, const commentMode showextract, const char* banner)
{
const bool escape_quotes = showextract == cmmExtract;
@@ -2676,19 +2676,30 @@
if (escape_quotes && banner)
isqlGlob.prints(banner);
+ if (packageName)
+ fb_utils::exact_name(packageName);
if (name1)
fb_utils::exact_name(name1);
if (name2)
fb_utils::exact_name(name2);
+ char packageNameBuffer[BUFFER_LENGTH128];
char SQL_identifier2[BUFFER_LENGTH128];
+
if (escape_quotes && isqlGlob.db_SQL_dialect > SQL_DIALECT_V6_TRANSITION)
{
+ if (packageName)
+ {
+ IUTILS_copy_SQL_id (packageName, packageNameBuffer, DBL_QUOTE);
+ packageName = packageNameBuffer;
+ }
+
if (name1)
{
IUTILS_copy_SQL_id (name1, SQL_identifier, DBL_QUOTE);
name1 = SQL_identifier;
}
+
if (name2)
{
IUTILS_copy_SQL_id (name2, SQL_identifier2, DBL_QUOTE);
@@ -2698,13 +2709,22 @@
const char* quot = escape_quotes ? "'" : "";
- if (!name1)
- isqlGlob.printf("COMMENT ON %-12s IS %s", objtype, quot);
- else if (!name2)
- isqlGlob.printf("COMMENT ON %-12s %s IS %s", objtype, name1, quot);
- else
- isqlGlob.printf("COMMENT ON %-12s %s.%s IS %s", objtype, name1, name2, quot);
+ isqlGlob.printf("COMMENT ON %-12s", objtype);
+ if (packageName || name1 || name2)
+ isqlGlob.printf(" ");
+
+ if (packageName)
+ isqlGlob.printf("%s.", packageName);
+
+ if (name1)
+ isqlGlob.printf("%s", name1);
+
+ if (name2)
+ isqlGlob.printf(".%s", name2);
+
+ isqlGlob.printf(" IS %s", quot);
+
SHOW_print_metadata_text_blob(isqlGlob.Out, blobfld, escape_quotes);
isqlGlob.printf("%s%s%s", quot, isqlGlob.global_Term, NEWLINE);
}
@@ -2740,7 +2760,7 @@
FOR FIRST 1 DT IN RDB$DATABASE
WITH DT.RDB$DESCRIPTION NOT MISSING
- show_comment("DATABASE", 0, 0, &DT.RDB$DESCRIPTION, showextract, first ? banner : 0);
+ show_comment("DATABASE", NULL, NULL, NULL, &DT.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
END_FOR
ON_ERROR
@@ -2754,7 +2774,7 @@
AND DM.RDB$DESCRIPTION NOT MISSING
SORTED BY DM.RDB$FIELD_NAME
- show_comment("DOMAIN", DM.RDB$FIELD_NAME, 0, &DM.RDB$DESCRIPTION,
+ show_comment("DOMAIN", NULL, DM.RDB$FIELD_NAME, NULL, &DM.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2770,7 +2790,7 @@
if (!RL.RDB$DESCRIPTION.NULL && !UserBlob::blobIsNull(RL.RDB$DESCRIPTION))
{
- show_comment("TABLE", RL.RDB$RELATION_NAME, 0, &RL.RDB$DESCRIPTION,
+ show_comment("TABLE", NULL, RL.RDB$RELATION_NAME, NULL, &RL.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
}
@@ -2780,7 +2800,7 @@
AND RF.RDB$DESCRIPTION NOT MISSING
SORTED BY RF.RDB$FIELD_POSITION
- show_comment(" COLUMN", RL.RDB$RELATION_NAME, RF.RDB$FIELD_NAME,
+ show_comment(" COLUMN", NULL, RL.RDB$RELATION_NAME, RF.RDB$FIELD_NAME,
&RF.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2802,7 +2822,7 @@
if (!VW.RDB$DESCRIPTION.NULL && !UserBlob::blobIsNull(VW.RDB$DESCRIPTION))
{
- show_comment("VIEW", VW.RDB$RELATION_NAME, 0 , &VW.RDB$DESCRIPTION,
+ show_comment("VIEW", NULL, VW.RDB$RELATION_NAME, NULL, &VW.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
}
@@ -2812,7 +2832,7 @@
AND RF.RDB$DESCRIPTION NOT MISSING
SORTED BY RF.RDB$FIELD_POSITION
- show_comment(" COLUMN", VW.RDB$RELATION_NAME, RF.RDB$FIELD_NAME,
+ show_comment(" COLUMN", NULL, VW.RDB$RELATION_NAME, RF.RDB$FIELD_NAME,
&RF.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2829,24 +2849,24 @@
FOR PR IN RDB$PROCEDURES
WITH (PR.RDB$SYSTEM_FLAG EQ 0 OR PR.RDB$SYSTEM_FLAG MISSING)
- AND PR.RDB$PACKAGE_NAME MISSING
SORTED BY PR.RDB$PROCEDURE_NAME
if (!PR.RDB$DESCRIPTION.NULL && !UserBlob::blobIsNull(PR.RDB$DESCRIPTION))
{
- show_comment("PROCEDURE", PR.RDB$PROCEDURE_NAME, 0, &PR.RDB$DESCRIPTION,
- showextract, first ? banner : 0);
+ show_comment("PROCEDURE", (PR.RDB$PACKAGE_NAME.NULL ? NULL : PR.RDB$PACKAGE_NAME),
+ PR.RDB$PROCEDURE_NAME, NULL, &PR.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
}
FOR PA IN RDB$PROCEDURE_PARAMETERS
WITH PA.RDB$PROCEDURE_NAME = PR.RDB$PROCEDURE_NAME
- AND PA.RDB$PACKAGE_NAME MISSING
+ AND PA.RDB$PACKAGE_NAME EQUIV NULLIF(PR.RDB$PACKAGE_NAME, '')
AND PA.RDB$DESCRIPTION NOT MISSING
SORTED BY PA.RDB$PARAMETER_TYPE, PA.RDB$PARAMETER_NUMBER
- show_comment(" PARAMETER", PR.RDB$PROCEDURE_NAME, PA.RDB$PARAMETER_NAME,
- &PA.RDB$DESCRIPTION, showextract, first ? banner : 0);
+ show_comment(" PROCEDURE PARAMETER",
+ (PR.RDB$PACKAGE_NAME.NULL ? NULL : PR.RDB$PACKAGE_NAME), PR.RDB$PROCEDURE_NAME,
+ PA.RDB$PARAMETER_NAME, &PA.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
END_FOR
ON_ERROR
@@ -2865,7 +2885,7 @@
AND (TR.RDB$SYSTEM_FLAG EQ 0 OR TR.RDB$SYSTEM_FLAG MISSING)
SORTED BY TR.RDB$TRIGGER_NAME
- show_comment("TRIGGER", TR.RDB$TRIGGER_NAME, 0, &TR.RDB$DESCRIPTION,
+ show_comment("TRIGGER", NULL, TR.RDB$TRIGGER_NAME, NULL, &TR.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2877,7 +2897,6 @@
FOR UD IN RDB$FUNCTIONS
WITH UD.RDB$DESCRIPTION NOT MISSING
AND (UD.RDB$SYSTEM_FLAG EQ 0 OR UD.RDB$SYSTEM_FLAG MISSING)
- AND UD.RDB$PACKAGE_NAME MISSING
SORTED BY UD.RDB$FUNCTION_NAME
// Avoid syntax error when extracting scripts due to an historical bug in gbak.
@@ -2885,9 +2904,26 @@
if (UserBlob::blobIsNull(UD.RDB$DESCRIPTION))
continue;
- show_comment("EXTERNAL FUNCTION", UD.RDB$FUNCTION_NAME, 0,
+ show_comment("FUNCTION",
+ (UD.RDB$PACKAGE_NAME.NULL ? NULL : UD.RDB$PACKAGE_NAME), UD.RDB$FUNCTION_NAME, NULL,
&UD.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
+
+ FOR ARG IN RDB$FUNCTION_ARGUMENTS
+ WITH ARG.RDB$FUNCTION_NAME = UD.RDB$FUNCTION_NAME
+ AND ARG.RDB$PACKAGE_NAME EQUIV NULLIF(UD.RDB$PACKAGE_NAME, '')
+ AND ARG.RDB$DESCRIPTION NOT MISSING
+ SORTED BY ARG.RDB$ARGUMENT_POSITION
+
+ show_comment(" FUNCTION PARAMETER",
+ (ARG.RDB$PACKAGE_NAME.NULL ? NULL : ARG.RDB$PACKAGE_NAME), ARG.RDB$FUNCTION_NAME,
+ ARG.RDB$ARGUMENT_NAME, &ARG.RDB$DESCRIPTION, showextract, first ? banner : 0);
+ first = false;
+ END_FOR
+ ON_ERROR
+ ISQL_errmsg(fbStatus);
+ return ps_ERR;
+ END_ERROR
END_FOR
ON_ERROR
ISQL_errmsg(fbStatus);
@@ -2899,7 +2935,7 @@
AND (BF.RDB$SYSTEM_FLAG EQ 0 OR BF.RDB$SYSTEM_FLAG MISSING)
SORTED BY BF.RDB$FUNCTION_NAME
- show_comment("FILTER", BF.RDB$FUNCTION_NAME, 0, &BF.RDB$DESCRIPTION,
+ show_comment("FILTER", NULL, BF.RDB$FUNCTION_NAME, NULL, &BF.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2913,7 +2949,7 @@
AND (XC.RDB$SYSTEM_FLAG EQ 0 OR XC.RDB$SYSTEM_FLAG MISSING)
SORTED BY XC.RDB$EXCEPTION_NAME
- show_comment("EXCEPTION", XC.RDB$EXCEPTION_NAME, 0, &XC.RDB$DESCRIPTION,
+ show_comment("EXCEPTION", NULL, XC.RDB$EXCEPTION_NAME, NULL, &XC.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2929,7 +2965,7 @@
AND (GR.RDB$SYSTEM_FLAG EQ 0 OR GR.RDB$SYSTEM_FLAG MISSING)
SORTED BY GR.RDB$GENERATOR_NAME
- show_comment("GENERATOR", GR.RDB$GENERATOR_NAME, 0, &GR.RDB$DESCRIPTION,
+ show_comment("GENERATOR", NULL, GR.RDB$GENERATOR_NAME, NULL, &GR.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2944,7 +2980,7 @@
AND (IX.RDB$SYSTEM_FLAG EQ 0 OR IX.RDB$SYSTEM_FLAG MISSING)
SORTED BY IX.RDB$INDEX_NAME
- show_comment("INDEX", IX.RDB$INDEX_NAME, 0, &IX.RDB$DESCRIPTION,
+ show_comment("INDEX", NULL, IX.RDB$INDEX_NAME, NULL, &IX.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2960,7 +2996,7 @@
AND (RO.RDB$SYSTEM_FLAG EQ 0 OR RO.RDB$SYSTEM_FLAG MISSING)
SORTED BY RO.RDB$ROLE_NAME
- show_comment("ROLE", RO.RDB$ROLE_NAME, 0, &RO.RDB$DESCRIPTION,
+ show_comment("ROLE", NULL, RO.RDB$ROLE_NAME, NULL, &RO.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2977,7 +3013,7 @@
AND (PACK.RDB$SYSTEM_FLAG EQ 0 OR PACK.RDB$SYSTEM_FLAG MISSING)
SORTED BY PACK.RDB$PACKAGE_NAME
- show_comment("PACKAGE", PACK.RDB$PACKAGE_NAME, 0, &PACK.RDB$DESCRIPTION,
+ show_comment("PACKAGE", NULL, PACK.RDB$PACKAGE_NAME, NULL, &PACK.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
@@ -2992,7 +3028,7 @@
AND (CH.RDB$SYSTEM_FLAG EQ 0 OR CH.RDB$SYSTEM_FLAG MISSING)
SORTED BY CH.RDB$CHARACTER_SET_NAME
- show_comment("CHARACTER SET", CH.RDB$CHARACTER_SET_NAME, 0,
+ show_comment("CHARACTER SET", NULL, CH.RDB$CHARACTER_SET_NAME, NULL,
&CH.RDB$DESCRIPTION, showextract, first ? banner : 0);
first = false;
END_FOR
@@ -3006,7 +3042,7 @@
AND (CL.RDB$SYSTEM_FLAG EQ 0 OR CL.RDB$SYSTEM_FLAG MISSING)
SORTED BY CL.RDB$COLLATION_NAME
- show_comment("COLLATION", CL.RDB$COLLATION_NAME, 0, &CL.RDB$DESCRIPTION,
+ show_comment("COLLATION", NULL, CL.RDB$COLLATION_NAME, NULL, &CL.RDB$DESCRIPTION,
showextract, first ? banner : 0);
first = false;
END_FOR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-28 00:34:44
|
Revision: 59916
http://sourceforge.net/p/firebird/code/59916
Author: firebirds
Date: 2014-07-28 00:34:36 +0000 (Mon, 28 Jul 2014)
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 2014-07-27 23:33:50 UTC (rev 59915)
+++ firebird/trunk/ChangeLog 2014-07-28 00:34:36 UTC (rev 59916)
@@ -1,3 +1,17 @@
+ 2014-07-27 23:33 asfernandes
+ M src/common/isc_file.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+Warnings.
+
+ 2014-07-27 03:05 asfernandes
+ M doc/sql.extensions/README.ddl.txt
+ M src/common/classes/QualifiedName.h
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/parse.y
+ M src/isql/show.epp
+Improvement CORE-4484 - Description (COMMENT ON) for package procedures and functions, and its parameters.
+
2014-07-24 19:37 dimitr
M src/jrd/Optimizer.cpp
M src/jrd/opt.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-27 23:33:50 UTC (rev 59915)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-28 00:34:36 UTC (rev 59916)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31250
+ FORMAL BUILD NUMBER:31252
*/
-#define PRODUCT_VER_STRING "3.0.0.31250"
-#define FILE_VER_STRING "WI-T3.0.0.31250"
-#define LICENSE_VER_STRING "WI-T3.0.0.31250"
-#define FILE_VER_NUMBER 3, 0, 0, 31250
+#define PRODUCT_VER_STRING "3.0.0.31252"
+#define FILE_VER_STRING "WI-T3.0.0.31252"
+#define LICENSE_VER_STRING "WI-T3.0.0.31252"
+#define FILE_VER_NUMBER 3, 0, 0, 31252
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31250"
+#define FB_BUILD_NO "31252"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-27 23:33:50 UTC (rev 59915)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-28 00:34:36 UTC (rev 59916)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31250
+BuildNum=31252
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...> - 2014-07-29 00:34:23
|
Revision: 59925
http://sourceforge.net/p/firebird/code/59925
Author: firebirds
Date: 2014-07-29 00:34:20 +0000 (Tue, 29 Jul 2014)
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 2014-07-28 14:50:14 UTC (rev 59924)
+++ firebird/trunk/ChangeLog 2014-07-29 00:34:20 UTC (rev 59925)
@@ -1,3 +1,62 @@
+ 2014-07-28 14:50 asfernandes
+ M doc/sql.extensions/README.ddl.txt
+Adjustments as Simonov Denis comments in fb-devel.
+
+ 2014-07-28 13:01 alexpeshkoff
+ M src/burp/backup.epp
+ M src/burp/canonical.cpp
+ M src/burp/restore.epp
+ M src/common/classes/AlignedBuffer.h
+ M src/common/classes/File.h
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+ M src/common/classes/init.cpp
+ M src/common/classes/init.h
+ M src/common/isc_sync.cpp
+ M src/common/utils.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/gen.cpp
+ M src/gpre/msc.cpp
+ M src/include/fb_types.h
+ M src/include/types_pub.h
+ M src/jrd/CryptoManager.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/Function.epp
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/Routine.cpp
+ M src/jrd/SimilarToMatcher.h
+ M src/jrd/TempSpace.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/event.cpp
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/idx.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/met.epp
+ M src/jrd/nbak.cpp
+ M src/jrd/ods.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/lock/lock.cpp
+ M src/qli/all.cpp
+ M src/qli/compile.cpp
+ M src/qli/gener.cpp
+ M src/remote/client/BlrFromMessage.cpp
+ M src/remote/parser.cpp
+ M src/utilities/nbackup/nbackup.cpp
+ M src/yvalve/msg.h
+Renamed as suggested by Nickolay and Dmitry
+
+ 2014-07-28 11:03 alexpeshkoff
+ D src/misc/align.cpp
+Cleanup
+
2014-07-27 23:33 asfernandes
M src/common/isc_file.cpp
M src/jrd/recsrc/HashJoin.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-28 14:50:14 UTC (rev 59924)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-29 00:34:20 UTC (rev 59925)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31252
+ FORMAL BUILD NUMBER:31255
*/
-#define PRODUCT_VER_STRING "3.0.0.31252"
-#define FILE_VER_STRING "WI-T3.0.0.31252"
-#define LICENSE_VER_STRING "WI-T3.0.0.31252"
-#define FILE_VER_NUMBER 3, 0, 0, 31252
+#define PRODUCT_VER_STRING "3.0.0.31255"
+#define FILE_VER_STRING "WI-T3.0.0.31255"
+#define LICENSE_VER_STRING "WI-T3.0.0.31255"
+#define FILE_VER_NUMBER 3, 0, 0, 31255
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31252"
+#define FB_BUILD_NO "31255"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-28 14:50:14 UTC (rev 59924)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-29 00:34:20 UTC (rev 59925)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31252
+BuildNum=31255
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...> - 2014-07-30 00:21:16
|
Revision: 59930
http://sourceforge.net/p/firebird/code/59930
Author: firebirds
Date: 2014-07-30 00:21:11 +0000 (Wed, 30 Jul 2014)
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 2014-07-29 08:15:29 UTC (rev 59929)
+++ firebird/trunk/ChangeLog 2014-07-30 00:21:11 UTC (rev 59930)
@@ -1,3 +1,17 @@
+ 2014-07-29 08:15 hvlad
+ M src/jrd/GarbageCollector.cpp
+ M src/jrd/GarbageCollector.h
+ M src/jrd/vio.cpp
+Cleanup and optimize locking a bit (as suggested by Dmitry)
+
+ 2014-07-29 05:51 dimitr
+ M src/lock/lock.cpp
+Follow-up.
+
+ 2014-07-29 05:50 dimitr
+ M src/lock/lock.cpp
+Trivial fix for CORE-4500: Firebird crashes after unsuccessful remapping of the lock table's shared memory.
+
2014-07-28 14:50 asfernandes
M doc/sql.extensions/README.ddl.txt
Adjustments as Simonov Denis comments in fb-devel.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-29 08:15:29 UTC (rev 59929)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-30 00:21:11 UTC (rev 59930)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31255
+ FORMAL BUILD NUMBER:31258
*/
-#define PRODUCT_VER_STRING "3.0.0.31255"
-#define FILE_VER_STRING "WI-T3.0.0.31255"
-#define LICENSE_VER_STRING "WI-T3.0.0.31255"
-#define FILE_VER_NUMBER 3, 0, 0, 31255
+#define PRODUCT_VER_STRING "3.0.0.31258"
+#define FILE_VER_STRING "WI-T3.0.0.31258"
+#define LICENSE_VER_STRING "WI-T3.0.0.31258"
+#define FILE_VER_NUMBER 3, 0, 0, 31258
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31255"
+#define FB_BUILD_NO "31258"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-29 08:15:29 UTC (rev 59929)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-30 00:21:11 UTC (rev 59930)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31255
+BuildNum=31258
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...> - 2014-07-31 00:33:27
|
Revision: 59937
http://sourceforge.net/p/firebird/code/59937
Author: firebirds
Date: 2014-07-31 00:33:23 +0000 (Thu, 31 Jul 2014)
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 2014-07-30 13:14:31 UTC (rev 59936)
+++ firebird/trunk/ChangeLog 2014-07-31 00:33:23 UTC (rev 59937)
@@ -1,3 +1,27 @@
+ 2014-07-30 13:14 alexpeshkoff
+ M src/common/isc_sync.cpp
+Fixed parameters when using ITimer interface for SYSV-semaphores build
+
+ 2014-07-30 09:54 dimitr
+ M src/jrd/idx.cpp
+Avoid metadata lookups while retrieving the plan (especially important in ASTs).
+
+ 2014-07-30 09:50 dimitr
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+ M src/jrd/RecordSourceNodes.h
+ M src/jrd/btr.h
+ M src/jrd/recsrc/RecordSource.cpp
+Avoid metadata lookups while retrieving the plan (especially important in ASTs).
+
+ 2014-07-30 09:29 dimitr
+ M src/jrd/btr.cpp
+Misc.
+
+ 2014-07-30 09:27 dimitr
+ M src/jrd/recsrc/RecordSource.h
+Misc.
+
2014-07-29 08:15 hvlad
M src/jrd/GarbageCollector.cpp
M src/jrd/GarbageCollector.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-30 13:14:31 UTC (rev 59936)
+++ firebird/trunk/src/jrd/build_no.h 2014-07-31 00:33:23 UTC (rev 59937)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31258
+ FORMAL BUILD NUMBER:31263
*/
-#define PRODUCT_VER_STRING "3.0.0.31258"
-#define FILE_VER_STRING "WI-T3.0.0.31258"
-#define LICENSE_VER_STRING "WI-T3.0.0.31258"
-#define FILE_VER_NUMBER 3, 0, 0, 31258
+#define PRODUCT_VER_STRING "3.0.0.31263"
+#define FILE_VER_STRING "WI-T3.0.0.31263"
+#define LICENSE_VER_STRING "WI-T3.0.0.31263"
+#define FILE_VER_NUMBER 3, 0, 0, 31263
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31258"
+#define FB_BUILD_NO "31263"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-30 13:14:31 UTC (rev 59936)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-07-31 00:33:23 UTC (rev 59937)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31258
+BuildNum=31263
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2014-07-31 11:43:42
|
Revision: 59944
http://sourceforge.net/p/firebird/code/59944
Author: alexpeshkoff
Date: 2014-07-31 11:43:38 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Fixed CORE-4505: Use of named cursor fails if statement was not executed. Should also fix CORE-4489, but I cannot check.
Modified Paths:
--------------
firebird/trunk/examples/interfaces/04.print_table.cpp
firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/include/firebird/Provider.h
firebird/trunk/src/jrd/EngineInterface.h
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/yvalve/YObjects.h
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/examples/interfaces/04.print_table.cpp
===================================================================
--- firebird/trunk/examples/interfaces/04.print_table.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/examples/interfaces/04.print_table.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -93,7 +93,7 @@
"or RDB$VIEW_SOURCE is not null";
// Do not use IStatement - just ask attachment to open cursor
- curs = att->openCursor(st, tra, 0, sql, 3, NULL, NULL, NULL);
+ curs = att->openCursor(st, tra, 0, sql, 3, NULL, NULL, NULL, NULL);
check(st, "openCursor");
meta = curs->getMetadata(st);
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -150,7 +150,7 @@
Message out;
Field<Varying> grantor(out, MAX_SQL_IDENTIFIER_SIZE);
Firebird::IResultSet* curs = att->openCursor(&s, tra, selGrantor.length(),
- selGrantor.c_str(), SQL_DIALECT_V6, NULL, NULL, out.getMetadata());
+ selGrantor.c_str(), SQL_DIALECT_V6, NULL, NULL, out.getMetadata(), NULL);
check(&s);
bool hasGrant = curs->fetchNext(&s, out.getBuffer());
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/dsql/dsql.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -426,7 +426,7 @@
const size_t MAX_CURSOR_LENGTH = 132 - 1;
string cursor = name;
- if (cursor.hasData() && cursor[0] == '\"')
+ if (cursor[0] == '\"')
{
// Quoted cursor names eh? Strip'em.
// Note that "" will be replaced with ".
@@ -477,13 +477,16 @@
// If there already is a cursor and its name isn't the same, ditto.
// We already know there is no cursor by this name in the hash table
- if (req_cursor.isEmpty())
+ if (req_cursor.isEmpty() || !(req_flags & dsql_req::FLAG_OPENED_CURSOR))
{
+ if (req_cursor.hasData())
+ req_dbb->dbb_cursors.remove(req_cursor);
req_cursor = cursor;
req_dbb->dbb_cursors.put(cursor, this);
}
else
{
+ fb_assert(!symbol);
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-502) <<
Arg::Gds(isc_dsql_decl_err) <<
Arg::Gds(isc_dsql_cursor_redefined) << req_cursor);
Modified: firebird/trunk/src/include/firebird/Provider.h
===================================================================
--- firebird/trunk/src/include/firebird/Provider.h 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/include/firebird/Provider.h 2014-07-31 11:43:38 UTC (rev 59944)
@@ -141,7 +141,6 @@
virtual FB_BOOLEAN FB_CARG isEof(IStatus* status) = 0;
virtual FB_BOOLEAN FB_CARG isBof(IStatus* status) = 0;
virtual IMessageMetadata* FB_CARG getMetadata(IStatus* status) = 0;
- virtual void FB_CARG setCursorName(IStatus* status, const char* name) = 0;
virtual void FB_CARG close(IStatus* status) = 0;
// This item is for ISC API emulation only
@@ -149,7 +148,7 @@
// Please do not use it!
virtual void FB_CARG setDelayedOutputFormat(IStatus* status, IMessageMetadata* format) = 0;
};
-#define FB_RESULTSET_VERSION (FB_REFCOUNTED_VERSION + 12)
+#define FB_RESULTSET_VERSION (FB_REFCOUNTED_VERSION + 11)
class IStatement : public IRefCounted
{
@@ -186,10 +185,11 @@
IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) = 0;
virtual IResultSet* FB_CARG openCursor(IStatus* status, ITransaction* transaction,
IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata) = 0;
+ virtual void FB_CARG setCursorName(IStatus* status, const char* name) = 0;
virtual void FB_CARG free(IStatus* status) = 0;
virtual unsigned FB_CARG getFlags(IStatus* status) = 0;
};
-#define FB_STATEMENT_VERSION (FB_REFCOUNTED_VERSION + 10)
+#define FB_STATEMENT_VERSION (FB_REFCOUNTED_VERSION + 11)
class IRequest : public IRefCounted
{
@@ -253,7 +253,8 @@
IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) = 0;
virtual IResultSet* FB_CARG openCursor(IStatus* status, ITransaction* transaction,
unsigned int stmtLength, const char* sqlStmt, unsigned dialect,
- IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata) = 0;
+ IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata,
+ const char* cursorName) = 0;
virtual IEvents* FB_CARG queEvents(IStatus* status, IEventCallback* callback,
unsigned int length, const unsigned char* events) = 0;
virtual void FB_CARG cancelOperation(IStatus* status, int option) = 0;
Modified: firebird/trunk/src/jrd/EngineInterface.h
===================================================================
--- firebird/trunk/src/jrd/EngineInterface.h 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/jrd/EngineInterface.h 2014-07-31 11:43:38 UTC (rev 59944)
@@ -146,7 +146,6 @@
virtual FB_BOOLEAN FB_CARG isEof(Firebird::IStatus* status);
virtual FB_BOOLEAN FB_CARG isBof(Firebird::IStatus* status);
virtual Firebird::IMessageMetadata* FB_CARG getMetadata(Firebird::IStatus* status);
- virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name);
virtual void FB_CARG close(Firebird::IStatus* status);
virtual void FB_CARG setDelayedOutputFormat(Firebird::IStatus* status, Firebird::IMessageMetadata* format);
@@ -190,6 +189,7 @@
virtual JResultSet* FB_CARG openCursor(Firebird::IStatus* status,
Firebird::ITransaction* transaction, Firebird::IMessageMetadata* inMetadata, void* inBuffer,
Firebird::IMessageMetadata* outMetadata);
+ virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name);
virtual unsigned FB_CARG getFlags(Firebird::IStatus* status);
public:
@@ -331,7 +331,7 @@
virtual Firebird::IResultSet* FB_CARG openCursor(Firebird::IStatus* status,
Firebird::ITransaction* transaction, unsigned int stmtLength, const char* sqlStmt,
unsigned int dialect, Firebird::IMessageMetadata* inMetadata, void* inBuffer,
- Firebird::IMessageMetadata* outMetadata);
+ Firebird::IMessageMetadata* outMetadata, const char* cursorName);
virtual JEvents* FB_CARG queEvents(Firebird::IStatus* status, Firebird::IEventCallback* callback,
unsigned int length, const unsigned char* events);
virtual void FB_CARG cancelOperation(Firebird::IStatus* status, int option);
Modified: firebird/trunk/src/jrd/Mapping.cpp
===================================================================
--- firebird/trunk/src/jrd/Mapping.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/jrd/Mapping.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -278,7 +278,7 @@
"SELECT RDB$MAP_USING, RDB$MAP_PLUGIN, RDB$MAP_DB, RDB$MAP_FROM_TYPE, "
" RDB$MAP_FROM, RDB$MAP_TO_TYPE, RDB$MAP_TO "
"FROM RDB$AUTH_MAPPING",
- 3, NULL, NULL, mMap.getMetadata());
+ 3, NULL, NULL, mMap.getMetadata(), NULL);
if (!st.isSuccess())
{
if (fb_utils::containsErrorCode(st.get(), isc_dsql_relation_err))
@@ -1190,7 +1190,7 @@
"SELECT RDB$MAP_NAME, RDB$MAP_USING, RDB$MAP_PLUGIN, RDB$MAP_DB, "
" RDB$MAP_FROM_TYPE, RDB$MAP_FROM, RDB$MAP_TO_TYPE, RDB$MAP_TO "
"FROM RDB$AUTH_MAPPING",
- 3, NULL, NULL, mMap.getMetadata());
+ 3, NULL, NULL, mMap.getMetadata(), NULL);
if (!st.isSuccess())
{
if (!fb_utils::containsErrorCode(st.get(), isc_dsql_relation_err))
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/jrd/jrd.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -4474,7 +4474,8 @@
IResultSet* JAttachment::openCursor(IStatus* user_status, ITransaction* apiTra,
unsigned int length, const char* string, unsigned int dialect,
- IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata)
+ IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata,
+ const char* cursorName)
{
IStatement* tmpStatement = prepare(user_status, apiTra, length, string, dialect,
(outMetadata ? 0 : IStatement::PREPARE_PREFETCH_OUTPUT_PARAMETERS));
@@ -4483,6 +4484,16 @@
return NULL;
}
+ if (cursorName)
+ {
+ tmpStatement->setCursorName(user_status, cursorName);
+ if (!user_status->isSuccess())
+ {
+ tmpStatement->release();
+ return NULL;
+ }
+ }
+
IResultSet* rs = tmpStatement->openCursor(user_status, apiTra,
inMetadata, inBuffer, outMetadata);
@@ -5035,7 +5046,7 @@
}
-void JResultSet::setCursorName(IStatus* user_status, const char* cursor)
+void JStatement::setCursorName(IStatus* user_status, const char* cursor)
{
try
{
@@ -5044,9 +5055,7 @@
try
{
- dsql_req* req = getStatement()->getHandle();
- fb_assert(req);
- req->setCursor(tdbb, cursor);
+ getHandle()->setCursor(tdbb, cursor);
}
catch (const Exception& ex)
{
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/remote/client/interface.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -253,7 +253,6 @@
virtual FB_BOOLEAN FB_CARG isEof(IStatus* status);
virtual FB_BOOLEAN FB_CARG isBof(IStatus* status);
virtual IMessageMetadata* FB_CARG getMetadata(IStatus* status);
- virtual void FB_CARG setCursorName(IStatus* status, const char* name);
virtual void FB_CARG close(IStatus* status);
virtual void FB_CARG setDelayedOutputFormat(IStatus* status, IMessageMetadata* format);
@@ -308,6 +307,7 @@
IMessageMetadata* outMetadata, void* outBuffer);
virtual ResultSet* FB_CARG openCursor(IStatus* status, ITransaction* tra,
IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outFormat);
+ virtual void FB_CARG setCursorName(IStatus* status, const char* name);
virtual void FB_CARG free(IStatus* status);
virtual unsigned FB_CARG getFlags(IStatus* status);
@@ -475,7 +475,8 @@
IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer);
virtual Firebird::IResultSet* FB_CARG openCursor(IStatus* status, ITransaction* transaction,
unsigned int stmtLength, const char* sqlStmt, unsigned dialect,
- IMessageMetadata* inMetadata, void* inBuffer, Firebird::IMessageMetadata* outMetadata);
+ IMessageMetadata* inMetadata, void* inBuffer, Firebird::IMessageMetadata* outMetadata,
+ const char* cursorName);
virtual Firebird::IEvents* FB_CARG queEvents(IStatus* status, Firebird::IEventCallback* callback,
unsigned int length, const unsigned char* events);
virtual void FB_CARG cancelOperation(IStatus* status, int option);
@@ -1986,7 +1987,8 @@
IResultSet* FB_CARG Attachment::openCursor(IStatus* status, ITransaction* transaction,
unsigned int stmtLength, const char* sqlStmt, unsigned dialect,
- IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata)
+ IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata,
+ const char* cursorName)
{
Statement* stmt = prepare(status, transaction, stmtLength, sqlStmt, dialect,
(outMetadata ? 0 : IStatement::PREPARE_PREFETCH_OUTPUT_PARAMETERS));
@@ -2002,6 +2004,17 @@
return NULL;
}
+ if (cursorName)
+ {
+ stmt->setCursorName(status, cursorName);
+ if (!status->isSuccess())
+ {
+ rc->release();
+ stmt->release();
+ return NULL;
+ }
+ }
+
rc->tmpStatement = true;
return rc;
}
@@ -3070,7 +3083,7 @@
}
-void ResultSet::setCursorName(IStatus* status, const char* cursor)
+void Statement::setCursorName(IStatus* status, const char* cursor)
{
/*****************************************
*
@@ -3101,16 +3114,9 @@
// Check and validate handles, etc.
- if (!stmt)
- {
- (Arg::Gds(isc_dsql_cursor_err) << Arg::Gds(isc_bad_req_handle)).raise();
- }
- Rsr* statement = stmt->getStatement();
+ Rsr* statement = getStatement();
CHECK_HANDLE(statement, isc_bad_req_handle);
-
Rdb* rdb = statement->rsr_rdb;
- CHECK_HANDLE(rdb, isc_bad_db_handle);
-
rem_port* port = rdb->rdb_port;
RefMutexGuard portGuard(*port->port_sync, FB_FUNCTION);
Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/remote/server/server.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -2898,7 +2898,6 @@
return this->send_response(sendL, 0, 0, &status_vector, true);
}
statement->rsr_cursor = NULL;
- statement->rsr_cursor_name = "";
fb_assert(statement->rsr_rtr);
FB_SIZE_T pos;
if (!statement->rsr_rtr->rtr_cursors.find(statement, pos))
@@ -3230,14 +3229,6 @@
{
transaction->rtr_cursors.add(statement);
statement->rsr_delayed_format = !out_blr_length;
-
- if (statement->rsr_cursor_name.hasData())
- {
- statement->rsr_cursor->setCursorName(&status_vector, statement->rsr_cursor_name.c_str());
-
- if (status_vector.isSuccess())
- statement->rsr_cursor_name = "";
- }
}
}
else
@@ -4051,6 +4042,13 @@
if (!status_vector.isSuccess())
return this->send_response(sendL, 0, 0, &status_vector, false);
+ if (statement->rsr_cursor_name.hasData())
+ {
+ statement->rsr_iface->setCursorName(&status_vector, statement->rsr_cursor_name.c_str());
+ if (!status_vector.isSuccess())
+ return this->send_response(sendL, 0, 0, &status_vector, false);
+ }
+
LocalStatus s2;
statement->rsr_iface->getInfo(&s2, infoLength, info, prepareL->p_sqlst_buffer_length, buffer);
if (!s2.isSuccess())
@@ -4999,7 +4997,6 @@
Rsr* const statement = transaction->rtr_cursors.pop();
fb_assert(statement->rsr_cursor);
statement->rsr_cursor = NULL;
- statement->rsr_cursor_name = "";
}
for (Rtr** p = &rdb->rdb_transactions; *p; p = &(*p)->rtr_next)
@@ -5405,20 +5402,18 @@
getHandle(statement, sqlcur->p_sqlcur_statement);
-
- if (statement->rsr_cursor)
- statement->rsr_cursor->setCursorName(&status_vector, name);
- else
+ if (port_protocol < PROTOCOL_VERSION13 && statement->rsr_cursor_name.hasData() &&
+ statement->rsr_cursor_name != name)
{
- if (statement->rsr_cursor_name.hasData() && statement->rsr_cursor_name != name)
- {
- status_vector.set((Arg::Gds(isc_dsql_decl_err) <<
- Arg::Gds(isc_dsql_cursor_redefined) << statement->rsr_cursor_name).value());
- }
- else
- statement->rsr_cursor_name = name;
+ status_vector.set((Arg::Gds(isc_dsql_decl_err) <<
+ Arg::Gds(isc_dsql_cursor_redefined) << statement->rsr_cursor_name).value());
}
+ else
+ statement->rsr_cursor_name = name;
+ if (statement->rsr_iface)
+ statement->rsr_iface->setCursorName(&status_vector, name);
+
return this->send_response(sendL, 0, 0, &status_vector, false);
}
Modified: firebird/trunk/src/yvalve/YObjects.h
===================================================================
--- firebird/trunk/src/yvalve/YObjects.h 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/yvalve/YObjects.h 2014-07-31 11:43:38 UTC (rev 59944)
@@ -310,7 +310,6 @@
virtual FB_BOOLEAN FB_CARG isEof(Firebird::IStatus* status);
virtual FB_BOOLEAN FB_CARG isBof(Firebird::IStatus* status);
virtual Firebird::IMessageMetadata* FB_CARG getMetadata(Firebird::IStatus* status);
- virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name);
virtual void FB_CARG close(Firebird::IStatus* status);
virtual void FB_CARG setDelayedOutputFormat(Firebird::IStatus* status, Firebird::IMessageMetadata* format);
@@ -358,6 +357,7 @@
Firebird::IMessageMetadata* outMetadata, void* outBuffer);
virtual Firebird::IResultSet* FB_CARG openCursor(Firebird::IStatus* status, Firebird::ITransaction* transaction,
Firebird::IMessageMetadata* inMetadata, void* inBuffer, Firebird::IMessageMetadata* outMetadata);
+ virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name);
virtual void FB_CARG free(Firebird::IStatus* status);
virtual unsigned FB_CARG getFlags(Firebird::IStatus* status);
@@ -433,7 +433,8 @@
Firebird::IMessageMetadata* outMetadata, void* outBuffer);
virtual Firebird::IResultSet* FB_CARG openCursor(Firebird::IStatus* status, Firebird::ITransaction* transaction,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect,
- Firebird::IMessageMetadata* inMetadata, void* inBuffer, Firebird::IMessageMetadata* outMetadata);
+ Firebird::IMessageMetadata* inMetadata, void* inBuffer, Firebird::IMessageMetadata* outMetadata,
+ const char* cursorName);
virtual YEvents* FB_CARG queEvents(Firebird::IStatus* status, Firebird::IEventCallback* callback,
unsigned int length, const unsigned char* eventsData);
virtual void FB_CARG cancelOperation(Firebird::IStatus* status, int option);
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2014-07-31 09:08:27 UTC (rev 59943)
+++ firebird/trunk/src/yvalve/why.cpp 2014-07-31 11:43:38 UTC (rev 59944)
@@ -1370,14 +1370,6 @@
fb_assert(statement->cursor);
- if (cursorName.hasData())
- {
- statement->cursor->setCursorName(status, cursorName.c_str());
-
- if (status->isSuccess())
- cursorName = "";
- }
-
delayedFormat = (outMetadata == DELAYED_OUT_FORMAT);
}
@@ -1408,7 +1400,6 @@
Arg::StatusVector(status->get()).raise();
statement = NULL;
- cursorName = "";
}
}
@@ -2345,13 +2336,6 @@
}
fb_assert(statement->statement->cursor);
-
- if (statement->cursorName.hasData())
- {
- statement->statement->cursor->setCursorName(&status, statement->cursorName.c_str());
- if (status.isSuccess())
- statement->cursorName = "";
- }
}
else
{
@@ -2798,18 +2782,15 @@
{
RefPtr<IscStatement> statement(translateHandle(statements, stmtHandle));
- if (statement->statement && statement->statement->cursor)
- statement->statement->cursor->setCursorName(&status, cursorName);
- else
+ if (statement->cursorName.hasData() && statement->cursorName != cursorName)
{
- if (statement->cursorName.hasData() && statement->cursorName != cursorName)
- {
- (Arg::Gds(isc_dsql_decl_err) <<
- Arg::Gds(isc_dsql_cursor_redefined) << statement->cursorName).raise();
- }
+ (Arg::Gds(isc_dsql_decl_err) <<
+ Arg::Gds(isc_dsql_cursor_redefined) << statement->cursorName).raise();
+ }
- statement->cursorName = cursorName;
- }
+ statement->cursorName = cursorName;
+ if (statement->statement)
+ statement->statement->setCursorName(&status, cursorName);
}
catch (const Exception& e)
{
@@ -4444,11 +4425,11 @@
destroy2(dstrFlags);
}
-void YResultSet::setCursorName(IStatus* status, const char* name)
+void YStatement::setCursorName(IStatus* status, const char* name)
{
try
{
- YEntry<YResultSet> entry(status, this);
+ YEntry<YStatement> entry(status, this);
entry.next()->setCursorName(status, name);
}
@@ -5173,7 +5154,8 @@
IResultSet* YAttachment::openCursor(IStatus* status, ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
- IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata)
+ IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata,
+ const char* cursorName)
{
IResultSet* rs = NULL;
try
@@ -5185,7 +5167,7 @@
getNextTransaction(status, transaction, trans);
rs = entry.next()->openCursor(status, trans, length, string, dialect,
- inMetadata, inBuffer, outMetadata);
+ inMetadata, inBuffer, outMetadata, cursorName);
if (!status->isSuccess())
{
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-08-01 00:34:55
|
Revision: 59947
http://sourceforge.net/p/firebird/code/59947
Author: firebirds
Date: 2014-08-01 00:34:51 +0000 (Fri, 01 Aug 2014)
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 2014-07-31 21:15:33 UTC (rev 59946)
+++ firebird/trunk/ChangeLog 2014-08-01 00:34:51 UTC (rev 59947)
@@ -1,3 +1,82 @@
+ 2014-07-31 21:15 skidder
+ M src/jrd/Monitoring.cpp
+ M src/jrd/Monitoring.h
+ M src/jrd/TempSpace.cpp
+Fix MSVC build errors and warnings
+
+ 2014-07-31 16:30 asfernandes
+ M src/burp/backup.epp
+ M src/burp/burp.h
+ M src/burp/restore.epp
+ M src/dsql/PackageNodes.epp
+ M src/include/gen/ids.h
+ M src/isql/extract.epp
+ M src/isql/show.epp
+ M src/jrd/names.h
+ M src/jrd/relations.h
+Improvement CORE-4487 - Maintain package body after ALTER/RECREATE PACKAGE.
+
+ 2014-07-31 11:43 alexpeshkoff
+ M examples/interfaces/04.print_table.cpp
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/dsql/dsql.cpp
+ M src/include/firebird/Provider.h
+ M src/jrd/EngineInterface.h
+ M src/jrd/Mapping.cpp
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/server/server.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Fixed CORE-4505: Use of named cursor fails if statement was not executed. Should also fix CORE-4489, but I cannot check.
+
+ 2014-07-31 09:08 dimitr
+ M src/yvalve/why.cpp
+Commented out the annoying (thus supposedly wrong?) assertion.
+
+ 2014-07-31 09:07 dimitr
+ M src/msgs/messages2.sql
+Follow-up.
+
+ 2014-07-31 09:01 dimitr
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/engine.vcxproj.filters
+ M builds/win32/msvc8/engine.vcproj
+ M builds/win32/msvc9/engine.vcproj
+Fixed Windows builds.
+
+ 2014-07-31 08:56 dimitr
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/Database.h
+ D src/jrd/DatabaseSnapshot.cpp
+ D src/jrd/DatabaseSnapshot.h
+ M src/jrd/Mapping.cpp
+ M src/jrd/Mapping.h
+ A src/jrd/Monitoring.cpp (from /firebird/trunk/src/jrd/DatabaseSnapshot.cpp:59871)
+ A src/jrd/Monitoring.h (from /firebird/trunk/src/jrd/DatabaseSnapshot.h:59871)
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/VirtualTable.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/lck.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/sdw.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/vio.cpp
+Refactored database monitoring, made its handling attachment bound. This should make deadlocks impossible, as well as avoid blocking worker connections while the monitoring request is processed.
+
+ 2014-07-31 08:29 roman-simakov
+ M src/dsql/DdlNodes.epp
+DDL permission check for COMMENT ON
+
+ 2014-07-31 07:54 hvlad
+ M src/jrd/btr.cpp
+While i don't see how we can have positive scale, wrong code should be fixed anyway
+
2014-07-30 13:14 alexpeshkoff
M src/common/isc_sync.cpp
Fixed parameters when using ITimer interface for SYSV-semaphores build
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-07-31 21:15:33 UTC (rev 59946)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-01 00:34:51 UTC (rev 59947)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31263
+ FORMAL BUILD NUMBER:31272
*/
-#define PRODUCT_VER_STRING "3.0.0.31263"
-#define FILE_VER_STRING "WI-T3.0.0.31263"
-#define LICENSE_VER_STRING "WI-T3.0.0.31263"
-#define FILE_VER_NUMBER 3, 0, 0, 31263
+#define PRODUCT_VER_STRING "3.0.0.31272"
+#define FILE_VER_STRING "WI-T3.0.0.31272"
+#define LICENSE_VER_STRING "WI-T3.0.0.31272"
+#define FILE_VER_NUMBER 3, 0, 0, 31272
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31263"
+#define FB_BUILD_NO "31272"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-07-31 21:15:33 UTC (rev 59946)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-01 00:34:51 UTC (rev 59947)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31263
+BuildNum=31272
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...> - 2014-08-02 00:31:40
|
Revision: 59949
http://sourceforge.net/p/firebird/code/59949
Author: firebirds
Date: 2014-08-02 00:31:35 +0000 (Sat, 02 Aug 2014)
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 2014-08-01 16:22:37 UTC (rev 59948)
+++ firebird/trunk/ChangeLog 2014-08-02 00:31:35 UTC (rev 59949)
@@ -1,3 +1,7 @@
+ 2014-08-01 16:22 asfernandes
+ M src/jrd/vio.cpp
+Fixed the restore of packaged routines.
+
2014-07-31 21:15 skidder
M src/jrd/Monitoring.cpp
M src/jrd/Monitoring.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-01 16:22:37 UTC (rev 59948)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-02 00:31:35 UTC (rev 59949)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31272
+ FORMAL BUILD NUMBER:31273
*/
-#define PRODUCT_VER_STRING "3.0.0.31272"
-#define FILE_VER_STRING "WI-T3.0.0.31272"
-#define LICENSE_VER_STRING "WI-T3.0.0.31272"
-#define FILE_VER_NUMBER 3, 0, 0, 31272
+#define PRODUCT_VER_STRING "3.0.0.31273"
+#define FILE_VER_STRING "WI-T3.0.0.31273"
+#define LICENSE_VER_STRING "WI-T3.0.0.31273"
+#define FILE_VER_NUMBER 3, 0, 0, 31273
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31272"
+#define FB_BUILD_NO "31273"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-01 16:22:37 UTC (rev 59948)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-02 00:31:35 UTC (rev 59949)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31272
+BuildNum=31273
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...> - 2014-08-05 00:40:29
|
Revision: 59952
http://sourceforge.net/p/firebird/code/59952
Author: firebirds
Date: 2014-08-05 00:40:19 +0000 (Tue, 05 Aug 2014)
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 2014-08-04 08:13:24 UTC (rev 59951)
+++ firebird/trunk/ChangeLog 2014-08-05 00:40:19 UTC (rev 59952)
@@ -1,3 +1,11 @@
+ 2014-08-04 08:13 alexpeshkoff
+ M src/lock/print.cpp
+comment
+
+ 2014-08-04 08:02 alexpeshkoff
+ M src/lock/print.cpp
+Fixed Darwin port
+
2014-08-01 16:22 asfernandes
M src/jrd/vio.cpp
Fixed the restore of packaged routines.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-04 08:13:24 UTC (rev 59951)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-05 00:40:19 UTC (rev 59952)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31273
+ FORMAL BUILD NUMBER:31275
*/
-#define PRODUCT_VER_STRING "3.0.0.31273"
-#define FILE_VER_STRING "WI-T3.0.0.31273"
-#define LICENSE_VER_STRING "WI-T3.0.0.31273"
-#define FILE_VER_NUMBER 3, 0, 0, 31273
+#define PRODUCT_VER_STRING "3.0.0.31275"
+#define FILE_VER_STRING "WI-T3.0.0.31275"
+#define LICENSE_VER_STRING "WI-T3.0.0.31275"
+#define FILE_VER_NUMBER 3, 0, 0, 31275
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31273"
+#define FB_BUILD_NO "31275"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-04 08:13:24 UTC (rev 59951)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-05 00:40:19 UTC (rev 59952)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31273
+BuildNum=31275
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...> - 2014-08-06 00:37:26
|
Revision: 59956
http://sourceforge.net/p/firebird/code/59956
Author: firebirds
Date: 2014-08-06 00:37:23 +0000 (Wed, 06 Aug 2014)
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 2014-08-05 18:07:27 UTC (rev 59955)
+++ firebird/trunk/ChangeLog 2014-08-06 00:37:23 UTC (rev 59956)
@@ -1,3 +1,19 @@
+ 2014-08-05 16:00 hvlad
+ M src/jrd/pag.cpp
+Fixed bug CORE-4510 : AV in validation is possible
+
+ 2014-08-05 08:46 dimitr
+ M src/include/gen/ids.h
+ M src/jrd/Monitoring.cpp
+ M src/jrd/RuntimeStatistics.cpp
+ M src/jrd/RuntimeStatistics.h
+ M src/jrd/inf.cpp
+ M src/jrd/jrd.h
+ M src/jrd/names.h
+ M src/jrd/relations.h
+ M src/jrd/vio.cpp
+Refactored RuntimeStatistics internals. Added more record-level performance counters.
+
2014-08-04 08:13 alexpeshkoff
M src/lock/print.cpp
comment
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-05 18:07:27 UTC (rev 59955)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-06 00:37:23 UTC (rev 59956)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31275
+ FORMAL BUILD NUMBER:31277
*/
-#define PRODUCT_VER_STRING "3.0.0.31275"
-#define FILE_VER_STRING "WI-T3.0.0.31275"
-#define LICENSE_VER_STRING "WI-T3.0.0.31275"
-#define FILE_VER_NUMBER 3, 0, 0, 31275
+#define PRODUCT_VER_STRING "3.0.0.31277"
+#define FILE_VER_STRING "WI-T3.0.0.31277"
+#define LICENSE_VER_STRING "WI-T3.0.0.31277"
+#define FILE_VER_NUMBER 3, 0, 0, 31277
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31275"
+#define FB_BUILD_NO "31277"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-05 18:07:27 UTC (rev 59955)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-06 00:37:23 UTC (rev 59956)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31275
+BuildNum=31277
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...> - 2014-08-06 02:12:10
|
Revision: 59957
http://sourceforge.net/p/firebird/code/59957
Author: asfernandes
Date: 2014-08-06 02:12:01 +0000 (Wed, 06 Aug 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/doc/sql.extensions/README.ddl.txt
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/include/fb_types.h
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/TempSpace.cpp
firebird/trunk/src/jrd/pag.cpp
Modified: firebird/trunk/doc/sql.extensions/README.ddl.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl.txt 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/doc/sql.extensions/README.ddl.txt 2014-08-06 02:12:01 UTC (rev 59957)
@@ -136,7 +136,7 @@
COMMENT ON DATABASE IS {'txt'|NULL};
COMMENT ON <basic_type> name IS {'txt'|NULL};
COMMENT ON COLUMN table_or_view_name.field_name IS {'txt'|NULL};
-COMMENT ON {PROCEDURE | FUNCTION} [<package_name> .] name.param_name IS {'txt'|NULL};
+COMMENT ON {PROCEDURE | [EXTERNAL] FUNCTION} [<package_name> .] name.param_name IS {'txt'|NULL};
COMMENT ON [PROCEDURE | FUNCTION] PARAMETER [<package_name> .] name.param_name IS {'txt'|NULL};
An empty literal string '' will act as NULL since the internal code (DYN in this case)
@@ -146,9 +146,7 @@
- DOMAIN
- TABLE
- VIEW
-- PROCEDURE
- TRIGGER
-- [EXTERNAL] FUNCTION
- FILTER
- EXCEPTION
- GENERATOR
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2014-08-06 02:12:01 UTC (rev 59957)
@@ -1130,6 +1130,7 @@
dsc dscName;
MetaName relationName;
+
switch (objType)
{
case obj_schema:
@@ -1210,6 +1211,7 @@
default:
fb_assert(false);
}
+
return true;
}
Modified: firebird/trunk/src/include/fb_types.h
===================================================================
--- firebird/trunk/src/include/fb_types.h 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/src/include/fb_types.h 2014-08-06 02:12:01 UTC (rev 59957)
@@ -153,7 +153,7 @@
template <typename T>
inline T FB_ALIGN(T n, uintptr_t b)
{
- return (T) ((((uintptr_t)n) + b - 1) & ~(b - 1));
+ return (T) ((((uintptr_t) n) + b - 1) & ~(b - 1));
}
#endif /* INCLUDE_FB_TYPES_H */
Modified: firebird/trunk/src/isql/show.epp
===================================================================
--- firebird/trunk/src/isql/show.epp 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/src/isql/show.epp 2014-08-06 02:12:01 UTC (rev 59957)
@@ -1341,7 +1341,7 @@
{
case 'C':
priv_flags |= priv_CREATE;
- break;
+ break;
case 'L':
priv_flags |= priv_ALTER;
break;
@@ -1350,6 +1350,7 @@
break;
default:
priv_flags |= priv_UNKNOWN;
+ break;
}
make_priv_string (priv_flags, priv_string);
Modified: firebird/trunk/src/jrd/TempSpace.cpp
===================================================================
--- firebird/trunk/src/jrd/TempSpace.cpp 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/src/jrd/TempSpace.cpp 2014-08-06 02:12:01 UTC (rev 59957)
@@ -290,7 +290,7 @@
}
}
-
+
// NS 2014-07-31: FIXME: missing exception handling.
// error thrown in block of code below will leave TempSpace in inconsistent state:
// logical/physical size already increased while allocation has in fact failed.
Modified: firebird/trunk/src/jrd/pag.cpp
===================================================================
--- firebird/trunk/src/jrd/pag.cpp 2014-08-06 00:37:23 UTC (rev 59956)
+++ firebird/trunk/src/jrd/pag.cpp 2014-08-06 02:12:01 UTC (rev 59957)
@@ -1913,7 +1913,7 @@
pipLast = pipFirst;
window.win_page = pipLast;
- };
+ }
page_inv_page* pip = (page_inv_page*) window.win_buffer;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-08-08 01:24:54
|
Revision: 59960
http://sourceforge.net/p/firebird/code/59960
Author: firebirds
Date: 2014-08-08 01:24:47 +0000 (Fri, 08 Aug 2014)
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 2014-08-06 13:46:26 UTC (rev 59959)
+++ firebird/trunk/ChangeLog 2014-08-08 01:24:47 UTC (rev 59960)
@@ -1,3 +1,20 @@
+ 2014-08-06 13:46 alexpeshkoff
+ M src/dsql/dsql.cpp
+Restored a check dropped accidentially by one of my recent commits
+
+ 2014-08-06 08:55 hvlad
+ M src/jrd/vio.cpp
+Missing notification of gc thread.
+
+ 2014-08-06 02:12 asfernandes
+ M doc/sql.extensions/README.ddl.txt
+ M src/dsql/DdlNodes.epp
+ M src/include/fb_types.h
+ M src/isql/show.epp
+ M src/jrd/TempSpace.cpp
+ M src/jrd/pag.cpp
+Misc.
+
2014-08-05 16:00 hvlad
M src/jrd/pag.cpp
Fixed bug CORE-4510 : AV in validation is possible
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-06 13:46:26 UTC (rev 59959)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-08 01:24:47 UTC (rev 59960)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31277
+ FORMAL BUILD NUMBER:31280
*/
-#define PRODUCT_VER_STRING "3.0.0.31277"
-#define FILE_VER_STRING "WI-T3.0.0.31277"
-#define LICENSE_VER_STRING "WI-T3.0.0.31277"
-#define FILE_VER_NUMBER 3, 0, 0, 31277
+#define PRODUCT_VER_STRING "3.0.0.31280"
+#define FILE_VER_STRING "WI-T3.0.0.31280"
+#define LICENSE_VER_STRING "WI-T3.0.0.31280"
+#define FILE_VER_NUMBER 3, 0, 0, 31280
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31277"
+#define FB_BUILD_NO "31280"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-06 13:46:26 UTC (rev 59959)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-08 01:24:47 UTC (rev 59960)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31277
+BuildNum=31280
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...> - 2014-08-09 01:15:55
|
Revision: 59963
http://sourceforge.net/p/firebird/code/59963
Author: firebirds
Date: 2014-08-09 01:15:46 +0000 (Sat, 09 Aug 2014)
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 2014-08-08 15:29:36 UTC (rev 59962)
+++ firebird/trunk/ChangeLog 2014-08-09 01:15:46 UTC (rev 59963)
@@ -1,3 +1,11 @@
+ 2014-08-08 15:29 dimitr
+ M src/jrd/jrd.h
+Atempted to fix a crash when the database monitoring is used concurrently under load.
+
+ 2014-08-08 15:27 dimitr
+ M src/jrd/vio.cpp
+Fixed possible deadlocks between a worker thread and an attachment-level AST.
+
2014-08-06 13:46 alexpeshkoff
M src/dsql/dsql.cpp
Restored a check dropped accidentially by one of my recent commits
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-08 15:29:36 UTC (rev 59962)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-09 01:15:46 UTC (rev 59963)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31280
+ FORMAL BUILD NUMBER:31282
*/
-#define PRODUCT_VER_STRING "3.0.0.31280"
-#define FILE_VER_STRING "WI-T3.0.0.31280"
-#define LICENSE_VER_STRING "WI-T3.0.0.31280"
-#define FILE_VER_NUMBER 3, 0, 0, 31280
+#define PRODUCT_VER_STRING "3.0.0.31282"
+#define FILE_VER_STRING "WI-T3.0.0.31282"
+#define LICENSE_VER_STRING "WI-T3.0.0.31282"
+#define FILE_VER_NUMBER 3, 0, 0, 31282
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31280"
+#define FB_BUILD_NO "31282"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-08 15:29:36 UTC (rev 59962)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-09 01:15:46 UTC (rev 59963)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31280
+BuildNum=31282
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...> - 2014-08-11 01:14:28
|
Revision: 59968
http://sourceforge.net/p/firebird/code/59968
Author: firebirds
Date: 2014-08-11 01:14:25 +0000 (Mon, 11 Aug 2014)
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 2014-08-10 20:11:41 UTC (rev 59967)
+++ firebird/trunk/ChangeLog 2014-08-11 01:14:25 UTC (rev 59968)
@@ -1,3 +1,18 @@
+ 2014-08-10 20:11 dimitr
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/Monitoring.cpp
+Better (methinks) synchronization for the monitoring stuff. Being field tested.
+
+ 2014-08-10 20:07 dimitr
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+Front-ported Nickolay's improvement for the shared counter.
+
+ 2014-08-10 15:14 dimitr
+ M src/lock/print.cpp
+Misc.
+
2014-08-08 15:29 dimitr
M src/jrd/jrd.h
Atempted to fix a crash when the database monitoring is used concurrently under load.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-08-10 20:11:41 UTC (rev 59967)
+++ firebird/trunk/src/jrd/build_no.h 2014-08-11 01:14:25 UTC (rev 59968)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31282
+ FORMAL BUILD NUMBER:31285
*/
-#define PRODUCT_VER_STRING "3.0.0.31282"
-#define FILE_VER_STRING "WI-T3.0.0.31282"
-#define LICENSE_VER_STRING "WI-T3.0.0.31282"
-#define FILE_VER_NUMBER 3, 0, 0, 31282
+#define PRODUCT_VER_STRING "3.0.0.31285"
+#define FILE_VER_STRING "WI-T3.0.0.31285"
+#define LICENSE_VER_STRING "WI-T3.0.0.31285"
+#define FILE_VER_NUMBER 3, 0, 0, 31285
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31282"
+#define FB_BUILD_NO "31285"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-08-10 20:11:41 UTC (rev 59967)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-08-11 01:14:25 UTC (rev 59968)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31282
+BuildNum=31285
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X