Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2012-12-04 04:47:25
|
Revision: 57445
http://firebird.svn.sourceforge.net/firebird/?rev=57445&view=rev
Author: firebirds
Date: 2012-12-04 04:47:17 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-04 03:50:23 UTC (rev 57444)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-04 04:47:17 UTC (rev 57445)
@@ -1,3 +1,20 @@
+ 2012-12-03 11:04 dimitr
+ M src/jrd/btr.cpp
+Yet another complementary bugfix for CORE-4004 that avoids an index root page remaining locked after cooperative GC has been terminated by user.
+
+ 2012-12-03 10:47 dimitr
+ M src/jrd/err.cpp
+Complementary patch to the prior one. It avoids unnecessary operations (system table lookups) if we don't need index or constraint names to be reported in the error message.
+
+ 2012-12-03 10:44 dimitr
+ M src/jrd/idx.cpp
+ M src/jrd/nav.cpp
+Fixed one part of CORE-4004: Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests. It's definitely not a good idea to ignore errors coming from inside BTR_key().
+
+ 2012-12-03 10:33 dimitr
+ M src/jrd/jrd.cpp
+Fixed the partially disabled interruptions, accidentally broken with CORE-3323 in v2.5.1.
+
2012-11-30 08:12 hvlad
M src/jrd/dpm.epp
Fixed bug CORE-4002 : Error message "index unexpectedly deleted" in database trigger on commit transaction
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-04 03:50:23 UTC (rev 57444)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-04 04:47:17 UTC (rev 57445)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26571
+ FORMAL BUILD NUMBER:26575
*/
-#define PRODUCT_VER_STRING "2.5.3.26571"
-#define FILE_VER_STRING "WI-V2.5.3.26571"
-#define LICENSE_VER_STRING "WI-V2.5.3.26571"
-#define FILE_VER_NUMBER 2, 5, 3, 26571
+#define PRODUCT_VER_STRING "2.5.3.26575"
+#define FILE_VER_STRING "WI-V2.5.3.26575"
+#define LICENSE_VER_STRING "WI-V2.5.3.26575"
+#define FILE_VER_NUMBER 2, 5, 3, 26575
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26571"
+#define FB_BUILD_NO "26575"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-04 03:50:23 UTC (rev 57444)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-04 04:47:17 UTC (rev 57445)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26571
+BuildNum=26575
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-05 04:06:21
|
Revision: 57449
http://firebird.svn.sourceforge.net/firebird/?rev=57449&view=rev
Author: firebirds
Date: 2012-12-05 04:06:14 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-05 03:40:57 UTC (rev 57448)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-05 04:06:14 UTC (rev 57449)
@@ -1,3 +1,9 @@
+ 2012-12-04 10:28 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+Alternative fix for CORE-3034 (Bugche?\209?\129k 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
+
2012-12-03 11:04 dimitr
M src/jrd/btr.cpp
Yet another complementary bugfix for CORE-4004 that avoids an index root page remaining locked after cooperative GC has been terminated by user.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-05 03:40:57 UTC (rev 57448)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-05 04:06:14 UTC (rev 57449)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26575
+ FORMAL BUILD NUMBER:26576
*/
-#define PRODUCT_VER_STRING "2.5.3.26575"
-#define FILE_VER_STRING "WI-V2.5.3.26575"
-#define LICENSE_VER_STRING "WI-V2.5.3.26575"
-#define FILE_VER_NUMBER 2, 5, 3, 26575
+#define PRODUCT_VER_STRING "2.5.3.26576"
+#define FILE_VER_STRING "WI-V2.5.3.26576"
+#define LICENSE_VER_STRING "WI-V2.5.3.26576"
+#define FILE_VER_NUMBER 2, 5, 3, 26576
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26575"
+#define FB_BUILD_NO "26576"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-05 03:40:57 UTC (rev 57448)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-05 04:06:14 UTC (rev 57449)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26575
+BuildNum=26576
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-07 04:14:47
|
Revision: 57458
http://firebird.svn.sourceforge.net/firebird/?rev=57458&view=rev
Author: firebirds
Date: 2012-12-07 04:14:40 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-07 03:44:08 UTC (rev 57457)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-07 04:14:40 UTC (rev 57458)
@@ -1,3 +1,9 @@
+ 2012-12-06 11:43 dimitr
+ M src/jrd/exe.cpp
+ M src/jrd/rse.cpp
+Another bunch of changes for CORE-4004: Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests. The looper nodes should never ignore req_unwind and transform it to something else.
+Review and testing would be appreciated, especially in regard to EXE_assignment.
+
2012-12-04 10:28 hvlad
M src/jrd/cch.cpp
M src/jrd/jrd.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-07 03:44:08 UTC (rev 57457)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-07 04:14:40 UTC (rev 57458)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26576
+ FORMAL BUILD NUMBER:26577
*/
-#define PRODUCT_VER_STRING "2.5.3.26576"
-#define FILE_VER_STRING "WI-V2.5.3.26576"
-#define LICENSE_VER_STRING "WI-V2.5.3.26576"
-#define FILE_VER_NUMBER 2, 5, 3, 26576
+#define PRODUCT_VER_STRING "2.5.3.26577"
+#define FILE_VER_STRING "WI-V2.5.3.26577"
+#define LICENSE_VER_STRING "WI-V2.5.3.26577"
+#define FILE_VER_NUMBER 2, 5, 3, 26577
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26576"
+#define FB_BUILD_NO "26577"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-07 03:44:08 UTC (rev 57457)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-07 04:14:40 UTC (rev 57458)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26576
+BuildNum=26577
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-12 04:09:16
|
Revision: 57471
http://firebird.svn.sourceforge.net/firebird/?rev=57471&view=rev
Author: firebirds
Date: 2012-12-12 04:09:08 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-11 03:39:13 UTC (rev 57470)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-12 04:09:08 UTC (rev 57471)
@@ -1,3 +1,7 @@
+ 2012-12-10 05:10 dimitr
+ M src/jrd/cch.cpp
+Avoid garbage to be written to the shadow's header page. It does not really hurt, but anyway.
+
2012-12-06 11:43 dimitr
M src/jrd/exe.cpp
M src/jrd/rse.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-11 03:39:13 UTC (rev 57470)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-12 04:09:08 UTC (rev 57471)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26577
+ FORMAL BUILD NUMBER:26578
*/
-#define PRODUCT_VER_STRING "2.5.3.26577"
-#define FILE_VER_STRING "WI-V2.5.3.26577"
-#define LICENSE_VER_STRING "WI-V2.5.3.26577"
-#define FILE_VER_NUMBER 2, 5, 3, 26577
+#define PRODUCT_VER_STRING "2.5.3.26578"
+#define FILE_VER_STRING "WI-V2.5.3.26578"
+#define LICENSE_VER_STRING "WI-V2.5.3.26578"
+#define FILE_VER_NUMBER 2, 5, 3, 26578
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26577"
+#define FB_BUILD_NO "26578"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-11 03:39:13 UTC (rev 57470)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-12 04:09:08 UTC (rev 57471)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26577
+BuildNum=26578
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-13 04:09:06
|
Revision: 57477
http://firebird.svn.sourceforge.net/firebird/?rev=57477&view=rev
Author: firebirds
Date: 2012-12-13 04:08:58 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-13 03:39:31 UTC (rev 57476)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-13 04:08:58 UTC (rev 57477)
@@ -1,3 +1,11 @@
+ 2012-12-12 08:31 dimitr
+ M src/jrd/pag.cpp
+Misc.
+
+ 2012-12-12 07:46 dimitr
+ M src/dsql/StmtNodes.cpp
+Yet another complementary bugfix for CORE-4004.
+
2012-12-10 05:10 dimitr
M src/jrd/cch.cpp
Avoid garbage to be written to the shadow's header page. It does not really hurt, but anyway.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-13 03:39:31 UTC (rev 57476)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-13 04:08:58 UTC (rev 57477)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26578
+ FORMAL BUILD NUMBER:26580
*/
-#define PRODUCT_VER_STRING "2.5.3.26578"
-#define FILE_VER_STRING "WI-V2.5.3.26578"
-#define LICENSE_VER_STRING "WI-V2.5.3.26578"
-#define FILE_VER_NUMBER 2, 5, 3, 26578
+#define PRODUCT_VER_STRING "2.5.3.26580"
+#define FILE_VER_STRING "WI-V2.5.3.26580"
+#define LICENSE_VER_STRING "WI-V2.5.3.26580"
+#define FILE_VER_NUMBER 2, 5, 3, 26580
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26578"
+#define FB_BUILD_NO "26580"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-13 03:39:31 UTC (rev 57476)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-13 04:08:58 UTC (rev 57477)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26578
+BuildNum=26580
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-14 04:05:57
|
Revision: 57483
http://firebird.svn.sourceforge.net/firebird/?rev=57483&view=rev
Author: firebirds
Date: 2012-12-14 04:05:50 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-14 03:36:43 UTC (rev 57482)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-14 04:05:50 UTC (rev 57483)
@@ -1,3 +1,9 @@
+ 2012-12-13 18:00 dimitr
+ M src/jrd/exe.cpp
+1) Encapsulated the remaining external looper calls inside a SEH block. It allows to catch async exceptions coming while result set is being fetched. No performance penalty has been noticed.
+2) Slightly refactored the looper call chain to avoid code duplication.
+3) Fixed CORE-4010: Fetch cannot be subsequently interrupted via DELETE FROM MON$STATEMENTS.
+
2012-12-12 08:31 dimitr
M src/jrd/pag.cpp
Misc.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-14 03:36:43 UTC (rev 57482)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-14 04:05:50 UTC (rev 57483)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26580
+ FORMAL BUILD NUMBER:26581
*/
-#define PRODUCT_VER_STRING "2.5.3.26580"
-#define FILE_VER_STRING "WI-V2.5.3.26580"
-#define LICENSE_VER_STRING "WI-V2.5.3.26580"
-#define FILE_VER_NUMBER 2, 5, 3, 26580
+#define PRODUCT_VER_STRING "2.5.3.26581"
+#define FILE_VER_STRING "WI-V2.5.3.26581"
+#define LICENSE_VER_STRING "WI-V2.5.3.26581"
+#define FILE_VER_NUMBER 2, 5, 3, 26581
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26580"
+#define FB_BUILD_NO "26581"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-14 03:36:43 UTC (rev 57482)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-14 04:05:50 UTC (rev 57483)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26580
+BuildNum=26581
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2012-12-14 17:45:50
|
Revision: 57489
http://firebird.svn.sourceforge.net/firebird/?rev=57489&view=rev
Author: alexpeshkoff
Date: 2012-12-14 17:45:38 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Fixed CORE-3935 and CORE-3993
Modified Paths:
--------------
firebird/branches/B2_5_Release/builds/posix/make.shared.variables
firebird/branches/B2_5_Release/src/common/classes/PublicHandle.cpp
firebird/branches/B2_5_Release/src/common/classes/PublicHandle.h
firebird/branches/B2_5_Release/src/common/classes/RefMutex.h
firebird/branches/B2_5_Release/src/common/utils.cpp
firebird/branches/B2_5_Release/src/common/utils_proto.h
firebird/branches/B2_5_Release/src/jrd/Database.cpp
firebird/branches/B2_5_Release/src/jrd/Database.h
firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
firebird/branches/B2_5_Release/src/jrd/cch.cpp
firebird/branches/B2_5_Release/src/jrd/event.cpp
firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
firebird/branches/B2_5_Release/src/jrd/jrd.cpp
firebird/branches/B2_5_Release/src/jrd/jrd.h
firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp
firebird/branches/B2_5_Release/src/jrd/vio.cpp
firebird/branches/B2_5_Release/src/jrd/why.cpp
firebird/branches/B2_5_Release/src/lock/lock.cpp
firebird/branches/B2_5_Release/src/remote/interface.cpp
firebird/branches/B2_5_Release/src/remote/remote.cpp
firebird/branches/B2_5_Release/src/remote/remote.h
firebird/branches/B2_5_Release/src/remote/server.cpp
Modified: firebird/branches/B2_5_Release/builds/posix/make.shared.variables
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/make.shared.variables 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/builds/posix/make.shared.variables 2012-12-14 17:45:38 UTC (rev 57489)
@@ -261,7 +261,8 @@
FBCOMMON_ClientFiles = fb_exception.cpp thd.cpp classes/MetaName.cpp StatusHolder.cpp classes/init.cpp StatusArg.cpp
FBCOMMON_ServerFiles = utils.cpp
-FBCOMMON_ClientObjects = $(addprefix $(OBJ)/common/, $(addsuffix .o, $(basename $(FBCOMMON_ClientFiles))))
+FBCOMMON_ClientObjects = $(addprefix $(OBJ)/common/, $(addsuffix .o, $(basename $(FBCOMMON_ClientFiles)))) \
+ $(addprefix $(OBJ)/jrd/, $(addsuffix .o, $(basename fbsyslog.cpp)))
FBCOMMON_ServerObjects = $(addprefix $(OBJ)/common/, $(addsuffix .o, $(basename $(FBCOMMON_ServerFiles))))
FBCOMMON_Objects = $(FBCOMMON_ClientObjects) $(FBCOMMON_ServerObjects)
@@ -284,7 +285,7 @@
# Platform Manager
# just in case if make.platform defined some files
-OS_SPECIFIC_Files += config_root.cpp path_utils.cpp mod_loader.cpp fbsyslog.cpp guid.cpp os_utils.cpp
+OS_SPECIFIC_Files += config_root.cpp path_utils.cpp mod_loader.cpp guid.cpp os_utils.cpp
OS_SPECIFIC_Sources = $(addprefix jrd/, $(OS_SPECIFIC_Files)) common/dllinst.cpp
ifneq ($(strip @BINRELOC_CFLAGS@),)
Modified: firebird/branches/B2_5_Release/src/common/classes/PublicHandle.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/common/classes/PublicHandle.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/common/classes/PublicHandle.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -21,6 +21,7 @@
*/
#include "firebird.h"
+#include "gen/iberror.h"
#include "../jrd/gdsassert.h"
#include "rwlock.h"
#include "PublicHandle.h"
@@ -31,6 +32,7 @@
GlobalPtr<RWLock> PublicHandle::sync;
PublicHandle::PublicHandle()
+ : RefPtr<ExistenceMutex>(FB_NEW(*getDefaultMemoryPool()) ExistenceMutex)
{
WriteLockGuard guard(sync);
@@ -48,6 +50,8 @@
{
WriteLockGuard guard(sync);
+ mutex()->objectExists = false;
+
size_t pos;
if (handles->find(this, pos))
{
@@ -59,15 +63,82 @@
}
}
- bool PublicHandle::isKnownHandle() const
+ ExistenceMutex* PublicHandle::isKnownHandle() const
{
if (!this)
{
- return false;
+ return NULL;
}
ReadLockGuard guard(sync);
- return handles->exist(this);
+ if (handles->exist(this))
+ {
+ mutex()->addRef();
+ return mutex();
+ }
+
+ return NULL;
}
-} // namespace
+ bool PublicHandle::executeWithLock(ExecuteWithLock* operation)
+ {
+ ReadLockGuard guard(sync);
+ if (handles->exist(this))
+ {
+ operation->execute();
+ return true;
+ }
+ return false;
+ }
+
+ PublicHandleHolder::PublicHandleHolder()
+ : mutex(NULL)
+ { }
+
+ PublicHandleHolder::PublicHandleHolder(PublicHandle* handle, const char* from)
+ : mutex(NULL)
+ {
+ if (!hold(handle, from))
+ {
+ fb_assert(false);
+ (Arg::Gds(isc_random) << "Public object unexpectedly lost").raise();
+ }
+ }
+
+ bool PublicHandleHolder::hold(PublicHandle* handle, const char* from)
+ {
+ mutex = handle->isKnownHandle();
+ if (mutex)
+ {
+ mutex->enter(from);
+ if (mutex->objectExists)
+ {
+ return true;
+ }
+ destroy();
+ mutex = NULL;
+ }
+ return false;
+ }
+
+ PublicHandleHolder::~PublicHandleHolder()
+ {
+ if (mutex)
+ {
+ destroy();
+ }
+ }
+
+ void PublicHandleHolder::destroy()
+ {
+ try
+ {
+ mutex->leave();
+ }
+ catch (const Firebird::Exception&)
+ {
+ DtorException::devHalt();
+ }
+ mutex->release();
+ }
+} // namespace Firebird
Modified: firebird/branches/B2_5_Release/src/common/classes/PublicHandle.h
===================================================================
--- firebird/branches/B2_5_Release/src/common/classes/PublicHandle.h 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/common/classes/PublicHandle.h 2012-12-14 17:45:38 UTC (rev 57489)
@@ -25,24 +25,60 @@
#include "../common/classes/init.h"
#include "../common/classes/array.h"
+#include "../common/classes/RefMutex.h"
namespace Firebird
{
class RWLock;
- class PublicHandle
+ class ExecuteWithLock
{
public:
+ virtual void execute() = 0;
+ };
+
+ class ExistenceMutex : public RefMutex
+ {
+ public:
+ bool objectExists;
+
+ ExistenceMutex()
+ : RefMutex(), objectExists(true)
+ { }
+ };
+
+ class PublicHandle : public RefPtr<ExistenceMutex>
+ {
+ public:
PublicHandle();
~PublicHandle();
- bool isKnownHandle() const;
+ ExistenceMutex* isKnownHandle() const;
+ ExistenceMutex* mutex() const
+ {
+ return (ExistenceMutex*)(*const_cast<PublicHandle*>(this));
+ }
+ bool executeWithLock(ExecuteWithLock* operation);
private:
static GlobalPtr<Array<const void*> > handles;
static GlobalPtr<RWLock> sync;
};
+ class PublicHandleHolder
+ {
+ public:
+ PublicHandleHolder();
+ PublicHandleHolder(PublicHandle*, const char* from);
+ ~PublicHandleHolder();
+
+ bool hold(PublicHandle* handle, const char* from);
+
+ private:
+ ExistenceMutex* mutex;
+ void destroy();
+ };
+
} // namespace
#endif // COMMON_PUBLIC_HANDLE
Modified: firebird/branches/B2_5_Release/src/common/classes/RefMutex.h
===================================================================
--- firebird/branches/B2_5_Release/src/common/classes/RefMutex.h 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/common/classes/RefMutex.h 2012-12-14 17:45:38 UTC (rev 57489)
@@ -46,14 +46,20 @@
RefMutex() {}
explicit RefMutex(MemoryPool& pool) : mutex(pool) {}
- void enter()
+ void enter(const char* f)
{
mutex.enter();
+ setFrom(f);
}
- bool tryEnter()
+ bool tryEnter(const char* f)
{
- return mutex.tryEnter();
+ bool rc = mutex.tryEnter();
+ if (rc)
+ {
+ setFrom(f);
+ }
+ return rc;
}
void leave()
@@ -63,16 +69,27 @@
private:
Mutex mutex;
+#ifdef DEV_BUILD
+ const char* from[8];
+ unsigned frIndex;
+ void setFrom(const char* fr)
+ {
+ frIndex %= FB_NELEM(from);
+ from[frIndex++] = fr;
+ }
+#else
+ void setFrom(const char*) { }
+#endif
};
// RAII holder
class RefMutexGuard : public Reference
{
public:
- explicit RefMutexGuard(RefMutex& alock)
+ RefMutexGuard(RefMutex& alock, const char* f)
: Reference(alock), lock(&alock)
{
- lock->enter();
+ lock->enter(f);
}
~RefMutexGuard()
@@ -102,6 +119,16 @@
{
return object->release();
}
+
+ static void enter(T* object, const char* f)
+ {
+ object->enter(f);
+ }
+
+ static bool tryEnter(T* object, const char* f)
+ {
+ return object->tryEnter(f);
+ }
};
template <typename T>
@@ -117,6 +144,16 @@
{
return 0;
}
+
+ static void enter(T* object, const char*)
+ {
+ object->enter();
+ }
+
+ static bool tryEnter(T* object, const char*)
+ {
+ return object->tryEnter();
+ }
};
template <typename Mtx, typename RefCounted = DefaultRefCounted<Mtx> >
@@ -124,10 +161,9 @@
{
public:
explicit EnsureUnlock(Mtx& mutex)
+ : m_mutex(&mutex), m_locked(0)
{
- m_mutex = &mutex;
RefCounted::addRef(m_mutex);
- m_locked = 0;
}
~EnsureUnlock()
@@ -139,13 +175,13 @@
void enter()
{
- m_mutex->enter();
+ RefCounted::enter(m_mutex, "EnsureUnlock");
m_locked++;
}
bool tryEnter()
{
- if (m_mutex->tryEnter())
+ if (RefCounted::tryEnter(m_mutex, "EnsureUnlock::tryEnter"))
{
m_locked++;
return true;
Modified: firebird/branches/B2_5_Release/src/common/utils.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/common/utils.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/common/utils.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -45,6 +45,7 @@
#include "../common/classes/init.h"
#include "../jrd/constants.h"
#include "../jrd/os/path_utils.h"
+#include "../jrd/os/fbsyslog.h"
#ifdef WIN_NT
#include <direct.h>
@@ -1016,4 +1017,15 @@
return tmp;
}
+void logAndDie(const char* text)
+{
+ gds__log(text);
+ Firebird::Syslog::Record(Firebird::Syslog::Error, text);
+#ifdef WIN_NT
+ exit(3);
+#else
+ abort();
+#endif
+}
+
} // namespace fb_utils
Modified: firebird/branches/B2_5_Release/src/common/utils_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/common/utils_proto.h 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/common/utils_proto.h 2012-12-14 17:45:38 UTC (rev 57489)
@@ -137,6 +137,8 @@
// Add appropriate file prefix.
Firebird::PathName getPrefix(FB_DIR prefType, const char* name);
+ void logAndDie(const char* text);
+
} // namespace fb_utils
#endif // INCLUDE_UTILS_PROTO_H
Modified: firebird/branches/B2_5_Release/src/jrd/Database.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/Database.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/Database.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -91,7 +91,7 @@
delete dbb_monitoring_data;
delete dbb_backup_manager;
- Checkout dcoHolder(this);
+ fb_assert(!locked());
// This line decrements the usage counter and may cause the destructor to be called.
// It should happen with the dbb_sync unlocked.
LockManager::destroy(dbb_lock_mgr);
@@ -102,6 +102,8 @@
{
if (pool)
{
+ fb_assert(locked() || dbb_flags & DBB_not_in_use);
+
size_t pos;
if (dbb_pools.find(pool, pos))
{
Modified: firebird/branches/B2_5_Release/src/jrd/Database.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/Database.h 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/Database.h 2012-12-14 17:45:38 UTC (rev 57489)
@@ -102,7 +102,7 @@
const ULONG DBB_sweep_in_progress = 0x2000L; // A database sweep operation is in progress
const ULONG DBB_security_db = 0x4000L; // ISC security database
const ULONG DBB_suspend_bgio = 0x8000L; // Suspend I/O by background threads
-const ULONG DBB_being_opened = 0x10000L; // database is being attached to
+const ULONG DBB_new = 0x10000L; // Database object is just created
const ULONG DBB_gc_cooperative = 0x20000L; // cooperative garbage collection
const ULONG DBB_gc_background = 0x40000L; // background garbage collection by gc_thread
const ULONG DBB_no_fs_cache = 0x80000L; // Not using file system cache
@@ -129,6 +129,9 @@
{
public:
Sync() : threadId(0), isAst(false)
+#ifdef DEV_BUILD
+ , lockCount(0)
+#endif
{}
void lock(bool ast = false)
@@ -139,6 +142,9 @@
--waiters;
threadId = getThreadId();
isAst = ast;
+#ifdef DEV_BUILD
+ ++lockCount;
+#endif
}
void unlock()
@@ -146,6 +152,10 @@
ThreadPriorityScheduler::exit();
isAst = false;
threadId = 0;
+#ifdef DEV_BUILD
+ fb_assert(lockCount > 0);
+ --lockCount;
+#endif
syncMutex.leave();
}
@@ -154,6 +164,17 @@
return (waiters.value() > 0);
}
+#ifdef DEV_BUILD
+ bool locked() const
+ {
+ if (!syncMutex.tryEnter())
+ return false;
+ bool rc = lockCount > 0;
+ syncMutex.leave();
+ return rc;
+ }
+#endif
+
private:
~Sync()
{
@@ -167,10 +188,16 @@
Sync(const Sync&);
Sync& operator=(const Sync&);
- Firebird::Mutex syncMutex;
+#ifdef DEV_BUILD
+ mutable
+#endif
+ Firebird::Mutex syncMutex;
Firebird::AtomicCounter waiters;
FB_THREAD_ID threadId;
bool isAst;
+#ifdef DEV_BUILD
+ int lockCount;
+#endif
};
public:
@@ -357,6 +384,7 @@
{
return false;
}
+ mutex()->release();
return TypedHandle<type_dbb>::checkHandle();
}
@@ -486,6 +514,9 @@
MemoryPool* createPool()
{
MemoryPool* const pool = MemoryPool::createPool(dbb_permanent, dbb_memory_stats);
+
+ fb_assert(locked() || dbb_flags & DBB_new);
+
dbb_pools.add(pool);
return pool;
}
@@ -539,6 +570,13 @@
return dbb_shared_counter.generate(tdbb, SharedCounter::STATEMENT_ID_SPACE);
}
+#ifdef DEV_BUILD
+ bool locked() const
+ {
+ return dbb_sync->locked();
+ }
+#endif
+
private:
// The delete operators are no-oped because the Database memory is allocated from the
Modified: firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -288,10 +288,7 @@
TEXT msg[BUFFER_TINY];
sprintf(msg, "MONITOR: mutex %s error, status = %d", string, state);
- gds__log(msg);
-
- //fprintf(stderr, "%s\n", msg);
- exit(FINI_ERROR);
+ fb_utils::logAndDie(msg);
}
}
Modified: firebird/branches/B2_5_Release/src/jrd/cch.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/cch.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/cch.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -439,9 +439,12 @@
if (lock->lck_physical == LCK_EX) {
LCK_convert(tdbb, lock, LCK_PW, LCK_WAIT); // This lets waiting cache manager in first
}
- else {
+ else if (lock->lck_physical == LCK_PW) {
LCK_convert(tdbb, lock, LCK_SW, LCK_WAIT);
}
+ else {
+ fb_assert(lock->lck_physical == 0);
+ }
dbb->dbb_ast_flags &= ~DBB_blocking;
}
@@ -631,7 +634,7 @@
THREAD_SLEEP(CCH_EXCLUSIVE_RETRY_INTERVAL * 1000);
}
- if (tdbb->getAttachment()->att_flags & ATT_cancel_raise)
+ if (tdbb->getAttachment()->cancelRaise())
{
if (JRD_reschedule(tdbb, 0, false))
{
@@ -4023,6 +4026,8 @@
Attachment* const attachment = Attachment::create(dbb);
tdbb->setAttachment(attachment);
attachment->att_filename = dbb->dbb_filename;
+
+ PublicHandleHolder attHolder(attachment, "cache_reader()");
Jrd::ContextPoolHolder context(tdbb, dbb->dbb_bufferpool);
// This try block is specifically to protect the LCK_init call: if
@@ -4185,6 +4190,7 @@
Attachment* const attachment = Attachment::create(dbb);
tdbb->setAttachment(attachment);
attachment->att_filename = dbb->dbb_filename;
+ PublicHandleHolder attHolder(attachment, "cache_writer()");
Jrd::ContextPoolHolder context(tdbb, dbb->dbb_bufferpool);
// This try block is specifically to protect the LCK_init call: if
Modified: firebird/branches/B2_5_Release/src/jrd/event.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/event.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/event.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -598,8 +598,7 @@
if (!header)
{
release_shmem();
- gds__log("Event table remap failed");
- exit(FINI_ERROR);
+ fb_utils::logAndDie("Event table remap failed");
}
m_header = header;
@@ -671,8 +670,7 @@
if (!best)
{
release_shmem();
- gds__log("Event table space exhausted");
- exit(FINI_ERROR);
+ fb_utils::logAndDie("Event table space exhausted");
}
free = (frb*) SRQ_ABS_PTR(*best);
@@ -1244,10 +1242,7 @@
TEXT msg[BUFFER_TINY];
sprintf(msg, "EVENT: %s error, status = %d", string, mutex_state);
- gds__log(msg);
-
- fprintf(stderr, "%s\n", msg);
- exit(FINI_ERROR);
+ fb_utils::logAndDie(msg);
}
Modified: firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -70,7 +70,6 @@
#include "../common/config/config.h"
#include "../common/utils_proto.h"
#include "../common/StatusArg.h"
-#include "../common/classes/RefMutex.h"
static int process_id;
Modified: firebird/branches/B2_5_Release/src/jrd/jrd.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/jrd.cpp 2012-12-14 17:40:09 UTC (rev 57488)
+++ firebird/branches/B2_5_Release/src/jrd/jrd.cpp 2012-12-14 17:45:38 UTC (rev 57489)
@@ -125,7 +125,6 @@
#include "../jrd/IntlManager.h"
#include "../common/classes/fb_tls.h"
#include "../common/classes/ClumpletReader.h"
-#include "../common/classes/RefMutex.h"
#include "../common/utils_proto.h"
#include "../jrd/DebugInterface.h"
@@ -148,10 +147,33 @@
namespace
{
+ // This mutex is set when new Database block is created. It's global first of all to satisfy
+ // SS requirement - avoid 2 Database blocks for same database (file). Also guarantees no
+ // half-done Database block in databases linked list. Always taken before databases_mutex.
+ GlobalPtr<Mutex> db_init_mutex;
+
Database* databases = NULL;
+ bool engineShuttingDown = false;
+ // This mutex protects both linked list of databases and flag engineShuttingDown.
+ // Flag engineShuttingDown guarantees that no new attachment is created after setting it.
GlobalPtr<Mutex> databases_mutex;
- bool engineShuttingDown = false;
+ // We have 2 more related types of mutexes in database and attachment.
+ // Attachment is using reference counted mutex in PublicHandle, also making it possible
+ // to check does object still exist after locking a mutex. This makes great use when
+ // checking for correctness of attachment handle in jrd8* entrypoints. Attachment mutex
+ // is always taken before databases_mutex (but after db_init_mutex when new attachment
+ // is created). Attachment mutex is never released inside engine. Database mutex (dbb_sync)
+ // is taken when engine starts to work with some database and released when there is no
+ // active job (when waiting for something) or when rescheduling. No other mutex from above
+ // mentioned here can be taken after dbb_sync with an exception of attachment mutex for new
+ // attachment. So finally the order of taking mutexes is:
+ // 1. db_init_mutex (in attach/create database) or attachment mutex in other calls
+ // 2. databases_mutex (when / if needed)
+ // 3. dbb_sync
+ // 4. only for new attachments: attachment mutex
+ // Any of this may be missing when not needed, but order of taking should not be changed.
+
class EngineStartup
{
public:
@@ -168,106 +190,123 @@
InitMutex<EngineStartup> engineStartup;
- inline void validateHandle(thread_db* tdbb, Attachment* const attachment)
+ inline void validateHandle(Service* service)
{
- if (attachment && attachment == tdbb->getAttachment())
+ if (service && service->checkHandle())
return;
- if (!attachment->checkHandle() || !attachment->att_database->checkHandle())
+ status_exception::raise(Arg::Gds(isc_bad_svc_handle));
+ }
+
+ class AttachmentHolder : public PublicHandleHolder
+ {
+ public:
+ AttachmentHolder(Attachment* const attachment, const char* from)
{
- status_exception::raise(Arg::Gds(isc_bad_db_handle));
+ if (!hold(attachment, from))
+ Arg::Gds(isc_bad_db_handle).raise();
}
- tdbb->setAttachment(attachment);
- tdbb->setDatabase(attachment->att_database);
- }
+ AttachmentHolder(thread_db* tdbb, Attachment* const attachment, const char* from)
+ {
+ validateHandle(tdbb, attachment, from);
+ }
- inline void validateHandle(thread_db* tdbb, jrd_tra* const transaction)
- {
- if (!transaction->checkHandle())
- status_exception::raise(Arg::Gds(isc_bad_trans_handle));
+ AttachmentHolder(thread_db* tdbb, jrd_tra* const transaction, const char* from)
+ {
+ validateHandle(tdbb, transaction, from);
+ }
- validateHandle(tdbb, transaction->tra_attachment);
+ AttachmentHolder(thread_db* tdbb, jrd_req* const request, const char* from)
+ {
+ validateHandle(tdbb, request, from);
+ }
- tdbb->setTransaction(transaction);
- }
+ AttachmentHolder(thread_db* tdbb, dsql_req* const statement, const char* from)
+ {
+ validateHandle(tdbb, statement, from);
+ }
- inline void validateHandle(thread_db* tdbb, jrd_req* const request)
- {
- if (!request->checkHandle())
- status_exception::raise(Arg::Gds(isc_bad_req_handle));
+ AttachmentHolder(thread_db* tdbb, blb* blob, const char* from)
+ {
+ validateHandle(tdbb, blob, from);
+ }
- validateHandle(tdbb, request->req_attachment);
- }
+ private:
+ thread_db* tdbb;
- inline void validateHandle(thread_db* tdbb, dsql_req* const statement)
- {
- if (!statement->checkHandle())
- status_exception::raise(Arg::Gds(isc_bad_req_handle));
+ private:
+ inline void validateHandle(thread_db* tdbb, Attachment* const attachment, const char* from)
+ {
+ if (attachment && attachment == tdbb->getAttachment())
+ return;
- validateHandle(tdbb, statement->req_dbb->dbb_attachment);
- }
+ if (attachment)
+ {
+ if (engineShuttingDown) // this is optimization check, engineShuttingDown
+ { // does not guarantee threads not to enter engine
+ status_exception::raise(Arg::Gds(isc_att_shutdown));
+ }
+ }
- inline void validateHandle(thread_db* tdbb, blb* blob)
- {
- if (!blob->checkHandle())
- status_exception::raise(Arg::Gds(isc_bad_segstr_handle));
+ if (!hold(attachment, from) || !attachment->checkHandle() || !attachment->att_database->checkHandle())
+ {
+ status_exception::raise(Arg::Gds(isc_bad_db_handle));
+ }
- validateHandle(tdbb, blob->blb_transaction);
- validateHandle(tdbb, blob->blb_attachment);
- }
+ tdbb->setAttachment(attachment);
+ tdbb->setDatabase(attachment->att_database);
+ }
- inline void validateHandle(Service* service)
- {
- if (service && service->checkHandle())
- return;
+public:
+ inline void validateHandle(thread_db* tdbb, jrd_tra* const transaction, const char* from)
+ {
+ if (!transaction->checkHandle())
+ status_exception::raise(Arg::Gds(isc_bad_trans_handle));
- status_exception::raise(Arg::Gds(isc_bad_svc_handle));
- }
+ validateHandle(tdbb, transaction->tra_attachment, from);
- class AttachmentHolder
- {
- public:
- AttachmentHolder(thread_db* arg, bool lockAtt)
- : tdbb(arg)
+ tdbb->setTransaction(transaction);
+ }
+
+private:
+ inline void validateHandle(thread_db* tdbb, jrd_req* const request, const char* from)
{
- Attachment* attachment = tdbb->getAttachment();
- if (lockAtt && attachment)
- {
- if (engineShuttingDown)
- status_exception::raise(Arg::Gds(isc_att_shutdown));
+ if (!request->checkHandle())
+ status_exception::raise(Arg::Gds(isc_bad_req_handle));
- attachment->att_mutex.enter();
- attLocked = true;
- }
- else
- attLocked = false;
+ validateHandle(tdbb, request->req_attachment, from);
}
- ~AttachmentHolder()
+ inline void validateHandle(thread_db* tdbb, dsql_req* const statement, const char* from)
{
- Attachment* attachment = tdbb->getAttachment();
- if (attLocked && attachment)
- attachment->att_mutex.leave();
+ if (!statement->checkHandle())
+ status_exception::raise(Arg::Gds(isc_bad_req_handle));
+
+ validateHandle(tdbb, statement->req_dbb->dbb_attachment, from);
}
- private:
- thread_db* tdbb;
- bool attLocked;
+ inline void validateHandle(thread_db* tdbb, blb* blob, const char* from)
+ {
+ if (!blob->checkHandle())
+ status_exception::raise(Arg::Gds(isc_bad_segstr_handle));
+ validateHandle(tdbb, blob->blb_transaction, from);
+ validateHandle(tdbb, blob->blb_attachment, from);
+ }
+
private:
// copying is prohibited
AttachmentHolder(const AttachmentHolder&);
AttachmentHolder& operator =(const AttachmentHolder&);
};
- class DatabaseContextHolder : public AttachmentHolder, Database::SyncGuard,
+ class DatabaseContextHolder : public Database::SyncGuard,
public Jrd::ContextPoolHolder
{
public:
- explicit DatabaseContextHolder(thread_db* arg, bool lockAtt = true)
- : AttachmentHolder(arg, lockAtt),
- Database::SyncGuard(arg->getDatabase()),
+ explicit DatabaseContextHolder(thread_db* arg)
+ : Database::SyncGuard(arg->getDatabase()),
Jrd::ContextPoolHolder(arg, arg->getDatabase()->dbb_permanent),
tdbb(arg)
{
@@ -515,8 +554,11 @@
const DatabaseOptions* m_options;
};
-static void cancel_attachments();
-static void check_database(thread_db* tdbb);
+namespace {
+ const unsigned CHECK_ASYNC = 1;
+ const unsigned CHECK_DISCONNECT = 2;
+}
+static void check_database(thread_db* tdbb, unsigned flags = 0);
static void check_transaction(thread_db*, jrd_tra*);
static void commit(thread_db*, jrd_tra*, const bool);
static bool drop_files(const jrd_file*);
@@ -541,72 +583,21 @@
static void ExtractDriveLetter(const TEXT*, ULONG*);
#endif
-static Database* init(thread_db*, const PathName&, bool);
+static void init(thread_db*, const PathName&, const PathName&, bool, const DatabaseOptions&);
+static Attachment* create_attachment(const PathName&, Database*, const DatabaseOptions&);
static void prepare(thread_db*, jrd_tra*, USHORT, const UCHAR*);
static void release_attachment(thread_db*, Attachment*);
static void detachLocksFromAttachment(Attachment*);
static void rollback(thread_db*, jrd_tra*, const bool);
static void shutdown_database(Database*, const bool);
+static bool unlink_database(Database*);
static void strip_quotes(string&);
static void purge_attachment(thread_db*, Attachment*, const bool);
static void getUserInfo(UserId&, const DatabaseOptions&);
-static bool shutdown_dbb(thread_db*, Database*);
static THREAD_ENTRY_DECLARE shutdown_thread(THREAD_ENTRY_PARAM);
-static void cancel_attachments()
-{
- MutexLockGuard guard(databases_mutex);
- engineShuttingDown = true;
-
- for (Database* dbb = databases; dbb; dbb = dbb->dbb_next)
- {
- if ( !(dbb->dbb_flags & (DBB_bugcheck | DBB_not_in_use | DBB_security_db)) )
- {
- Database::SyncGuard dsGuard(dbb);
- Attachment* lockedAtt = NULL;
- Attachment* att = dbb->dbb_attachments;
-
- while (att)
- {
- // Try to cancel attachment and lock it. Handle case when attachment
- // deleted while waiting for lock.
- while (true)
- {
- if (att->att_mutex.tryEnter() || (att->att_flags & ATT_purge_error))
- {
- lockedAtt = att;
- break;
- }
-
- {
- const bool cancel_disable = (att->att_flags & ATT_cancel_disable);
- Database::Checkout dcoHolder(dbb);
- if (!cancel_disable)
- {
- ISC_STATUS_ARRAY status;
- jrd8_cancel_operation(status, &att, fb_cancel_enable);
- jrd8_cancel_operation(status, &att, fb_cancel_raise);
- }
- THREAD_SLEEP(10);
- }
-
- // check if attachment still exist
- if (lockedAtt && lockedAtt->att_next != att) {
- break;
- }
- if (dbb->dbb_attachments != att) {
- break;
- }
- }
- att = lockedAtt ? lockedAtt->att_next : dbb->dbb_attachments;
- }
- }
- }
-}
-
-
//____________________________________________________________
//
// check whether we need to perform an autocommit;
@@ -832,7 +823,12 @@
bool invalid_client_SQL_dialect = false;
PathName file_name, expanded_name;
bool is_alias = false;
+ MutexEnsureUnlock guardDbInit(db_init_mutex);
+#ifdef WIN_NT
+ guardDbInit.enter(); // Required to correctly expand name of just created database
+#endif
+
try
{
// Process database parameter block
@@ -905,49 +901,47 @@
}
Database* dbb = NULL;
- MutexEnsureUnlock guardDatabases(databases_mutex);
- guardDatabases.enter();
+ Attachment* attachment = NULL;
+ // Initialize special error handling
+
try
{
- // Unless we're already attached, do some initialization
- dbb = init(tdbb, expanded_name, true);
- }
- catch (const Exception& ex)
+ // If database to be opened is security database, then only
+ // gsec or SecurityDatabase may open it. This protects from use
+ // of old gsec to write wrong password hashes into it. */
+ if (vdn == VDN_SECURITY && !options.dpb_gsec_attach && !options.dpb_sec_attach)
{
- return ex.stuff_exception(user_status);
+ ERR_post(Arg::Gds(isc_no_priv) << Arg::Str("direct") <<
+ Arg::Str("security database") <<
+ Arg::Str(file_name));
}
+#ifndef WIN_NT
+ guardDbInit.enter();
+#endif
+
+ // Unless we're already attached, do some initialization
+ init(tdbb, expanded_name, is_alias ? file_name : expanded_name, true, options);
+ dbb = tdbb->getDatabase();
fb_assert(dbb);
+ attachment = tdbb->getAttachment();
+ fb_assert(attachment);
- tdbb->setDatabase(dbb);
DatabaseContextHolder dbbHolder(tdbb);
- dbb->dbb_flags |= DBB_being_opened;
-
- // Initialize special error handling
-
- Attachment* attachment = NULL;
-
- bool initing_security = false;
-
- try {
-
-/* If database to be op...
[truncated message content] |
|
From: <fir...@us...> - 2012-12-15 04:00:59
|
Revision: 57492
http://firebird.svn.sourceforge.net/firebird/?rev=57492&view=rev
Author: firebirds
Date: 2012-12-15 04:00:52 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-15 03:44:27 UTC (rev 57491)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-15 04:00:52 UTC (rev 57492)
@@ -1,3 +1,37 @@
+ 2012-12-14 17:45 alexpeshkoff
+ M builds/posix/make.shared.variables
+ M src/common/classes/PublicHandle.cpp
+ M src/common/classes/PublicHandle.h
+ M src/common/classes/RefMutex.h
+ M src/common/utils.cpp
+ M src/common/utils_proto.h
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/event.cpp
+ M src/jrd/isc_sync.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceLog.cpp
+ M src/jrd/vio.cpp
+ M src/jrd/why.cpp
+ M src/lock/lock.cpp
+ M src/remote/interface.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server.cpp
+Fixed CORE-3935 and CORE-3993
+
+ 2012-12-14 17:40 alexpeshkoff
+ M configure.in
+Try to make Darwin port happy
+
+ 2012-12-14 10:08 makowski
+ M builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in
+Fixed CORE-4011: /etc/init.d/ script for Mageia and RedHat RH #886578
+
2012-12-13 18:00 dimitr
M src/jrd/exe.cpp
1) Encapsulated the remaining external looper calls inside a SEH block. It allows to catch async exceptions coming while result set is being fetched. No performance penalty has been noticed.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-15 03:44:27 UTC (rev 57491)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-15 04:00:52 UTC (rev 57492)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26581
+ FORMAL BUILD NUMBER:26584
*/
-#define PRODUCT_VER_STRING "2.5.3.26581"
-#define FILE_VER_STRING "WI-V2.5.3.26581"
-#define LICENSE_VER_STRING "WI-V2.5.3.26581"
-#define FILE_VER_NUMBER 2, 5, 3, 26581
+#define PRODUCT_VER_STRING "2.5.3.26584"
+#define FILE_VER_STRING "WI-V2.5.3.26584"
+#define LICENSE_VER_STRING "WI-V2.5.3.26584"
+#define FILE_VER_NUMBER 2, 5, 3, 26584
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26581"
+#define FB_BUILD_NO "26584"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-15 03:44:27 UTC (rev 57491)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-15 04:00:52 UTC (rev 57492)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26581
+BuildNum=26584
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-19 09:24:21
|
Revision: 57506
http://sourceforge.net/p/firebird/code/57506
Author: firebirds
Date: 2012-12-19 09:24:18 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-19 08:25:58 UTC (rev 57505)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-19 09:24:18 UTC (rev 57506)
@@ -1,3 +1,15 @@
+ 2012-12-18 19:35 dimitr
+ M src/jrd/cch.cpp
+Slightly refactored the error handling.
+
+ 2012-12-18 13:30 dimitr
+ M src/jrd/exe.cpp
+Attempted to fix the user savepoint logic I've accidentally broken in a recent commit.
+
+ 2012-12-18 11:20 dimitr
+ M src/lock/lock.cpp
+Fixed the Windows build.
+
2012-12-14 17:45 alexpeshkoff
M builds/posix/make.shared.variables
M src/common/classes/PublicHandle.cpp
@@ -60,7 +72,7 @@
M src/jrd/cch.cpp
M src/jrd/jrd.cpp
M src/jrd/jrd.h
-Alternative fix for CORE-3034 (Bugche?\209?\129k 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
+Alternative fix for CORE-3034 (Bugcheсk 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
2012-12-03 11:04 dimitr
M src/jrd/btr.cpp
@@ -802,7 +814,7 @@
M src/qli/dtr.cpp
M src/qli/dtr.h
M src/qli/meta.epp
-Stop db triggers in qli, from Herr Schlottmann-G?\195?\182dde
+Stop db triggers in qli, from Herr Schlottmann-Gödde
2012-01-18 12:05 alexpeshkoff
M src/burp/restore.epp
@@ -20639,7 +20651,7 @@
2008-11-29 18:47 asfernandes
M src/jrd/DataTypeUtil.cpp
M src/jrd/DataTypeUtil.h
-Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation).
+Fixed CORE-2019 – UTF-8 conversion error (string truncation).
2008-11-28 18:49 alexpeshkoff
M src/common/classes/SafeArg.cpp
@@ -22991,7 +23003,7 @@
2008-07-16 14:16 asfernandes
M src/jrd/idx.cpp
-Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint
+Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint
2008-07-16 13:55 asfernandes
M src/jrd/Optimizer.cpp
@@ -23999,7 +24011,7 @@
2008-06-14 02:17 asfernandes
M doc/sql.extensions/README.similar_to.txt
M src/jrd/SimilarToMatcher.h
-1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized.
+1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized.
2) Improve the documentation after some questions from Claudio.
2008-06-13 14:01 dimitr
@@ -36267,7 +36279,7 @@
2007-05-09 15:23 asfernandes
M doc/sql.extensions/README.list
-Updated LIST documentation - thanks to Maycon Ferra?\195?\167a
+Updated LIST documentation - thanks to Maycon Ferraça
2007-05-09 02:03 asfernandes
M src/burp/burp.cpp
@@ -38218,7 +38230,7 @@
2007-03-22 13:07 asfernandes
M doc/sql.extensions/README.context_variables2
-Document the new context variable - thanks to Maicon Ferra?\195?\167a
+Document the new context variable - thanks to Maicon Ferraça
2007-03-22 12:53 dimitr
M src/dsql/pass1.cpp
@@ -39895,7 +39907,7 @@
2006-12-14 10:30 asfernandes
M doc/sql.extensions/README.returning
-Correction - thanks to Maycon Ferra?\195?\167a
+Correction - thanks to Maycon Ferraça
2006-12-14 09:14 dimitr
A doc/README.monitoring_tables
@@ -41339,7 +41351,7 @@
2006-10-10 03:53 asfernandes
M src/jrd/jrd.cpp
-Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling
+Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling
2006-10-10 03:39 asfernandes
M src/jrd/os/posix/isc_ipc.cpp
@@ -41688,7 +41700,7 @@
2006-09-13 12:59 asfernandes
M src/dsql/pass1.cpp
-Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel
+Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel
2006-09-12 16:31 asfernandes
M src/jrd/opt.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-19 08:25:58 UTC (rev 57505)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-19 09:24:18 UTC (rev 57506)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26584
+ FORMAL BUILD NUMBER:26587
*/
-#define PRODUCT_VER_STRING "2.5.3.26584"
-#define FILE_VER_STRING "WI-V2.5.3.26584"
-#define LICENSE_VER_STRING "WI-V2.5.3.26584"
-#define FILE_VER_NUMBER 2, 5, 3, 26584
+#define PRODUCT_VER_STRING "2.5.3.26587"
+#define FILE_VER_STRING "WI-V2.5.3.26587"
+#define LICENSE_VER_STRING "WI-V2.5.3.26587"
+#define FILE_VER_NUMBER 2, 5, 3, 26587
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26584"
+#define FB_BUILD_NO "26587"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-19 08:25:58 UTC (rev 57505)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-19 09:24:18 UTC (rev 57506)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26584
+BuildNum=26587
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-21 03:51:42
|
Revision: 57519
http://sourceforge.net/p/firebird/code/57519
Author: firebirds
Date: 2012-12-21 03:51:39 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-21 03:24:35 UTC (rev 57518)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-21 03:51:39 UTC (rev 57519)
@@ -1,3 +1,7 @@
+ 2012-12-20 15:28 alexpeshkoff
+ M src/burp/burp.cpp
+Backported fix for CORE-3995: Slight problem with GBAK parameter checking
+
2012-12-18 19:35 dimitr
M src/jrd/cch.cpp
Slightly refactored the error handling.
@@ -72,7 +76,7 @@
M src/jrd/cch.cpp
M src/jrd/jrd.cpp
M src/jrd/jrd.h
-Alternative fix for CORE-3034 (Bugche?\209?\129k 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
+Alternative fix for CORE-3034 (Bugcheсk 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)
2012-12-03 11:04 dimitr
M src/jrd/btr.cpp
@@ -814,7 +818,7 @@
M src/qli/dtr.cpp
M src/qli/dtr.h
M src/qli/meta.epp
-Stop db triggers in qli, from Herr Schlottmann-G?\195?\182dde
+Stop db triggers in qli, from Herr Schlottmann-Gödde
2012-01-18 12:05 alexpeshkoff
M src/burp/restore.epp
@@ -20651,7 +20655,7 @@
2008-11-29 18:47 asfernandes
M src/jrd/DataTypeUtil.cpp
M src/jrd/DataTypeUtil.h
-Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation).
+Fixed CORE-2019 – UTF-8 conversion error (string truncation).
2008-11-28 18:49 alexpeshkoff
M src/common/classes/SafeArg.cpp
@@ -23003,7 +23007,7 @@
2008-07-16 14:16 asfernandes
M src/jrd/idx.cpp
-Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint
+Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint
2008-07-16 13:55 asfernandes
M src/jrd/Optimizer.cpp
@@ -24011,7 +24015,7 @@
2008-06-14 02:17 asfernandes
M doc/sql.extensions/README.similar_to.txt
M src/jrd/SimilarToMatcher.h
-1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized.
+1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized.
2) Improve the documentation after some questions from Claudio.
2008-06-13 14:01 dimitr
@@ -36279,7 +36283,7 @@
2007-05-09 15:23 asfernandes
M doc/sql.extensions/README.list
-Updated LIST documentation - thanks to Maycon Ferra?\195?\167a
+Updated LIST documentation - thanks to Maycon Ferraça
2007-05-09 02:03 asfernandes
M src/burp/burp.cpp
@@ -38230,7 +38234,7 @@
2007-03-22 13:07 asfernandes
M doc/sql.extensions/README.context_variables2
-Document the new context variable - thanks to Maicon Ferra?\195?\167a
+Document the new context variable - thanks to Maicon Ferraça
2007-03-22 12:53 dimitr
M src/dsql/pass1.cpp
@@ -39907,7 +39911,7 @@
2006-12-14 10:30 asfernandes
M doc/sql.extensions/README.returning
-Correction - thanks to Maycon Ferra?\195?\167a
+Correction - thanks to Maycon Ferraça
2006-12-14 09:14 dimitr
A doc/README.monitoring_tables
@@ -41351,7 +41355,7 @@
2006-10-10 03:53 asfernandes
M src/jrd/jrd.cpp
-Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling
+Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling
2006-10-10 03:39 asfernandes
M src/jrd/os/posix/isc_ipc.cpp
@@ -41700,7 +41704,7 @@
2006-09-13 12:59 asfernandes
M src/dsql/pass1.cpp
-Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel
+Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel
2006-09-12 16:31 asfernandes
M src/jrd/opt.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-21 03:24:35 UTC (rev 57518)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-21 03:51:39 UTC (rev 57519)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26587
+ FORMAL BUILD NUMBER:26588
*/
-#define PRODUCT_VER_STRING "2.5.3.26587"
-#define FILE_VER_STRING "WI-V2.5.3.26587"
-#define LICENSE_VER_STRING "WI-V2.5.3.26587"
-#define FILE_VER_NUMBER 2, 5, 3, 26587
+#define PRODUCT_VER_STRING "2.5.3.26588"
+#define FILE_VER_STRING "WI-V2.5.3.26588"
+#define LICENSE_VER_STRING "WI-V2.5.3.26588"
+#define FILE_VER_NUMBER 2, 5, 3, 26588
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26587"
+#define FB_BUILD_NO "26588"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-21 03:24:35 UTC (rev 57518)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-21 03:51:39 UTC (rev 57519)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26587
+BuildNum=26588
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-24 03:34:03
|
Revision: 57538
http://sourceforge.net/p/firebird/code/57538
Author: firebirds
Date: 2012-12-24 03:34:01 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-24 03:23:20 UTC (rev 57537)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-24 03:34:01 UTC (rev 57538)
@@ -1,3 +1,7 @@
+ 2012-12-23 06:52 dimitr
+ M src/jrd/jrd.cpp
+Corrected the check_database() logic.
+
2012-12-22 16:56 dimitr
M src/jrd/VirtualTable.cpp
M src/jrd/exe.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-24 03:23:20 UTC (rev 57537)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-24 03:34:01 UTC (rev 57538)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26592
+ FORMAL BUILD NUMBER:26593
*/
-#define PRODUCT_VER_STRING "2.5.3.26592"
-#define FILE_VER_STRING "WI-V2.5.3.26592"
-#define LICENSE_VER_STRING "WI-V2.5.3.26592"
-#define FILE_VER_NUMBER 2, 5, 3, 26592
+#define PRODUCT_VER_STRING "2.5.3.26593"
+#define FILE_VER_STRING "WI-V2.5.3.26593"
+#define LICENSE_VER_STRING "WI-V2.5.3.26593"
+#define FILE_VER_NUMBER 2, 5, 3, 26593
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26592"
+#define FB_BUILD_NO "26593"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-24 03:23:20 UTC (rev 57537)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-24 03:34:01 UTC (rev 57538)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26592
+BuildNum=26593
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-25 03:34:44
|
Revision: 57548
http://sourceforge.net/p/firebird/code/57548
Author: firebirds
Date: 2012-12-25 03:34:40 +0000 (Tue, 25 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-24 16:02:36 UTC (rev 57547)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-25 03:34:40 UTC (rev 57548)
@@ -1,3 +1,8 @@
+ 2012-12-24 14:26 dimitr
+ M src/common/classes/PublicHandle.cpp
+ M src/common/classes/PublicHandle.h
+Favor quick search over quick add/remove. This is more important in our code, especially in the debug build.
+
2012-12-23 06:52 dimitr
M src/jrd/jrd.cpp
Corrected the check_database() logic.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-24 16:02:36 UTC (rev 57547)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-25 03:34:40 UTC (rev 57548)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26593
+ FORMAL BUILD NUMBER:26594
*/
-#define PRODUCT_VER_STRING "2.5.3.26593"
-#define FILE_VER_STRING "WI-V2.5.3.26593"
-#define LICENSE_VER_STRING "WI-V2.5.3.26593"
-#define FILE_VER_NUMBER 2, 5, 3, 26593
+#define PRODUCT_VER_STRING "2.5.3.26594"
+#define FILE_VER_STRING "WI-V2.5.3.26594"
+#define LICENSE_VER_STRING "WI-V2.5.3.26594"
+#define FILE_VER_NUMBER 2, 5, 3, 26594
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26593"
+#define FB_BUILD_NO "26594"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-24 16:02:36 UTC (rev 57547)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-25 03:34:40 UTC (rev 57548)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26593
+BuildNum=26594
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-27 04:05:55
|
Revision: 57553
http://sourceforge.net/p/firebird/code/57553
Author: firebirds
Date: 2012-12-27 04:05:51 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-26 10:27:30 UTC (rev 57552)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-27 04:05:51 UTC (rev 57553)
@@ -1,3 +1,11 @@
+ 2012-12-26 10:27 dimitr
+ M src/jrd/exe.cpp
+Easy fix for the crash reported by Alex privately. More generic solution is desirable.
+
+ 2012-12-26 08:02 alexpeshkoff
+ M builds/make.new/config/install-sh
+Script update from new autotools version
+
2012-12-24 14:26 dimitr
M src/common/classes/PublicHandle.cpp
M src/common/classes/PublicHandle.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-26 10:27:30 UTC (rev 57552)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-27 04:05:51 UTC (rev 57553)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26594
+ FORMAL BUILD NUMBER:26596
*/
-#define PRODUCT_VER_STRING "2.5.3.26594"
-#define FILE_VER_STRING "WI-V2.5.3.26594"
-#define LICENSE_VER_STRING "WI-V2.5.3.26594"
-#define FILE_VER_NUMBER 2, 5, 3, 26594
+#define PRODUCT_VER_STRING "2.5.3.26596"
+#define FILE_VER_STRING "WI-V2.5.3.26596"
+#define LICENSE_VER_STRING "WI-V2.5.3.26596"
+#define FILE_VER_NUMBER 2, 5, 3, 26596
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26594"
+#define FB_BUILD_NO "26596"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-26 10:27:30 UTC (rev 57552)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-27 04:05:51 UTC (rev 57553)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26594
+BuildNum=26596
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-28 03:37:47
|
Revision: 57556
http://sourceforge.net/p/firebird/code/57556
Author: firebirds
Date: 2012-12-28 03:37:44 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-27 20:04:22 UTC (rev 57555)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-28 03:37:44 UTC (rev 57556)
@@ -1,3 +1,18 @@
+ 2012-12-27 13:26 alexpeshkoff
+ M src/common/classes/PublicHandle.h
+ M src/jrd/Database.cpp
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/GlobalRWLock.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/idx.cpp
+ M src/jrd/intl.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/met.epp
+ M src/jrd/pag.cpp
+ M src/jrd/sdw.cpp
+Fixed CORE-3944: SuperClassic crashes when running script that delete attachments and move database to offline
+
2012-12-26 10:27 dimitr
M src/jrd/exe.cpp
Easy fix for the crash reported by Alex privately. More generic solution is desirable.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-27 20:04:22 UTC (rev 57555)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-28 03:37:44 UTC (rev 57556)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26596
+ FORMAL BUILD NUMBER:26597
*/
-#define PRODUCT_VER_STRING "2.5.3.26596"
-#define FILE_VER_STRING "WI-V2.5.3.26596"
-#define LICENSE_VER_STRING "WI-V2.5.3.26596"
-#define FILE_VER_NUMBER 2, 5, 3, 26596
+#define PRODUCT_VER_STRING "2.5.3.26597"
+#define FILE_VER_STRING "WI-V2.5.3.26597"
+#define LICENSE_VER_STRING "WI-V2.5.3.26597"
+#define FILE_VER_NUMBER 2, 5, 3, 26597
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26596"
+#define FB_BUILD_NO "26597"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-27 20:04:22 UTC (rev 57555)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-28 03:37:44 UTC (rev 57556)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26596
+BuildNum=26597
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-29 03:35:39
|
Revision: 57563
http://sourceforge.net/p/firebird/code/57563
Author: firebirds
Date: 2012-12-29 03:35:35 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-28 16:19:29 UTC (rev 57562)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-29 03:35:35 UTC (rev 57563)
@@ -1,3 +1,24 @@
+ 2012-12-28 16:19 alexpeshkoff
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+Use same context for ASTs and async API calls
+
+ 2012-12-28 16:16 alexpeshkoff
+ M src/remote/remote.cpp
+Once I've got NULL object here, could not reproduce, but fix is trivial
+
+ 2012-12-28 12:40 alexpeshkoff
+ M src/jrd/jrd.cpp
+Avoid use of already dropped attachment in system transaction
+
+ 2012-12-28 10:31 alexpeshkoff
+ M src/jrd/jrd.cpp
+Validating attachment by proving its existence in the attachment list makes no sense after validation in handle's array
+
+ 2012-12-28 10:22 alexpeshkoff
+ M src/jrd/Database.h
+Explicit NULL check makes no sense when validating against array of known handles (pointers)
+
2012-12-27 13:26 alexpeshkoff
M src/common/classes/PublicHandle.h
M src/jrd/Database.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-28 16:19:29 UTC (rev 57562)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-29 03:35:35 UTC (rev 57563)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26597
+ FORMAL BUILD NUMBER:26602
*/
-#define PRODUCT_VER_STRING "2.5.3.26597"
-#define FILE_VER_STRING "WI-V2.5.3.26597"
-#define LICENSE_VER_STRING "WI-V2.5.3.26597"
-#define FILE_VER_NUMBER 2, 5, 3, 26597
+#define PRODUCT_VER_STRING "2.5.3.26602"
+#define FILE_VER_STRING "WI-V2.5.3.26602"
+#define LICENSE_VER_STRING "WI-V2.5.3.26602"
+#define FILE_VER_NUMBER 2, 5, 3, 26602
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26597"
+#define FB_BUILD_NO "26602"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-28 16:19:29 UTC (rev 57562)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-29 03:35:35 UTC (rev 57563)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26597
+BuildNum=26602
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2012-12-30 03:35:23
|
Revision: 57569
http://sourceforge.net/p/firebird/code/57569
Author: firebirds
Date: 2012-12-30 03:35:20 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2012-12-30 03:21:19 UTC (rev 57568)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-12-30 03:35:20 UTC (rev 57569)
@@ -1,3 +1,7 @@
+ 2012-12-29 11:16 alexpeshkoff
+ M src/utilities/gsec/security.epp
+Backported fix for CORE-3932: can create but cant delete user with username containing double quotes with gsec
+
2012-12-28 16:19 alexpeshkoff
M src/jrd/jrd.cpp
M src/jrd/jrd.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-30 03:21:19 UTC (rev 57568)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-12-30 03:35:20 UTC (rev 57569)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26602
+ FORMAL BUILD NUMBER:26603
*/
-#define PRODUCT_VER_STRING "2.5.3.26602"
-#define FILE_VER_STRING "WI-V2.5.3.26602"
-#define LICENSE_VER_STRING "WI-V2.5.3.26602"
-#define FILE_VER_NUMBER 2, 5, 3, 26602
+#define PRODUCT_VER_STRING "2.5.3.26603"
+#define FILE_VER_STRING "WI-V2.5.3.26603"
+#define LICENSE_VER_STRING "WI-V2.5.3.26603"
+#define FILE_VER_NUMBER 2, 5, 3, 26603
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26602"
+#define FB_BUILD_NO "26603"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-30 03:21:19 UTC (rev 57568)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-12-30 03:35:20 UTC (rev 57569)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26602
+BuildNum=26603
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-09 04:24:10
|
Revision: 57592
http://sourceforge.net/p/firebird/code/57592
Author: firebirds
Date: 2013-01-09 04:24:05 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-09 03:48:04 UTC (rev 57591)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-09 04:24:05 UTC (rev 57592)
@@ -1,3 +1,9 @@
+ 2013-01-08 13:47 paul_reeves
+ M src/utilities/fbcpl/ctrlpan.cpp
+ M src/utilities/fbcpl/ctrlpan.h
+Fix for CORE-4020
+Instantiate cpl applet methods with LPARAM instead of long.
+
2012-12-29 11:16 alexpeshkoff
M src/utilities/gsec/security.epp
Backported fix for CORE-3932: can create but cant delete user with username containing double quotes with gsec
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-09 03:48:04 UTC (rev 57591)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-09 04:24:05 UTC (rev 57592)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26603
+ FORMAL BUILD NUMBER:26604
*/
-#define PRODUCT_VER_STRING "2.5.3.26603"
-#define FILE_VER_STRING "WI-V2.5.3.26603"
-#define LICENSE_VER_STRING "WI-V2.5.3.26603"
-#define FILE_VER_NUMBER 2, 5, 3, 26603
+#define PRODUCT_VER_STRING "2.5.3.26604"
+#define FILE_VER_STRING "WI-V2.5.3.26604"
+#define LICENSE_VER_STRING "WI-V2.5.3.26604"
+#define FILE_VER_NUMBER 2, 5, 3, 26604
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26603"
+#define FB_BUILD_NO "26604"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-09 03:48:04 UTC (rev 57591)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-09 04:24:05 UTC (rev 57592)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26603
+BuildNum=26604
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-01-10 07:09:45
|
Revision: 57505
http://firebird.svn.sourceforge.net/firebird/?rev=57505&view=rev
Author: alexpeshkoff
Date: 2013-01-10 07:09:38 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Closed posix build
Modified Paths:
--------------
firebird/branches/B2_5_Release/Makefile.in
firebird/branches/B2_5_Release/autogen.sh
Modified: firebird/branches/B2_5_Release/Makefile.in
===================================================================
--- firebird/branches/B2_5_Release/Makefile.in 2013-01-10 07:04:40 UTC (rev 57504)
+++ firebird/branches/B2_5_Release/Makefile.in 2013-01-10 07:09:38 UTC (rev 57505)
@@ -1,6 +1,3 @@
-@SET_MAKE@
-
-all: firebird
-
-.DEFAULT:
- $(MAKE) -C gen $@
+all:
+ @echo "Please use 'svn checkout svn://svn.code.sf.net/p/firebird/code/firebird/branches' to get fresh source code"
+ @exit 1
Modified: firebird/branches/B2_5_Release/autogen.sh
===================================================================
--- firebird/branches/B2_5_Release/autogen.sh 2013-01-10 07:04:40 UTC (rev 57504)
+++ firebird/branches/B2_5_Release/autogen.sh 2013-01-10 07:09:38 UTC (rev 57505)
@@ -1,99 +1,4 @@
#!/bin/sh
-#
-# Run this to generate all the initial makefiles, etc.
-#
-PKG_NAME=Firebird2
-SRCDIR=`dirname $0`
-DIE=0
-
-if [ -z "$AUTORECONF" ]
-then
- AUTORECONF=autoreconf
-fi
-
-echo "AUTORECONF="$AUTORECONF
-
-# This prevents calling automake in old autotools
-AUTOMAKE=true
-export AUTOMAKE
-
-# This helps some old aclocal versions find binreloc.m4 in current directory
-ACLOCAL='aclocal -I .'
-export ACLOCAL
-
-VER=`$AUTORECONF --version|grep '^[Aa]utoreconf'|sed 's/^[^0-9]*//'`
-case "$VER" in
- 0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
- 2\.[1-5][0-9] | 2\.[1-5][0-9][a-z]* | 2\.6[0-2] | 2\.6[0-2][a-z]* )
- echo
- echo "**Error**: You must have autoconf 2.63 or later installed."
- echo "Download the appropriate package for your distribution/OS,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/"
- DIE=1
- ;;
-esac
-
-# Put other tests for programs here!
-
-# If anything failed, exit now.
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-# Give a warning if no arguments to 'configure' have been supplied.
-if test -z "$*" -a x$NOCONFIGURE = x; then
- echo "**Warning**: I am going to run \`configure' with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
-fi
-
-# Some versions of autotools need it
-if [ ! -d m4 ]; then
- rm -rf m4
- mkdir m4
-fi
-
-# Ensure correct utilities are called by AUTORECONF
-autopath=`dirname $AUTORECONF`
-if [ "x$autopath" != "x" ]; then
- PATH=$autopath:$PATH
- export PATH
-fi
-
-# libtool before 2.2.6a needs some help
-CONFIG_AUX_DIR=builds/make.new/config
-mkdir -p $CONFIG_AUX_DIR
-echo "Running autoreconf ..."
-$AUTORECONF --install --force --verbose || exit 1
-
-# automake 1.10 may show '1.10.x' as version while the directory is still named
-# automake-1.10
-am_ver=`automake --version|sed 's/.\+ //; s/\.[^.]\+$//; q'`
-cp /usr/share/automake-$am_ver*/install-sh $CONFIG_AUX_DIR || exit 1
-
-# Hack to bypass bug in autoreconf - --install switch not passed to libtoolize,
-# therefore missing config.sub and confg.guess files
-if [ ! -f $CONFIG_AUX_DIR/config.sub -o ! -f $CONFIG_AUX_DIR/config.guess ]; then
- # re-run libtoolize with --install switch, if it does not understand that switch
- # and there are no config.sub/guess files in CONFIG_AUX_DIR, we will anyway fail
- echo "Re-running libtoolize ..."
- if [ -z "$LIBTOOLIZE" ]; then
- LIBTOOLIZE=libtoolize
- fi
- $LIBTOOLIZE --install --copy --force || exit 1
-fi
-
-# If NOCONFIGURE is set, skip the call to configure
-if test "x$NOCONFIGURE" = "x"; then
- echo Running $SRCDIR/configure $conf_flags "$@" ...
- rm -f config.cache config.log
- chmod a+x $SRCDIR/configure
- $SRCDIR/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME
-else
- echo Autogen skipping configure process.
-fi
-
-# EOF
+echo "Please use 'svn checkout svn://svn.code.sf.net/p/firebird/code/firebird/branches' to get fresh source code"
+exit 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-11 03:52:14
|
Revision: 57596
http://sourceforge.net/p/firebird/code/57596
Author: firebirds
Date: 2013-01-11 03:52:10 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-10 15:03:57 UTC (rev 57595)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-11 03:52:10 UTC (rev 57596)
@@ -1,3 +1,8 @@
+ 2013-01-10 15:03 paul_reeves
+ M builds/install/arch-specific/win32/After_Installation.url
+ M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+Misc
+
2013-01-08 13:47 paul_reeves
M src/utilities/fbcpl/ctrlpan.cpp
M src/utilities/fbcpl/ctrlpan.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-10 15:03:57 UTC (rev 57595)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-11 03:52:10 UTC (rev 57596)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26604
+ FORMAL BUILD NUMBER:26605
*/
-#define PRODUCT_VER_STRING "2.5.3.26604"
-#define FILE_VER_STRING "WI-V2.5.3.26604"
-#define LICENSE_VER_STRING "WI-V2.5.3.26604"
-#define FILE_VER_NUMBER 2, 5, 3, 26604
+#define PRODUCT_VER_STRING "2.5.3.26605"
+#define FILE_VER_STRING "WI-V2.5.3.26605"
+#define LICENSE_VER_STRING "WI-V2.5.3.26605"
+#define FILE_VER_NUMBER 2, 5, 3, 26605
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26604"
+#define FB_BUILD_NO "26605"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-10 15:03:57 UTC (rev 57595)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-11 03:52:10 UTC (rev 57596)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26604
+BuildNum=26605
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-17 03:56:06
|
Revision: 57603
http://sourceforge.net/p/firebird/code/57603
Author: firebirds
Date: 2013-01-17 03:56:03 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-17 03:36:03 UTC (rev 57602)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-17 03:56:03 UTC (rev 57603)
@@ -1,3 +1,7 @@
+ 2013-01-16 17:02 dimitr
+ M src/jrd/btr.cpp
+Simplest fix for CORE-4038: Broken optimization for the stored dbkeys.
+
2013-01-10 15:03 paul_reeves
M builds/install/arch-specific/win32/After_Installation.url
M builds/install/arch-specific/win32/BuildExecutableInstall.bat
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-17 03:36:03 UTC (rev 57602)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-17 03:56:03 UTC (rev 57603)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26605
+ FORMAL BUILD NUMBER:26606
*/
-#define PRODUCT_VER_STRING "2.5.3.26605"
-#define FILE_VER_STRING "WI-V2.5.3.26605"
-#define LICENSE_VER_STRING "WI-V2.5.3.26605"
-#define FILE_VER_NUMBER 2, 5, 3, 26605
+#define PRODUCT_VER_STRING "2.5.3.26606"
+#define FILE_VER_STRING "WI-V2.5.3.26606"
+#define LICENSE_VER_STRING "WI-V2.5.3.26606"
+#define FILE_VER_NUMBER 2, 5, 3, 26606
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26605"
+#define FB_BUILD_NO "26606"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-17 03:36:03 UTC (rev 57602)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-17 03:56:03 UTC (rev 57603)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26605
+BuildNum=26606
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-19 03:55:39
|
Revision: 57605
http://sourceforge.net/p/firebird/code/57605
Author: firebirds
Date: 2013-01-19 03:55:29 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-17 16:32:48 UTC (rev 57604)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-19 03:55:29 UTC (rev 57605)
@@ -1,3 +1,7 @@
+ 2013-01-17 16:32 dimitr
+ M src/jrd/Database.h
+A little bit more defensive approach to the dbb handle validation. It also avoids the second handle lookup.
+
2013-01-16 17:02 dimitr
M src/jrd/btr.cpp
Simplest fix for CORE-4038: Broken optimization for the stored dbkeys.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-17 16:32:48 UTC (rev 57604)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-19 03:55:29 UTC (rev 57605)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26606
+ FORMAL BUILD NUMBER:26607
*/
-#define PRODUCT_VER_STRING "2.5.3.26606"
-#define FILE_VER_STRING "WI-V2.5.3.26606"
-#define LICENSE_VER_STRING "WI-V2.5.3.26606"
-#define FILE_VER_NUMBER 2, 5, 3, 26606
+#define PRODUCT_VER_STRING "2.5.3.26607"
+#define FILE_VER_STRING "WI-V2.5.3.26607"
+#define LICENSE_VER_STRING "WI-V2.5.3.26607"
+#define FILE_VER_NUMBER 2, 5, 3, 26607
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26606"
+#define FB_BUILD_NO "26607"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-17 16:32:48 UTC (rev 57604)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-19 03:55:29 UTC (rev 57605)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26606
+BuildNum=26607
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-25 09:51:27
|
Revision: 57622
http://sourceforge.net/p/firebird/code/57622
Author: firebirds
Date: 2013-01-25 09:51:21 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-25 06:06:33 UTC (rev 57621)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-25 09:51:21 UTC (rev 57622)
@@ -1,3 +1,16 @@
+ 2013-01-24 16:47 dimitr
+ M src/dsql/dsql.cpp
+Slightly improved the condition for the Adriano's backward compatibility workaround, this optimizes METD_move() into a plain memcpy() for strings with an explicitly declared charset.
+
+ 2013-01-24 09:29 dimitr
+ M src/common/cvt.cpp
+This trivial optimization saves a few percents of performance when reading/writing DBKEYs from/to compatible local variables.
+
+ 2013-01-24 07:10 dimitr
+ M src/dsql/gen.cpp
+ M src/dsql/pass1.cpp
+Backported dbkey/recver optimization.
+
2013-01-17 16:32 dimitr
M src/jrd/Database.h
A little bit more defensive approach to the dbb handle validation. It also avoids the second handle lookup.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-25 06:06:33 UTC (rev 57621)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-25 09:51:21 UTC (rev 57622)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26607
+ FORMAL BUILD NUMBER:26610
*/
-#define PRODUCT_VER_STRING "2.5.3.26607"
-#define FILE_VER_STRING "WI-V2.5.3.26607"
-#define LICENSE_VER_STRING "WI-V2.5.3.26607"
-#define FILE_VER_NUMBER 2, 5, 3, 26607
+#define PRODUCT_VER_STRING "2.5.3.26610"
+#define FILE_VER_STRING "WI-V2.5.3.26610"
+#define LICENSE_VER_STRING "WI-V2.5.3.26610"
+#define FILE_VER_NUMBER 2, 5, 3, 26610
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26607"
+#define FB_BUILD_NO "26610"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-25 06:06:33 UTC (rev 57621)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-25 09:51:21 UTC (rev 57622)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26607
+BuildNum=26610
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-26 08:38:55
|
Revision: 57628
http://sourceforge.net/p/firebird/code/57628
Author: firebirds
Date: 2013-01-26 08:38:50 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-26 05:56:52 UTC (rev 57627)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-26 08:38:50 UTC (rev 57628)
@@ -1,3 +1,9 @@
+ 2013-01-25 12:37 dimitr
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/ExtDS.h
+ M src/jrd/extds/InternalDS.cpp
+Slightly optimized fetches for internal EXECUTE STATEMENT.
+
2013-01-24 16:47 dimitr
M src/dsql/dsql.cpp
Slightly improved the condition for the Adriano's backward compatibility workaround, this optimizes METD_move() into a plain memcpy() for strings with an explicitly declared charset.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-26 05:56:52 UTC (rev 57627)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-26 08:38:50 UTC (rev 57628)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26610
+ FORMAL BUILD NUMBER:26611
*/
-#define PRODUCT_VER_STRING "2.5.3.26610"
-#define FILE_VER_STRING "WI-V2.5.3.26610"
-#define LICENSE_VER_STRING "WI-V2.5.3.26610"
-#define FILE_VER_NUMBER 2, 5, 3, 26610
+#define PRODUCT_VER_STRING "2.5.3.26611"
+#define FILE_VER_STRING "WI-V2.5.3.26611"
+#define LICENSE_VER_STRING "WI-V2.5.3.26611"
+#define FILE_VER_NUMBER 2, 5, 3, 26611
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26610"
+#define FB_BUILD_NO "26611"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-26 05:56:52 UTC (rev 57627)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-26 08:38:50 UTC (rev 57628)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26610
+BuildNum=26611
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-01-31 08:17:26
|
Revision: 57636
http://sourceforge.net/p/firebird/code/57636
Author: firebirds
Date: 2013-01-31 08:17:23 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-01-31 05:37:28 UTC (rev 57635)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-01-31 08:17:23 UTC (rev 57636)
@@ -1,3 +1,7 @@
+ 2013-01-30 11:23 dimitr
+ M src/jrd/Database.h
+Fixed the recently introduced deadlock. This is the simplest possible patch, other solutions are possible.
+
2013-01-25 12:37 dimitr
M src/jrd/extds/ExtDS.cpp
M src/jrd/extds/ExtDS.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-31 05:37:28 UTC (rev 57635)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-01-31 08:17:23 UTC (rev 57636)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26611
+ FORMAL BUILD NUMBER:26612
*/
-#define PRODUCT_VER_STRING "2.5.3.26611"
-#define FILE_VER_STRING "WI-V2.5.3.26611"
-#define LICENSE_VER_STRING "WI-V2.5.3.26611"
-#define FILE_VER_NUMBER 2, 5, 3, 26611
+#define PRODUCT_VER_STRING "2.5.3.26612"
+#define FILE_VER_STRING "WI-V2.5.3.26612"
+#define LICENSE_VER_STRING "WI-V2.5.3.26612"
+#define FILE_VER_NUMBER 2, 5, 3, 26612
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26611"
+#define FB_BUILD_NO "26612"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-31 05:37:28 UTC (rev 57635)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-01-31 08:17:23 UTC (rev 57636)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26611
+BuildNum=26612
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-02-15 01:21:45
|
Revision: 57658
http://sourceforge.net/p/firebird/code/57658
Author: firebirds
Date: 2013-02-15 01:21:40 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2013-02-14 04:29:13 UTC (rev 57657)
+++ firebird/branches/B2_5_Release/ChangeLog 2013-02-15 01:21:40 UTC (rev 57658)
@@ -1,3 +1,8 @@
+ 2013-02-14 04:29 robocop
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+Misc.
+
2013-01-30 11:23 dimitr
M src/jrd/Database.h
Fixed the recently introduced deadlock. This is the simplest possible patch, other solutions are possible.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-02-14 04:29:13 UTC (rev 57657)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2013-02-15 01:21:40 UTC (rev 57658)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26612
+ FORMAL BUILD NUMBER:26613
*/
-#define PRODUCT_VER_STRING "2.5.3.26612"
-#define FILE_VER_STRING "WI-V2.5.3.26612"
-#define LICENSE_VER_STRING "WI-V2.5.3.26612"
-#define FILE_VER_NUMBER 2, 5, 3, 26612
+#define PRODUCT_VER_STRING "2.5.3.26613"
+#define FILE_VER_STRING "WI-V2.5.3.26613"
+#define LICENSE_VER_STRING "WI-V2.5.3.26613"
+#define FILE_VER_NUMBER 2, 5, 3, 26613
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26612"
+#define FB_BUILD_NO "26613"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-02-14 04:29:13 UTC (rev 57657)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2013-02-15 01:21:40 UTC (rev 57658)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26612
+BuildNum=26613
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X