Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2015-11-28 00:09:53
|
Revision: 62610
http://sourceforge.net/p/firebird/code/62610
Author: firebirds
Date: 2015-11-28 00:09:51 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-11-27 18:37:52 UTC (rev 62609)
+++ firebird/trunk/ChangeLog 2015-11-28 00:09:51 UTC (rev 62610)
@@ -1,3 +1,9 @@
+ 2015-11-27 18:37 asfernandes
+ M src/common/MsgMetadata.cpp
+ M src/common/MsgMetadata.h
+ M src/common/classes/objects_array.h
+Allow to call IMetadataBuilder::getMetadata more than one time.
+
2015-11-26 09:28 roman-simakov
M src/jrd/cch.cpp
M src/jrd/validation.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-11-27 18:37:52 UTC (rev 62609)
+++ firebird/trunk/src/jrd/build_no.h 2015-11-28 00:09:51 UTC (rev 62610)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32198
+ FORMAL BUILD NUMBER:32199
*/
-#define PRODUCT_VER_STRING "3.0.0.32198"
-#define FILE_VER_STRING "WI-V3.0.0.32198"
-#define LICENSE_VER_STRING "WI-V3.0.0.32198"
-#define FILE_VER_NUMBER 3, 0, 0, 32198
+#define PRODUCT_VER_STRING "3.0.0.32199"
+#define FILE_VER_STRING "WI-V3.0.0.32199"
+#define LICENSE_VER_STRING "WI-V3.0.0.32199"
+#define FILE_VER_NUMBER 3, 0, 0, 32199
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32198"
+#define FB_BUILD_NO "32199"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-11-27 18:37:52 UTC (rev 62609)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-11-28 00:09:51 UTC (rev 62610)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32198
+BuildNum=32199
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-11-30 00:11:56
|
Revision: 62615
http://sourceforge.net/p/firebird/code/62615
Author: firebirds
Date: 2015-11-30 00:11:54 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-11-29 23:02:29 UTC (rev 62614)
+++ firebird/trunk/ChangeLog 2015-11-30 00:11:54 UTC (rev 62615)
@@ -1,3 +1,41 @@
+ 2015-11-29 23:02 egorpugin
+ M .travis.yml
+[ci] Fix wget sertificate error.
+
+ 2015-11-29 15:12 dimitr
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/GlobalRWLock.cpp
+ M src/jrd/Relation.cpp
+ M src/jrd/Routine.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/fun.epp
+ M src/jrd/inf.cpp
+ M src/jrd/intl.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/jrd_proto.h
+ M src/jrd/lck.cpp
+ M src/jrd/met.epp
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+ M src/jrd/os/pio_proto.h
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/os/win32/winnt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/pag_proto.h
+ M src/jrd/sdw.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/vio.cpp
+ M src/lock/lock.cpp
+ M src/lock/lock_proto.h
+1) Slightly refactored recheduling and checkout logic.
+2) Re-enabled checkouts in PIO routines, this resolves CORE-4179. Windows build may be broken, please validate.
+3) Implemented faster reaction on asynchronous cancellation/shutdown requests.
+4) Avoided locking dbb_sync in AST. This change also solves races during massive attachment shutdown.
+
2015-11-27 18:37 asfernandes
M src/common/MsgMetadata.cpp
M src/common/MsgMetadata.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-11-29 23:02:29 UTC (rev 62614)
+++ firebird/trunk/src/jrd/build_no.h 2015-11-30 00:11:54 UTC (rev 62615)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32199
+ FORMAL BUILD NUMBER:32201
*/
-#define PRODUCT_VER_STRING "3.0.0.32199"
-#define FILE_VER_STRING "WI-V3.0.0.32199"
-#define LICENSE_VER_STRING "WI-V3.0.0.32199"
-#define FILE_VER_NUMBER 3, 0, 0, 32199
+#define PRODUCT_VER_STRING "3.0.0.32201"
+#define FILE_VER_STRING "WI-V3.0.0.32201"
+#define LICENSE_VER_STRING "WI-V3.0.0.32201"
+#define FILE_VER_NUMBER 3, 0, 0, 32201
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32199"
+#define FB_BUILD_NO "32201"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-11-29 23:02:29 UTC (rev 62614)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-11-30 00:11:54 UTC (rev 62615)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32199
+BuildNum=32201
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-02 00:12:37
|
Revision: 62621
http://sourceforge.net/p/firebird/code/62621
Author: firebirds
Date: 2015-12-02 00:12:35 +0000 (Wed, 02 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-01 21:12:31 UTC (rev 62620)
+++ firebird/trunk/ChangeLog 2015-12-02 00:12:35 UTC (rev 62621)
@@ -1,3 +1,17 @@
+ 2015-12-01 21:12 hvlad
+ M src/jrd/jrd.h
+Fixed AV in CS introduced recently. Dmitry, please review.
+
+ 2015-12-01 12:24 dimitr
+ M src/lock/print.cpp
+Misc.
+
+ 2015-12-01 12:23 dimitr
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/lock/lock.cpp
+Second round of my checkout/rescheduling changes.
+
2015-11-29 23:02 egorpugin
M .travis.yml
[ci] Fix wget sertificate error.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-01 21:12:31 UTC (rev 62620)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-02 00:12:35 UTC (rev 62621)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32201
+ FORMAL BUILD NUMBER:32204
*/
-#define PRODUCT_VER_STRING "3.0.0.32201"
-#define FILE_VER_STRING "WI-V3.0.0.32201"
-#define LICENSE_VER_STRING "WI-V3.0.0.32201"
-#define FILE_VER_NUMBER 3, 0, 0, 32201
+#define PRODUCT_VER_STRING "3.0.0.32204"
+#define FILE_VER_STRING "WI-V3.0.0.32204"
+#define LICENSE_VER_STRING "WI-V3.0.0.32204"
+#define FILE_VER_NUMBER 3, 0, 0, 32204
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32201"
+#define FB_BUILD_NO "32204"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-01 21:12:31 UTC (rev 62620)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-02 00:12:35 UTC (rev 62621)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32201
+BuildNum=32204
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-04 00:09:53
|
Revision: 62624
http://sourceforge.net/p/firebird/code/62624
Author: firebirds
Date: 2015-12-04 00:09:50 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-03 22:17:50 UTC (rev 62623)
+++ firebird/trunk/ChangeLog 2015-12-04 00:09:50 UTC (rev 62624)
@@ -1,3 +1,20 @@
+ 2015-12-03 22:17 hvlad
+ M src/common/isc_sync.cpp
+Correction
+
+ 2015-12-03 16:17 hvlad
+ M src/common/isc_sync.cpp
+Fixed the race condition on Windows when shared memory is initialized.
+It could raise errors like:
+MonitoringData: Cannot initialize the shared memory region
+sh_mem_length_mapped is 0
+LockManager::LockManager()
+Database is probably already opened by another engine instance in another Windows session
+MonitoringData: Cannot initialize the shared memory region
+operating system directive CreateFile failed
+Access is denied.
+Test case is at CORE-4680, see comments by Pavel Zotov at 18 Nov 2015.
+
2015-12-01 21:12 hvlad
M src/jrd/jrd.h
Fixed AV in CS introduced recently. Dmitry, please review.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-03 22:17:50 UTC (rev 62623)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-04 00:09:50 UTC (rev 62624)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32204
+ FORMAL BUILD NUMBER:32206
*/
-#define PRODUCT_VER_STRING "3.0.0.32204"
-#define FILE_VER_STRING "WI-V3.0.0.32204"
-#define LICENSE_VER_STRING "WI-V3.0.0.32204"
-#define FILE_VER_NUMBER 3, 0, 0, 32204
+#define PRODUCT_VER_STRING "3.0.0.32206"
+#define FILE_VER_STRING "WI-V3.0.0.32206"
+#define LICENSE_VER_STRING "WI-V3.0.0.32206"
+#define FILE_VER_NUMBER 3, 0, 0, 32206
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32204"
+#define FB_BUILD_NO "32206"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-03 22:17:50 UTC (rev 62623)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-04 00:09:50 UTC (rev 62624)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32204
+BuildNum=32206
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-05 00:08:57
|
Revision: 62626
http://sourceforge.net/p/firebird/code/62626
Author: firebirds
Date: 2015-12-05 00:08:55 +0000 (Sat, 05 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-04 13:07:25 UTC (rev 62625)
+++ firebird/trunk/ChangeLog 2015-12-05 00:08:55 UTC (rev 62626)
@@ -1,3 +1,8 @@
+ 2015-12-04 13:07 aafemt
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/why.cpp
+Move call addRef() out of constructor
+
2015-12-03 22:17 hvlad
M src/common/isc_sync.cpp
Correction
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-04 13:07:25 UTC (rev 62625)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-05 00:08:55 UTC (rev 62626)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32206
+ FORMAL BUILD NUMBER:32207
*/
-#define PRODUCT_VER_STRING "3.0.0.32206"
-#define FILE_VER_STRING "WI-V3.0.0.32206"
-#define LICENSE_VER_STRING "WI-V3.0.0.32206"
-#define FILE_VER_NUMBER 3, 0, 0, 32206
+#define PRODUCT_VER_STRING "3.0.0.32207"
+#define FILE_VER_STRING "WI-V3.0.0.32207"
+#define LICENSE_VER_STRING "WI-V3.0.0.32207"
+#define FILE_VER_NUMBER 3, 0, 0, 32207
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32206"
+#define FB_BUILD_NO "32207"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-04 13:07:25 UTC (rev 62625)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-05 00:08:55 UTC (rev 62626)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32206
+BuildNum=32207
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-07 00:09:53
|
Revision: 62628
http://sourceforge.net/p/firebird/code/62628
Author: firebirds
Date: 2015-12-07 00:09:51 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-06 22:49:24 UTC (rev 62627)
+++ firebird/trunk/ChangeLog 2015-12-07 00:09:51 UTC (rev 62628)
@@ -1,3 +1,9 @@
+ 2015-12-06 22:49 asfernandes
+ M src/common/isc_sync.cpp
+ M src/jrd/validation.cpp
+ M src/remote/os/win32/xnet.cpp
+Misc.
+
2015-12-04 13:07 aafemt
M src/yvalve/DistributedTransaction.cpp
M src/yvalve/why.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-06 22:49:24 UTC (rev 62627)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-07 00:09:51 UTC (rev 62628)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32207
+ FORMAL BUILD NUMBER:32208
*/
-#define PRODUCT_VER_STRING "3.0.0.32207"
-#define FILE_VER_STRING "WI-V3.0.0.32207"
-#define LICENSE_VER_STRING "WI-V3.0.0.32207"
-#define FILE_VER_NUMBER 3, 0, 0, 32207
+#define PRODUCT_VER_STRING "3.0.0.32208"
+#define FILE_VER_STRING "WI-V3.0.0.32208"
+#define LICENSE_VER_STRING "WI-V3.0.0.32208"
+#define FILE_VER_NUMBER 3, 0, 0, 32208
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32207"
+#define FB_BUILD_NO "32208"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-06 22:49:24 UTC (rev 62627)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-07 00:09:51 UTC (rev 62628)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32207
+BuildNum=32208
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-10 00:10:29
|
Revision: 62640
http://sourceforge.net/p/firebird/code/62640
Author: firebirds
Date: 2015-12-10 00:10:27 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/ChangeLog 2015-12-10 00:10:27 UTC (rev 62640)
@@ -1,3 +1,21 @@
+ 2015-12-09 14:22 aafemt
+ M src/dsql/DdlNodes.epp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+Perform db encryption checks at ddl time to avoid corrupting database by wrong plugin name in header
+
+ 2015-12-09 13:47 aafemt
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/Parser.h
+ M src/dsql/parse.y
+Prevent using DECRYPT and ENCRYPT clauses in one query
+
+ 2015-12-09 10:25 paul_reeves
+ M builds/install/arch-specific/win32/ru/custom_messages_ru.inc
+Change file format of custom messages to UTF-8
+This ought to fix CORE-5002 but needs further testing
+
2015-12-06 22:49 asfernandes
M src/common/isc_sync.cpp
M src/jrd/validation.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-10 00:10:27 UTC (rev 62640)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32208
+ FORMAL BUILD NUMBER:32211
*/
-#define PRODUCT_VER_STRING "3.0.0.32208"
-#define FILE_VER_STRING "WI-V3.0.0.32208"
-#define LICENSE_VER_STRING "WI-V3.0.0.32208"
-#define FILE_VER_NUMBER 3, 0, 0, 32208
+#define PRODUCT_VER_STRING "3.0.0.32211"
+#define FILE_VER_STRING "WI-V3.0.0.32211"
+#define LICENSE_VER_STRING "WI-V3.0.0.32211"
+#define FILE_VER_NUMBER 3, 0, 0, 32211
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32208"
+#define FB_BUILD_NO "32211"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-10 00:10:27 UTC (rev 62640)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32208
+BuildNum=32211
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-11 00:10:24
|
Revision: 62644
http://sourceforge.net/p/firebird/code/62644
Author: firebirds
Date: 2015-12-11 00:10:22 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-10 19:15:11 UTC (rev 62643)
+++ firebird/trunk/ChangeLog 2015-12-11 00:10:22 UTC (rev 62644)
@@ -1,3 +1,16 @@
+ 2015-12-10 16:58 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/sdw.cpp
+Fixed CORE-5041: Database may get corrupted after ALTER DATABASE ENCRYPT/DECRYPT issued multiple times per database open time
+
+ 2015-12-10 15:30 alexpeshkoff
+ M src/common/classes/condition.h
+Misc - fixed system call name in exception
+
2015-12-09 14:22 aafemt
M src/dsql/DdlNodes.epp
M src/jrd/CryptoManager.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-10 19:15:11 UTC (rev 62643)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-11 00:10:22 UTC (rev 62644)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32211
+ FORMAL BUILD NUMBER:32213
*/
-#define PRODUCT_VER_STRING "3.0.0.32211"
-#define FILE_VER_STRING "WI-V3.0.0.32211"
-#define LICENSE_VER_STRING "WI-V3.0.0.32211"
-#define FILE_VER_NUMBER 3, 0, 0, 32211
+#define PRODUCT_VER_STRING "3.0.0.32213"
+#define FILE_VER_STRING "WI-V3.0.0.32213"
+#define LICENSE_VER_STRING "WI-V3.0.0.32213"
+#define FILE_VER_NUMBER 3, 0, 0, 32213
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32211"
+#define FB_BUILD_NO "32213"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-10 19:15:11 UTC (rev 62643)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-11 00:10:22 UTC (rev 62644)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32211
+BuildNum=32213
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-12 00:09:40
|
Revision: 62653
http://sourceforge.net/p/firebird/code/62653
Author: firebirds
Date: 2015-12-12 00:09:37 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-11 19:46:32 UTC (rev 62652)
+++ firebird/trunk/ChangeLog 2015-12-12 00:09:37 UTC (rev 62653)
@@ -1,3 +1,24 @@
+ 2015-12-11 19:46 aafemt
+ M src/jrd/CryptoManager.cpp
+Allow only one ALTER DATABASE ENCRYPT query in transaction
+
+ 2015-12-11 16:06 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+Include zlib1.dll in the binary kits
+
+ 2015-12-11 13:44 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+Postfix for CORE-5041: try to leave slow I/O mode as soon as possible
+
+ 2015-12-11 13:27 alexpeshkoff
+ M src/yvalve/preparse.cpp
+Fixed CORE-5042: FB3 client cannot create database on FB2.5 server
+
+ 2015-12-11 06:52 dimitr
+ M src/jrd/jrd.cpp
+Fixed possible problems with asynchronous query cancellation (recent regression).
+
2015-12-10 16:58 alexpeshkoff
M src/jrd/CryptoManager.cpp
M src/jrd/CryptoManager.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-11 19:46:32 UTC (rev 62652)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-12 00:09:37 UTC (rev 62653)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32213
+ FORMAL BUILD NUMBER:32218
*/
-#define PRODUCT_VER_STRING "3.0.0.32213"
-#define FILE_VER_STRING "WI-V3.0.0.32213"
-#define LICENSE_VER_STRING "WI-V3.0.0.32213"
-#define FILE_VER_NUMBER 3, 0, 0, 32213
+#define PRODUCT_VER_STRING "3.0.0.32218"
+#define FILE_VER_STRING "WI-V3.0.0.32218"
+#define LICENSE_VER_STRING "WI-V3.0.0.32218"
+#define FILE_VER_NUMBER 3, 0, 0, 32218
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32213"
+#define FB_BUILD_NO "32218"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-11 19:46:32 UTC (rev 62652)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-12 00:09:37 UTC (rev 62653)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32213
+BuildNum=32218
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-14 00:09:57
|
Revision: 62661
http://sourceforge.net/p/firebird/code/62661
Author: firebirds
Date: 2015-12-14 00:09:54 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-13 19:50:15 UTC (rev 62660)
+++ firebird/trunk/ChangeLog 2015-12-14 00:09:54 UTC (rev 62661)
@@ -1,3 +1,11 @@
+ 2015-12-13 01:02 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/Parser.h
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/yvalve/preparse.cpp
+Misc.
+
2015-12-11 19:46 aafemt
M src/jrd/CryptoManager.cpp
Allow only one ALTER DATABASE ENCRYPT query in transaction
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-13 19:50:15 UTC (rev 62660)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-14 00:09:54 UTC (rev 62661)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32218
+ FORMAL BUILD NUMBER:32219
*/
-#define PRODUCT_VER_STRING "3.0.0.32218"
-#define FILE_VER_STRING "WI-V3.0.0.32218"
-#define LICENSE_VER_STRING "WI-V3.0.0.32218"
-#define FILE_VER_NUMBER 3, 0, 0, 32218
+#define PRODUCT_VER_STRING "3.0.0.32219"
+#define FILE_VER_STRING "WI-V3.0.0.32219"
+#define LICENSE_VER_STRING "WI-V3.0.0.32219"
+#define FILE_VER_NUMBER 3, 0, 0, 32219
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32218"
+#define FB_BUILD_NO "32219"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-13 19:50:15 UTC (rev 62660)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-14 00:09:54 UTC (rev 62661)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32218
+BuildNum=32219
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-15 00:08:58
|
Revision: 62669
http://sourceforge.net/p/firebird/code/62669
Author: firebirds
Date: 2015-12-15 00:08:56 +0000 (Tue, 15 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-14 19:59:14 UTC (rev 62668)
+++ firebird/trunk/ChangeLog 2015-12-15 00:08:56 UTC (rev 62669)
@@ -1,3 +1,13 @@
+ 2015-12-14 14:07 aafemt
+ M src/jrd/jrd.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Allow key holders to be called on client side (CORE-5043)
+
+ 2015-12-14 12:57 alexpeshkoff
+ M builds/install/misc/firebird.conf.in
+comments
+
2015-12-13 01:02 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/Parser.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-14 19:59:14 UTC (rev 62668)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-15 00:08:56 UTC (rev 62669)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32219
+ FORMAL BUILD NUMBER:32221
*/
-#define PRODUCT_VER_STRING "3.0.0.32219"
-#define FILE_VER_STRING "WI-V3.0.0.32219"
-#define LICENSE_VER_STRING "WI-V3.0.0.32219"
-#define FILE_VER_NUMBER 3, 0, 0, 32219
+#define PRODUCT_VER_STRING "3.0.0.32221"
+#define FILE_VER_STRING "WI-V3.0.0.32221"
+#define LICENSE_VER_STRING "WI-V3.0.0.32221"
+#define FILE_VER_NUMBER 3, 0, 0, 32221
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32219"
+#define FB_BUILD_NO "32221"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-14 19:59:14 UTC (rev 62668)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-15 00:08:56 UTC (rev 62669)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32219
+BuildNum=32221
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-16 00:10:31
|
Revision: 62673
http://sourceforge.net/p/firebird/code/62673
Author: firebirds
Date: 2015-12-16 00:10:28 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-15 16:54:23 UTC (rev 62672)
+++ firebird/trunk/ChangeLog 2015-12-16 00:10:28 UTC (rev 62673)
@@ -1,3 +1,8 @@
+ 2015-12-15 16:54 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+Mostly comments needed after fix for CORE-5041, also added some checks to be safer with repeated I/O
+
2015-12-14 14:07 aafemt
M src/jrd/jrd.cpp
M src/yvalve/YObjects.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-15 16:54:23 UTC (rev 62672)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-16 00:10:28 UTC (rev 62673)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32221
+ FORMAL BUILD NUMBER:32222
*/
-#define PRODUCT_VER_STRING "3.0.0.32221"
-#define FILE_VER_STRING "WI-V3.0.0.32221"
-#define LICENSE_VER_STRING "WI-V3.0.0.32221"
-#define FILE_VER_NUMBER 3, 0, 0, 32221
+#define PRODUCT_VER_STRING "3.0.0.32222"
+#define FILE_VER_STRING "WI-V3.0.0.32222"
+#define LICENSE_VER_STRING "WI-V3.0.0.32222"
+#define FILE_VER_NUMBER 3, 0, 0, 32222
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32221"
+#define FB_BUILD_NO "32222"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-15 16:54:23 UTC (rev 62672)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-16 00:10:28 UTC (rev 62673)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32221
+BuildNum=32222
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-17 00:09:12
|
Revision: 62679
http://sourceforge.net/p/firebird/code/62679
Author: firebirds
Date: 2015-12-17 00:09:09 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-16 17:23:02 UTC (rev 62678)
+++ firebird/trunk/ChangeLog 2015-12-17 00:09:09 UTC (rev 62679)
@@ -1,3 +1,23 @@
+ 2015-12-16 17:23 aafemt
+ M src/yvalve/why.cpp
+Restore raising of error from last tried provider as pointed by Alex
+
+ 2015-12-16 17:17 alexpeshkoff
+ M src/yvalve/why.cpp
+Totally misc - formatting
+
+ 2015-12-16 17:16 alexpeshkoff
+ M src/yvalve/YObjects.h
+Cleanup
+
+ 2015-12-16 17:12 alexpeshkoff
+ M src/remote/server/os/posix/inet_server.cpp
+Fixed CORE-5032: Cannot connect to a database which have own security database without security3.fdb
+
+ 2015-12-16 16:43 dimitr
+ M src/jrd/jrd.cpp
+This should fix the minor error reporting regression noticed for bugs.core_3323.
+
2015-12-15 16:54 alexpeshkoff
M src/jrd/CryptoManager.cpp
M src/jrd/CryptoManager.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-16 17:23:02 UTC (rev 62678)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-17 00:09:09 UTC (rev 62679)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32222
+ FORMAL BUILD NUMBER:32227
*/
-#define PRODUCT_VER_STRING "3.0.0.32222"
-#define FILE_VER_STRING "WI-V3.0.0.32222"
-#define LICENSE_VER_STRING "WI-V3.0.0.32222"
-#define FILE_VER_NUMBER 3, 0, 0, 32222
+#define PRODUCT_VER_STRING "3.0.0.32227"
+#define FILE_VER_STRING "WI-V3.0.0.32227"
+#define LICENSE_VER_STRING "WI-V3.0.0.32227"
+#define FILE_VER_NUMBER 3, 0, 0, 32227
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32222"
+#define FB_BUILD_NO "32227"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-16 17:23:02 UTC (rev 62678)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-17 00:09:09 UTC (rev 62679)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32222
+BuildNum=32227
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-18 00:09:19
|
Revision: 62692
http://sourceforge.net/p/firebird/code/62692
Author: firebirds
Date: 2015-12-18 00:09:17 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-17 20:28:29 UTC (rev 62691)
+++ firebird/trunk/ChangeLog 2015-12-18 00:09:17 UTC (rev 62692)
@@ -1,3 +1,31 @@
+ 2015-12-17 15:14 alexpeshkoff
+ M src/remote/server/os/posix/inet_server.cpp
+Postfix for CORE-5032: error handling was broken, therefore checked for invalid error code
+
+ 2015-12-17 13:44 aafemt
+ M src/jrd/jrd.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Rollback
+
+ 2015-12-17 12:43 alexpeshkoff
+ M src/yvalve/why.cpp
+Fixed CORE-5039: Connecting to service with invalid servicename yields incorrect error message
+
+ 2015-12-17 11:28 hvlad
+ M src/remote/os/win32/xnet.cpp
+Let XNET client returns correct isc_network_error in case of not running XNET server.
+Before it returns isc_unavailable and fools y-valve.
+
+ 2015-12-17 09:56 hvlad
+ M src/yvalve/preparse.cpp
+Fixed warning
+
+ 2015-12-17 09:56 hvlad
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Make names less dumb. Formatting a bit.
+
2015-12-16 17:23 aafemt
M src/yvalve/why.cpp
Restore raising of error from last tried provider as pointed by Alex
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-17 20:28:29 UTC (rev 62691)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-18 00:09:17 UTC (rev 62692)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32227
+ FORMAL BUILD NUMBER:32233
*/
-#define PRODUCT_VER_STRING "3.0.0.32227"
-#define FILE_VER_STRING "WI-V3.0.0.32227"
-#define LICENSE_VER_STRING "WI-V3.0.0.32227"
-#define FILE_VER_NUMBER 3, 0, 0, 32227
+#define PRODUCT_VER_STRING "3.0.0.32233"
+#define FILE_VER_STRING "WI-V3.0.0.32233"
+#define LICENSE_VER_STRING "WI-V3.0.0.32233"
+#define FILE_VER_NUMBER 3, 0, 0, 32233
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32227"
+#define FB_BUILD_NO "32233"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-17 20:28:29 UTC (rev 62691)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-18 00:09:17 UTC (rev 62692)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32227
+BuildNum=32233
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-19 00:09:49
|
Revision: 62703
http://sourceforge.net/p/firebird/code/62703
Author: firebirds
Date: 2015-12-19 00:09:46 +0000 (Sat, 19 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-18 19:03:49 UTC (rev 62702)
+++ firebird/trunk/ChangeLog 2015-12-19 00:09:46 UTC (rev 62703)
@@ -1,3 +1,31 @@
+ 2015-12-18 16:57 dimitr
+ M src/dsql/DdlNodes.epp
+Constness.
+
+ 2015-12-18 16:34 asfernandes
+ M src/dsql/Nodes.h
+ M src/include/fb_blk.h
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/sdw.cpp
+Avoid warnings with clang.
+
+ 2015-12-18 16:34 asfernandes
+ M src/dsql/DdlNodes.epp
+Fixed CORE-5049 - Regression: incorrect calculation of byte-length for view columns.
+
+ 2015-12-18 13:53 alexpeshkoff
+ M src/common/call_service.cpp
+Fixed gsec with SS
+
+ 2015-12-18 13:45 asfernandes
+ M src/common/classes/alloc.h
+ M src/include/fb_blk.h
+Avoid warnings with clang.
+
+ 2015-12-18 12:28 dimitr
+ M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+This should fix CORE-4862: ibase.h from x64 package includes non-existing file.
+
2015-12-17 15:14 alexpeshkoff
M src/remote/server/os/posix/inet_server.cpp
Postfix for CORE-5032: error handling was broken, therefore checked for invalid error code
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-18 19:03:49 UTC (rev 62702)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-19 00:09:46 UTC (rev 62703)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32233
+ FORMAL BUILD NUMBER:32239
*/
-#define PRODUCT_VER_STRING "3.0.0.32233"
-#define FILE_VER_STRING "WI-V3.0.0.32233"
-#define LICENSE_VER_STRING "WI-V3.0.0.32233"
-#define FILE_VER_NUMBER 3, 0, 0, 32233
+#define PRODUCT_VER_STRING "3.0.0.32239"
+#define FILE_VER_STRING "WI-V3.0.0.32239"
+#define LICENSE_VER_STRING "WI-V3.0.0.32239"
+#define FILE_VER_NUMBER 3, 0, 0, 32239
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32233"
+#define FB_BUILD_NO "32239"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-18 19:03:49 UTC (rev 62702)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-19 00:09:46 UTC (rev 62703)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32233
+BuildNum=32239
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-20 00:11:31
|
Revision: 62708
http://sourceforge.net/p/firebird/code/62708
Author: firebirds
Date: 2015-12-20 00:11:28 +0000 (Sun, 20 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-19 23:05:05 UTC (rev 62707)
+++ firebird/trunk/ChangeLog 2015-12-20 00:11:28 UTC (rev 62708)
@@ -1,3 +1,11 @@
+ 2015-12-19 10:43 dimitr
+ M src/jrd/jrd.cpp
+Fixed CORE-4840: Transactions with isc_tpb_autocommit can hang the server.
+
+ 2015-12-19 05:55 dimitr
+ M src/dsql/DdlNodes.epp
+Remove the redundant (no-op) line.
+
2015-12-18 16:57 dimitr
M src/dsql/DdlNodes.epp
Constness.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-19 23:05:05 UTC (rev 62707)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-20 00:11:28 UTC (rev 62708)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32239
+ FORMAL BUILD NUMBER:32241
*/
-#define PRODUCT_VER_STRING "3.0.0.32239"
-#define FILE_VER_STRING "WI-V3.0.0.32239"
-#define LICENSE_VER_STRING "WI-V3.0.0.32239"
-#define FILE_VER_NUMBER 3, 0, 0, 32239
+#define PRODUCT_VER_STRING "3.0.0.32241"
+#define FILE_VER_STRING "WI-V3.0.0.32241"
+#define LICENSE_VER_STRING "WI-V3.0.0.32241"
+#define FILE_VER_NUMBER 3, 0, 0, 32241
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32239"
+#define FB_BUILD_NO "32241"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-19 23:05:05 UTC (rev 62707)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-20 00:11:28 UTC (rev 62708)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32239
+BuildNum=32241
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2015-12-21 17:01:30
|
Revision: 62714
http://sourceforge.net/p/firebird/code/62714
Author: alexpeshkoff
Date: 2015-12-21 17:01:26 +0000 (Mon, 21 Dec 2015)
Log Message:
-----------
Added support for using pascal to access OO API
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/extern/cloop/Makefile
firebird/trunk/extern/cloop/src/cloop/Generator.cpp
firebird/trunk/extern/cloop/src/cloop/Generator.h
firebird/trunk/extern/cloop/src/cloop/Main.cpp
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msg_facs.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/misc/codes.epp
Added Paths:
-----------
firebird/trunk/examples/interfaces/01.create.pas
firebird/trunk/src/misc/pascal/
firebird/trunk/src/misc/pascal/Pascal.Constants.awk
firebird/trunk/src/misc/pascal/Pascal.implementation.pas
firebird/trunk/src/misc/pascal/Pascal.interface.pas
firebird/trunk/src/misc/pascal/fb_get_master_interface.pas
Modified: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2015-12-21 17:01:26 UTC (rev 62714)
@@ -227,10 +227,11 @@
#secureDB (access rights will be set at install time)
cp $BuiltFBDir/$SecurityDatabase ${TargetDir}@FB_SECDBDIR@
- #include (.h files)
+ #include (.h .pas files)
cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@
cp $BuildRootDir/src/include/firebird/*.h ${TargetDir}@FB_INCDIR@/firebird
tar -C $BuildRootDir/src/include/firebird -cf - impl | tar -C ${TargetDir}@FB_INCDIR@/firebird -x
+ cp $BuildRootDir/src/include/gen/Firebird.pas ${TargetDir}@FB_INCDIR@/firebird
chown -R root:root ${TargetDir}@FB_INCDIR@/*.h ${TargetDir}@FB_INCDIR@/firebird/*
chmod -R 0444 ${TargetDir}@FB_INCDIR@/*.h ${TargetDir}@FB_INCDIR@/firebird/*
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/builds/posix/Makefile.in 2015-12-21 17:01:26 UTC (rev 62714)
@@ -81,11 +81,34 @@
.PHONY: updateCloopInterfaces updateBuildNum
-updateCloopInterfaces : $(SRC_ROOT)/include/firebird/IdlFbInterfaces.h
+IDL_ROOT=$(SRC_ROOT)/include/firebird
+IDL_FILE=$(IDL_ROOT)/FirebirdInterface.idl
+API_H_FILE=$(IDL_ROOT)/IdlFbInterfaces.h
+API_PAS_FILE=$(SRC_ROOT)/include/gen/Firebird.pas
+PAS_ROOT=$(SRC_ROOT)/misc/pascal
+PASCAL_SOURCES=$(wildcard $(PAS_ROOT)/*)
+TMP_FUNCS=$(TMP_ROOT)/func.pas
+XPB_CONSTS=$(SRC_ROOT)/include/consts_pub.h
+ERR_CONSTS=$(ROOT)/lang_helpers/gds_codes.pas
-$(SRC_ROOT)/include/firebird/IdlFbInterfaces.h: $(SRC_ROOT)/include/firebird/FirebirdInterface.idl
+updateCloopInterfaces : $(API_H_FILE) $(API_PAS_FILE)
+
+$(API_H_FILE): $(IDL_FILE)
$(CLOOP) $< c++ $@ IDL_FB_INTERFACES_H Firebird I
+$(TMP_FUNCS): $(PASCAL_SOURCES) $(XPB_CONSTS) $(ERR_CONSTS)
+ cat $(PAS_ROOT)/fb_get_master_interface.pas >$(TMP_FUNCS)
+ awk -f $(PAS_ROOT)/Pascal.Constants.awk <$(XPB_CONSTS) >>$(TMP_FUNCS)
+ grep '[[:space:]]isc_' $(ERR_CONSTS) >>$(TMP_FUNCS)
+
+$(API_PAS_FILE): $(IDL_FILE) $(PASCAL_SOURCES) $(TMP_FUNCS)
+ $(CLOOP) $(IDL_FILE) pascal $@ Firebird --uses SysUtils \
+ --interfaceFile $(PAS_ROOT)/Pascal.interface.pas \
+ --implementationFile $(PAS_ROOT)/Pascal.implementation.pas \
+ --exceptionClass FbException \
+ --functionsFile $(TMP_FUNCS) \
+ --prefix I
+
updateBuildNum : $(SRC_ROOT)/jrd/build_no.h $(GEN_ROOT)/Make.Version
$(SRC_ROOT)/jrd/build_no.h : $(SRC_ROOT)/misc/writeBuildNum.sh
@@ -667,6 +690,8 @@
clean_objects:
$(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print`
$(RM) `find $(TMP_ROOT)/ -type f -name '*.a' -print`
+ $(RM) `find $(TMP_ROOT)/ -type f -name '*.cpp' -print`
+ $(RM) `find $(TMP_ROOT)/ -type f -name '*.pas' -print`
clean_extern_objects:
$(RM) `find $(ROOT)/extern/ -type f -name '*.lo' -print`
Added: firebird/trunk/examples/interfaces/01.create.pas
===================================================================
--- firebird/trunk/examples/interfaces/01.create.pas (rev 0)
+++ firebird/trunk/examples/interfaces/01.create.pas 2015-12-21 17:01:26 UTC (rev 62714)
@@ -0,0 +1,137 @@
+{
+ * PROGRAM: Object oriented API samples.
+ * MODULE: 01.create.pas
+ * DESCRIPTION: A sample of creating new database and new table in it.
+ * Run second time (when database already exists) to see
+ * how FbException is caught and handled by this code.
+ *
+ * Example for the following interfaces:
+ * IMaster - main inteface to access all the rest
+ * Status - returns the status of executed command
+ * Provider - main interface to access DB / service
+ * Attachment - database attachment interface
+ * Transaction - transaction interface
+ * Util - helper calls here and there
+ * XpbBuilder - build various parameters blocks
+ *
+ * Run something like this to build: fpc -Fu<path-to-Firebird.pas> -Mdelphi 01.create.pas
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+ *
+ * Software distributed under the License is distributed AS IS,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights
+ * and limitations under the License.
+ *
+ * The Original Code was created by Alexander Peshkoff
+ * for the Firebird Open Source RDBMS project.
+ *
+ * Copyright (c) 2015 Alexander Peshkoff <pes...@ma...>
+ * and all contributors signed below.
+ *
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________. }
+
+Program create;
+
+uses Sysutils, Firebird;
+
+var
+ // Declare pointers to required interfaces
+
+ // Status is used to return wide error description to user
+ st : IStatus;
+
+ // This is main interface of firebird, and the only one
+ // for getting which there is special function in our API
+ master : IMaster;
+ util : IUtil;
+
+ // XpbBuilder helps to create various parameter blocks for API calls
+ dpb : IXpbBuilder;
+
+ // Provider is needed to start to work with database (or service)
+ prov : IProvider;
+
+ // Attachment and Transaction contain methods to work with
+ // database attachment and transactions
+ att : IAttachment;
+ tra : ITransaction;
+
+ procedure PrintError(s : IStatus);
+ var
+ maxMessage : Integer;
+ outMessage : PAnsiChar;
+ begin
+ maxMessage := 256;
+ outMessage := StrAlloc(maxMessage);
+ util.formatStatus(outMessage, maxMessage, s);
+ writeln (outMessage);
+ StrDispose(outMessage);
+ end;
+
+begin
+ // Here we get access to master interface and helper utility interface
+ // no error return may happen - these functions always succeed
+ master := fb_get_master_interface;
+ util := master.getUtilInterface;
+
+ // status vector and main dispatcher are returned by calls to IMaster functions
+ // no error return may happen - these functions always succeed
+ st := master.getStatus;
+ prov := master.getDispatcher;
+
+ try
+ // create DPB
+ dpb := util.getXpbBuilder(st, IXpbBuilder.DPB, nil, 0);
+ dpb.insertInt(st, isc_dpb_page_size, 4 * 1024);
+ dpb.insertString(st, isc_dpb_user_name, 'sysdba');
+ dpb.insertString(st, isc_dpb_password, 'masterkey');
+
+ // create empty database
+ att := prov.createDatabase(st, 'fbtests.fdb', dpb.getBufferLength(st), dpb.getBuffer(st));
+ writeln ('Database fbtests.fdb created');
+
+ // detach from database
+ att.detach(st);
+ att := nil;
+
+ // attach it once again
+ att := prov.attachDatabase(st, 'fbtests.fdb', dpb.getBufferLength(st), dpb.getBuffer(st));
+ writeln ('Re-attached database fbtests.fdb');
+
+ // start transaction
+ tra := att.startTransaction(st, 0, nil);
+
+ // create table
+ att.execute(st, tra, 0, 'create table dates_table (d1 date)', 3,
+ nil, nil, nil, nil); // Input parameters and output data not used
+
+ // commit transaction retaining
+ tra.commitRetaining(st);
+ writeln ('Table dates_table created');
+
+ // insert a record into dates_table
+ att.execute(st, tra, 0, 'insert into dates_table values (CURRENT_DATE)', 3,
+ nil, nil, nil, nil); // Input parameters and output data not used
+
+ // commit transaction (will close interface)
+ tra.commit(st);
+ tra := nil;
+
+ writeln ('Record inserted into dates_table');
+
+ // detach from database (will close interface)
+ att.detach(st);
+ att := nil;
+
+ except
+ on e: FbException do PrintError(e.getStatus);
+ end;
+
+ prov.release;
+end.
Property changes on: firebird/trunk/examples/interfaces/01.create.pas
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/extern/cloop/Makefile
===================================================================
--- firebird/trunk/extern/cloop/Makefile 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/extern/cloop/Makefile 2015-12-21 17:01:26 UTC (rev 62714)
@@ -96,9 +96,11 @@
$(SRC_DIR)/tests/test1/Interface.idl \
$(SRC_DIR)/tests/test1/CalcPascalApi.interface.pas \
$(SRC_DIR)/tests/test1/CalcPascalApi.implementation.pas
- $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl pascal $@ CalcPascalApi "SysUtils" \
- $(SRC_DIR)/tests/test1/CalcPascalApi.interface.pas \
- $(SRC_DIR)/tests/test1/CalcPascalApi.implementation.pas CalcException
+ $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl pascal $@ CalcPascalApi \
+ --uses "SysUtils" \
+ --interfaceFile $(SRC_DIR)/tests/test1/CalcPascalApi.interface.pas \
+ --implementationFile $(SRC_DIR)/tests/test1/CalcPascalApi.implementation.pas \
+ --exceptionClass CalcException
$(SRC_DIR)/tests/test1/CppTest.cpp: $(SRC_DIR)/tests/test1/CalcCppApi.h
Modified: firebird/trunk/extern/cloop/src/cloop/Generator.cpp
===================================================================
--- firebird/trunk/extern/cloop/src/cloop/Generator.cpp 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/extern/cloop/src/cloop/Generator.cpp 2015-12-21 17:01:26 UTC (rev 62714)
@@ -866,14 +866,15 @@
PascalGenerator::PascalGenerator(const string& filename, const string& prefix, Parser* parser,
const string& unitName, const std::string& additionalUses, const std::string& interfaceFile,
- const std::string& implementationFile, const std::string& exceptionClass)
+ const std::string& implementationFile, const std::string& exceptionClass, const std::string& functionsFile)
: FileGenerator(filename, prefix),
parser(parser),
unitName(unitName),
additionalUses(additionalUses),
interfaceFile(interfaceFile),
implementationFile(implementationFile),
- exceptionClass(exceptionClass)
+ exceptionClass(exceptionClass),
+ functionsFile(functionsFile)
{
}
@@ -900,7 +901,7 @@
++i)
{
Interface* interface = *i;
- fprintf(out, "\t%s = class;\n", escapeName(interface->name).c_str());
+ fprintf(out, "\t%s = class;\n", escapeName(interface->name, true).c_str());
}
fprintf(out, "\n");
@@ -958,9 +959,9 @@
!method->returnTypeRef.isPointer;
fprintf(out, "\t%s_%sPtr = %s(this: %s",
- escapeName(interface->name).c_str(), escapeName(method->name).c_str(),
+ escapeName(interface->name, true).c_str(), escapeName(method->name).c_str(),
(isProcedure ? "procedure" : "function"),
- escapeName(interface->name).c_str());
+ escapeName(interface->name, true).c_str());
for (vector<Parameter*>::iterator k = method->parameters.begin();
k != method->parameters.end();
@@ -990,7 +991,7 @@
fprintf(out, "\t%sVTable = class", escapeName(interface->name).c_str());
if (interface->super)
- fprintf(out, "(%sVTable)", interface->super->name.c_str());
+ fprintf(out, "(%sVTable)", escapeName(interface->super->name).c_str());
fprintf(out, "\n");
@@ -1004,15 +1005,15 @@
Method* method = *j;
fprintf(out, "\t\t%s: %s_%sPtr;\n", escapeName(method->name).c_str(),
- escapeName(interface->name).c_str(), escapeName(method->name).c_str());
+ escapeName(interface->name, true).c_str(), escapeName(method->name).c_str());
}
fprintf(out, "\tend;\n\n");
- fprintf(out, "\t%s = class", escapeName(interface->name).c_str());
+ fprintf(out, "\t%s = class", escapeName(interface->name, true).c_str());
if (interface->super)
- fprintf(out, "(%s)", interface->super->name.c_str());
+ fprintf(out, "(%s)", escapeName(interface->super->name, true).c_str());
fprintf(out, "\n");
@@ -1076,7 +1077,7 @@
fprintf(out, "\tend;\n\n");
fprintf(out, "\t%sImpl = class(%s)\n",
- escapeName(interface->name).c_str(), escapeName(interface->name).c_str());
+ escapeName(interface->name, true).c_str(), escapeName(interface->name, true).c_str());
fprintf(out, "\t\tconstructor create;\n\n");
deque<Method*> methods;
@@ -1118,6 +1119,8 @@
fprintf(out, "\tend;\n\n");
}
+ insertFile(functionsFile);
+
fprintf(out, "implementation\n\n");
for (vector<Interface*>::iterator i = parser->interfaces.begin();
@@ -1137,7 +1140,7 @@
fprintf(out, "%s %s.%s(",
(isProcedure ? "procedure" : "function"),
- escapeName(interface->name).c_str(),
+ escapeName(interface->name, true).c_str(),
escapeName(method->name).c_str());
for (vector<Parameter*>::iterator k = method->parameters.begin();
@@ -1212,9 +1215,9 @@
fprintf(out, "%s %sImpl_%sDispatcher(this: %s",
(isProcedure ? "procedure" : "function"),
- escapeName(interface->name).c_str(),
+ escapeName(interface->name, true).c_str(),
escapeName(method->name).c_str(),
- escapeName(interface->name).c_str());
+ escapeName(interface->name, true).c_str());
for (vector<Parameter*>::iterator k = method->parameters.begin();
k != method->parameters.end();
@@ -1241,7 +1244,7 @@
if (!isProcedure)
fprintf(out, "Result := ");
- fprintf(out, "%sImpl(this).%s(", escapeName(interface->name).c_str(),
+ fprintf(out, "%sImpl(this).%s(", escapeName(interface->name, true).c_str(),
escapeName(method->name).c_str());
for (vector<Parameter*>::iterator k = method->parameters.begin();
@@ -1279,11 +1282,11 @@
fprintf(out, "var\n");
fprintf(out, "\t%sImpl_vTable: %sVTable;\n\n",
- escapeName(interface->name).c_str(), escapeName(interface->name).c_str());
+ escapeName(interface->name, true).c_str(), escapeName(interface->name).c_str());
- fprintf(out, "constructor %sImpl.create;\n", escapeName(interface->name).c_str());
+ fprintf(out, "constructor %sImpl.create;\n", escapeName(interface->name, true).c_str());
fprintf(out, "begin\n");
- fprintf(out, "\tvTable := %sImpl_vTable;\n", escapeName(interface->name).c_str());
+ fprintf(out, "\tvTable := %sImpl_vTable;\n", escapeName(interface->name, true).c_str());
fprintf(out, "end;\n\n");
}
@@ -1303,18 +1306,18 @@
methods.insert(methods.begin(), p->methods.begin(), p->methods.end());
fprintf(out, "\t%sImpl_vTable := %sVTable.create;\n",
- escapeName(interface->name).c_str(), escapeName(interface->name).c_str());
+ escapeName(interface->name, true).c_str(), escapeName(interface->name).c_str());
fprintf(out, "\t%sImpl_vTable.version := %d;\n",
- escapeName(interface->name).c_str(), (int) methods.size());
+ escapeName(interface->name, true).c_str(), (int) methods.size());
for (deque<Method*>::iterator j = methods.begin(); j != methods.end(); ++j)
{
Method* method = *j;
fprintf(out, "\t%sImpl_vTable.%s := @%sImpl_%sDispatcher;\n",
- escapeName(interface->name).c_str(),
+ escapeName(interface->name, true).c_str(),
escapeName(method->name).c_str(),
- escapeName(interface->name).c_str(),
+ escapeName(interface->name, true).c_str(),
escapeName(method->name).c_str());
}
@@ -1328,7 +1331,7 @@
++i)
{
Interface* interface = *i;
- fprintf(out, "\t%sImpl_vTable.destroy;\n", escapeName(interface->name).c_str());
+ fprintf(out, "\t%sImpl_vTable.destroy;\n", escapeName(interface->name, true).c_str());
}
fprintf(out, "\n");
@@ -1378,6 +1381,10 @@
name = "QWord";
break;
+ case Token::TYPE_IDENTIFIER:
+ name = (typeRef.type == BaseType::TYPE_INTERFACE ? prefix : "") + typeRef.token.text;
+ break;
+
default:
name = typeRef.token.text;
break;
@@ -1397,7 +1404,7 @@
return name;
}
-string PascalGenerator::escapeName(const string& name)
+string PascalGenerator::escapeName(string name, bool interfaceName)
{
//// TODO: Create a table of keywords.
@@ -1408,10 +1415,13 @@
name == "to" ||
name == "type")
{
- return name + "_";
+ name += "_";
}
- else
- return name;
+
+ if (interfaceName)
+ name = prefix + name;
+
+ return name;
}
void PascalGenerator::insertFile(const string& filename)
Modified: firebird/trunk/extern/cloop/src/cloop/Generator.h
===================================================================
--- firebird/trunk/extern/cloop/src/cloop/Generator.h 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/extern/cloop/src/cloop/Generator.h 2015-12-21 17:01:26 UTC (rev 62714)
@@ -122,7 +122,7 @@
PascalGenerator(const std::string& filename, const std::string& prefix, Parser* parser,
const std::string& unitName, const std::string& additionalUses,
const std::string& interfaceFile, const std::string& implementationFile,
- const std::string& exceptionClass);
+ const std::string& exceptionClass, const std::string& functionsFile);
public:
virtual void generate();
@@ -130,7 +130,7 @@
private:
std::string convertParameter(const Parameter& parameter);
std::string convertType(const TypeRef& typeRef);
- std::string escapeName(const std::string& name);
+ std::string escapeName(std::string name, bool interfaceName = false);
void insertFile(const std::string& filename);
@@ -141,6 +141,7 @@
std::string interfaceFile;
std::string implementationFile;
std::string exceptionClass;
+ std::string functionsFile;
std::set<std::string> pointerTypes;
};
Modified: firebird/trunk/extern/cloop/src/cloop/Main.cpp
===================================================================
--- firebird/trunk/extern/cloop/src/cloop/Main.cpp 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/extern/cloop/src/cloop/Main.cpp 2015-12-21 17:01:26 UTC (rev 62714)
@@ -92,14 +92,42 @@
throw runtime_error("Invalid command line parameters for Pascal output.");
string unitName(argv[4]);
- string additionalUses(argc > 5 ? argv[5] : "");
- string interfaceFile(argc > 6 ? argv[6] : "");
- string implementationFile(argc > 7 ? argv[7] : "");
- string exceptionClass(argc > 8 ? argv[8] : "");
- string prefix; //// TODO:
- generator.reset(new PascalGenerator(outFilename, prefix, &parser, unitName,
- additionalUses, interfaceFile, implementationFile, exceptionClass));
+ struct pascalSwitch
+ {
+ const char* sw;
+ string val;
+ };
+ pascalSwitch sw[] = {
+ {"--uses", ""}, {"--interfaceFile", ""}, {"--implementationFile", ""},
+ {"--exceptionClass", ""}, {"--prefix", ""}, {"--functionsFile", ""},
+ {NULL, ""} };
+
+ argv += 5;
+ argc -= 5;
+ for (; argc >= 2; argc -= 2, argv += 2)
+ {
+ string key = argv[0];
+ bool found = false;
+ for (pascalSwitch* cur = sw; cur->sw; ++cur)
+ {
+ if (cur->sw == key)
+ {
+ if (!cur->val.empty())
+ throw runtime_error("Repeated switch " + key);
+ found = true;
+ cur->val = argv[1];
+ break;
+ }
+ }
+ if (!found)
+ throw runtime_error("Unknown switch " + key);
+ }
+
+ generator.reset(new PascalGenerator(outFilename, sw[4].val/*prefix*/, &parser, unitName,
+ sw[0].val/*additionalUses*/, sw[1].val/*interfaceFile*/,
+ sw[2].val/*implementationFile*/, sw[3].val/*exceptionClass*/,
+ sw[5].val/*functionsFile*/));
}
else
throw runtime_error("Invalid output format.");
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-12-21 17:01:26 UTC (rev 62714)
@@ -10,7 +10,7 @@
C -- rights and limitations under the License.
C --
C -- The content of this file was generated by the Firebird project
-C -- using the program jrd/codes.epp
+C -- using the program src/misc/codes.epp
C --
C --
C --
@@ -1686,8 +1686,8 @@
PARAMETER (GDS__dsql_dialect_warning_expr = 336003076)
INTEGER*4 GDS__sql_db_dialect_dtype_unsupport
PARAMETER (GDS__sql_db_dialect_dtype_unsupport = 336003077)
- INTEGER*4 GDS__isc_sql_dialect_conflict_num
- PARAMETER (GDS__isc_sql_dialect_conflict_num = 336003079)
+ INTEGER*4 GDS__sql_dialect_conflict_num
+ PARAMETER (GDS__sql_dialect_conflict_num = 336003079)
INTEGER*4 GDS__dsql_warning_number_ambiguous
PARAMETER (GDS__dsql_warning_number_ambiguous = 336003080)
INTEGER*4 GDS__dsql_warning_number_ambiguous1
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-12-21 13:34:19 UTC (rev 62713)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-12-21 17:01:26 UTC (rev 62714)
@@ -10,7 +10,7 @@
* rights and limitations under the License.
*
* The content of this file was generated by the Firebird project
- * using the program jrd/codes.epp
+ * using the program src/misc/codes.epp
*)
(*
*
@@ -19,9 +19,23 @@
*)
const
+ isc_facility = 20;
+ isc_err_base = 335544320;
+ isc_err_factor = 1;
gds_facility = 20;
gds_err_base = 335544320;
gds_err_factor = 1;
+
+ isc_arg_end = 0; (* end of argument list *)
+ isc_arg_gds = 1; (* generic DSRI status value *)
+ isc_arg_string = 2; (* string argument *)
+ isc_arg_cstring = 3; (* count & string argument *)
+ isc_arg_number = 4; (* numeric argument (long) *)
+ isc_arg_interpreted = 5; (* interpreted status code (string) *)
+ isc_arg_vms = 6; (* VAX/VMS status code (long) *)
+ isc_arg_unix = 7; (* UNIX error code *)
+ isc_arg_domain = 8; (* Apollo/Domain error code *)
+ isc_arg_dos = 9; (* MSDOS/OS2 error code *)
gds_arg_end = 0; (* end of argument list *)
gds_arg_gds = 1; (* generic DSRI status value *)
gds_arg_string = 2; (* string argument *)
@@ -33,1251 +47,2499 @@
gds_arg_domain = 8; (* Apollo/Domain error code *)
gds_arg_dos = 9; (* MSDOS/OS2 error code *)
+ isc_arith_except = 335544321;
gds_arith_except = 335544321;
+ isc_bad_dbkey = 335544322;
gds_bad_dbkey = 335544322;
+ isc_bad_db_format = 335544323;
gds_bad_db_format = 335544323;
+ isc_bad_db_handle = 335544324;
gds_bad_db_handle = 335544324;
+ isc_bad_dpb_content = 335544325;
gds_bad_dpb_content = 335544325;
+ isc_bad_dpb_form = 335544326;
gds_bad_dpb_form = 335544326;
+ isc_bad_req_handle = 335544327;
gds_bad_req_handle = 335544327;
+ isc_bad_segstr_handle = 335544328;
gds_bad_segstr_handle = 335544328;
+ isc_bad_segstr_id = 335544329;
gds_bad_segstr_id = 335544329;
+ isc_bad_tpb_content = 335544330;
gds_bad_tpb_content = 335544330;
+ isc_bad_tpb_form = 335544331;
gds_bad_tpb_form = 335544331;
+ isc_bad_trans_handle = 335544332;
gds_bad_trans_handle = 335544332;
+ isc_bug_check = 335544333;
gds_bug_check = 335544333;
+ isc_convert_error = 335544334;
gds_convert_error = 335544334;
+ isc_db_corrupt = 335544335;
gds_db_corrupt = 335544335;
+ isc_deadlock = 335544336;
gds_deadlock = 335544336;
+ isc_excess_trans = 335544337;
gds_excess_trans = 335544337;
+ isc_from_no_match = 335544338;
gds_from_no_match = 335544338;
+ isc_infinap = 335544339;
gds_infinap = 335544339;
+ isc_infona = 335544340;
gds_infona = 335544340;
+ isc_infunk = 335544341;
gds_infunk = 335544341;
+ isc_integ_fail = 335544342;
gds_integ_fail = 335544342;
+ isc_invalid_blr = 335544343;
gds_invalid_blr = 335544343;
+ isc_io_error = 335544344;
gds_io_error = 335544344;
+ isc_lock_conflict = 335544345;
gds_lock_conflict = 335544345;
+ isc_metadata_corrupt = 335544346;
gds_metadata_corrupt = 335544346;
+ isc_not_valid = 335544347;
gds_not_valid = 335544347;
+ isc_no_cur_rec = 335544348;
gds_no_cur_rec = 335544348;
+ isc_no_dup = 335544349;
gds_no_dup = 335544349;
+ isc_no_finish = 335544350;
gds_no_finish = 335544350;
+ isc_no_meta_update = 335544351;
gds_no_meta_update = 335544351;
+ isc_no_priv = 335544352;
gds_no_priv = 335544352;
+ isc_no_recon = 335544353;
gds_no_recon = 335544353;
+ isc_no_record = 335544354;
gds_no_record = 335544354;
+ isc_no_segstr_close = 335544355;
gds_no_segstr_close = 335544355;
+ isc_obsolete_metadata = 335544356;
gds_obsolete_metadata = 335544356;
+ isc_open_trans = 335544357;
gds_open_trans = 335544357;
+ isc_port_len = 335544358;
gds_port_len = 335544358;
+ isc_read_only_field = 335544359;
gds_read_only_field = 335544359;
+ isc_read_only_rel = 335544360;
gds_read_only_rel = 335544360;
+ isc_read_only_trans = 335544361;
gds_read_only_trans = 335544361;
+ isc_read_only_view = 335544362;
gds_read_only_view = 335544362;
+ isc_req_no_trans = 335544363;
gds_req_no_trans = 335544363;
+ isc_req_sync = 335544364;
gds_req_sync = 335544364;
+ isc_req_wrong_db = 335544365;
gds_req_wrong_db = 335544365;
+ isc_segment = 335544366;
gds_segment = 335544366;
+ isc_segstr_eof = 335544367;
gds_segstr_eof = 335544367;
+ isc_segstr_no_op = 335544368;
gds_segstr_no_op = 335544368;
+ isc_segstr_no_read = 335544369;
gds_segstr_no_read = 335544369;
+ isc_segstr_no_trans = 335544370;
gds_segstr_no_trans = 335544370;
+ isc_segstr_no_write = 335544371;
gds_segstr_no_write = 335544371;
+ isc_segstr_wrong_db = 335544372;
gds_segstr_wrong_db = 335544372;
+ isc_sys_request = 335544373;
gds_sys_request = 335544373;
+ isc_stream_eof = 335544374;
gds_stream_eof = 335544374;
+ isc_unavailable = 335544375;
gds_unavailable = 335544375;
+ isc_unres_rel = 335544376;
gds_unres_rel = 335544376;
+ isc_uns_ext = 335544377;
gds_uns_ext = 335544377;
+ isc_wish_list = 335544378;
gds_wish_list = 335544378;
+ isc_wrong_ods = 335544379;
gds_wrong_ods = 335544379;
+ isc_wronumarg = 335544380;
gds_wronumarg = 335544380;
+ isc_imp_exc = 335544381;
gds_imp_exc = 335544381;
+ isc_random = 335544382;
gds_random = 335544382;
+ isc_fatal_conflict = 335544383;
gds_fatal_conflict = 335544383;
+ isc_badblk = 335544384;
gds_badblk = 335544384;
+ isc_invpoolcl = 335544385;
gds_invpoolcl = 335544385;
+ isc_nopoolids = 335544386;
gds_nopoolids = 335544386;
+ isc_relbadblk = 335544387;
gds_relbadblk = 335544387;
+ isc_blktoobig = 335544388;
gds_blktoobig = 335544388;
+ isc_bufexh = 335544389;
gds_bufexh = 335544389;
+ isc_syntaxerr = 335544390;
gds_syntaxerr = 335544390;
+ isc_bufinuse = 335544391;
gds_bufinuse = 335544391;
+ isc_bdbincon = 335544392;
gds_bdbincon = 335544392;
+ isc_reqinuse = 335544393;
gds_reqinuse = 335544393;
+ isc_badodsver = 335544394;
gds_badodsver = 335544394;
+ isc_relnotdef = 335544395;
gds_relnotdef = 335544395;
+ isc_fldnotdef = 335544396;
gds_fldnotdef = 335544396;
+ isc_dirtypage = 335544397;
gds_dirtypage = 335544397;
+ isc_waifortra = 335544398;
gds_waifortra = 335544398;
+ isc_doubleloc = 335544399;
gds_doubleloc = 335544399;
+ isc_nodnotfnd = 335544400;
gds_nodnotfnd = 335544400;
+ isc_dupnodfnd = 335544401;
gds_dupnodfnd = 335544401;
+ isc_locnotmar = 335544402;
gds_locnotmar = 335544402;
+ isc_badpagtyp = 335544403;
gds_badpagtyp = 335544403;
+ isc_corrupt = 335544404;
gds_corrupt = 335544404;
+ isc_badpage = 335544405;
gds_badpage = 335544405;
+ isc_badindex = 335544406;
gds_badindex = 335544406;
+ isc_dbbnotzer = 335544407;
gds_dbbnotzer = 335544407;
+ isc_tranotzer = 335544408;
gds_tranotzer = 335544408;
+ isc_trareqmis = 335544409;
gds_trareqmis = 335544409;
+ isc_badhndcnt = 335544410;
gds_badhndcnt = 335544410;
+ isc_wrotpbver = 335544411;
gds_wrotpbver = 335544411;
+ isc_wroblrver = 335544412;
gds_wroblrver = 335544412;
+ isc_wrodpbver = 335544413;
gds_wrodpbver = 335544413;
+ isc_blobnotsup = 335544414;
gds_blobnotsup = 335544414;
+ isc_badrelation = 335544415;
gds_badrelation = 335544415;
+ isc_nodetach = 335544416;
gds_nodetach = 335544416;
+ isc_notremote = 335544417;
gds_notremote = 335544417;
+ isc_trainlim = 335544418;
gds_trainlim = 335544418;
+ isc_notinlim = 335544419;
gds_notinlim = 335544419;
+ isc_traoutsta = 335544420;
gds_traoutsta = 335544420;
+ isc_connect_reject = 335544421;
gds_connect_reject = 335544421;
+ isc_dbfile = 335544422;
gds_dbfile = 335544422;
+ isc_orphan = 335544423;
gds_orphan = 335544423;
+ isc_no_lock_mgr = 335544424;
gds_no_lock_mgr = 335544424;
+ isc_ctxinuse = 335544425;
gds_ctxinuse = 335544425;
+ isc_ctxnotdef = 335544426;
gds_ctxnotdef = 335544426;
+ isc_datnotsup = 335544427;
gds_datnotsup = 335544427;
+ isc_badmsgnum = 335544428;
gds_badmsgnum = 335544428;
+ isc_badparnum = 335544429;
gds_badparnum = 335544429;
+ isc_virmemexh = 335544430;
gds_virmemexh = 335544430;
+ isc_blocking_signal = 335544431;
gds_blocking_signal = 335544431;
+ isc_lockmanerr = 335544432;
gds_lockmanerr = 335544432;
+ isc_journerr = 335544433;
gds_journerr = 335544433;
+ isc_keytoobig = 335544434;
gds_keytoobig = 335544434;
+ isc_nullsegkey = 335544435;
gds_nullsegkey = 335544435;
+ isc_sqlerr = 335544436;
gds_sqlerr = 335544436;
+ isc_wrodynver = 335544437;
gds_wrodynver = 335544437;
+ isc_funnotdef = 335544438;
gds_funnotdef = 335544438;
+ isc_funmismat = 335544439;
gds_funmismat = 335544439;
+ isc_bad_msg_vec = 335544440;
gds_bad_msg_vec = 335544440;
+ isc_bad_detach = 335544441;
gds_bad_detach = 335544441;
+ isc_noargacc_read = 335544442;
gds_noargacc_read = 335544442;
+ isc_noargacc_write = 335544443;
gds_noargacc_write = 335544443;
+ isc_read_only = 335544444;
gds_read_only = 335544444;
+ isc_ext_err = 335544445;
gds_ext_err = 335544445;
+ isc_non_updatable = 335544446;
gds_non_updatable = 335544446;
+ isc_no_rollback = 335544447;
gds_no_rollback = 335544447;
+ isc_bad_sec_info = 335544448;
gds_bad_sec_info = 335544448;
+ isc_invalid_sec_info = 335544449;
gds_invalid_sec_info = 335544449;
+ isc_misc_interpreted = 335544450;
gds_misc_interpreted = 335544450;
+ isc_update_conflict = 335544451;
gds_update_conflict = 335544451;
+ isc_unlicensed = 335544452;
gds_unlicensed = 335544452;
+ isc_obj_in_use = 335544453;
gds_obj_in_use = 335544453;
+ isc_nofilter = 335544454;
gds_nofilter = 335544454;
+ isc_shadow_accessed = 335544455;
gds_shadow_accessed = 335544455;
+ isc_invalid_sdl = 335544456;
gds_invalid_sdl = 335544456;
+ isc_out_of_bounds = 335544457;
gds_out_of_bounds = 335544457;
+ isc_invalid_dimension = 335544458;
gds_invalid_dimension = 335544458;
+ isc_rec_in_limbo = 335544459;
gds_rec_in_limbo = 335544459;
+ isc_shadow_missing = 335544460;
gds_shadow_missing = 335544460;
+ isc_cant_validate = 335544461;
gds_cant_validate = 335544461;
+ isc_cant_start_journal = 335544462;
gds_cant_start_journal = 335544462;
+ isc_gennotdef = 335544463;
gds_gennotdef = 335544463;
+ isc_cant_start_logging = 335544464;
gds_cant_start_logging = 335544464;
+ isc_bad_segstr_type = 335544465;
gds_bad_segstr_type = 335544465;
+ isc_foreign_key = 335544466;
gds_foreign_key = 335544466;
+ isc_high_minor = 335544467;
gds_high_minor = 335544467;
+ isc_tra_state = 335544468;
gds_tra_state = 335544468;
+ isc_trans_invalid = 335544469;
gds_trans_invalid = 335544469;
+ isc_buf_invalid = 335544470;
gds_buf_invalid = 335544470;
+ isc_indexnotdefined = 335544471;
gds_indexnotdefined = 335544471;
+ isc_login = 335544472;
gds_login = 335544472;
+ isc_invalid_bookmark = 335544473;
gds_invalid_bookmark = 335544473;
+ isc_bad_lock_level = 335544474;
gds_bad_lock_level = 335544474;
+ isc_relation_lock = 335544475;
gds_relation_lock = 335544475;
+ isc_record_lock = 335544476;
gds_record_lock = 335544476;
+ isc_max_idx = 335544477;
gds_max_idx = 335544477;
+ isc_jrn_enable = 335544478;
gds_jrn_enable = 335544478;
+ isc_old_failure = 335544479;
gds_old_failure = 335544479;
+ isc_old_in_progress = 335544480;
gds_old_in_progress = 335544480;
+ isc_old_no_space = 335544481;
gds_old_no_space = 335544481;
+ isc_no_wal_no_jrn = 335544482;
gds_no_wal_no_jrn = 335544482;
+ isc_num_old_files = 335544483;
gds_num_old_files = 335544483;
+ isc_wal_file_open = 335544484;
gds_wal_file_open = 335544484;
+ isc_bad_stmt_handle = 335544485;
gds_bad_stmt_handle = 335544485;
+ isc_wal_failure = 335544486;
gds_wal_failure = 335544486;
+ isc_walw_err = 335544487;
gds_walw_err = 335544487;
+ isc_logh_small = 335544488;
gds_logh_small = 335544488;
+ isc_logh_inv_version = 335544489;
gds_logh_inv_version = 335544489;
+ isc_logh_open_flag = 335544490;
gds_logh_open_flag = 335544490;
+ isc_logh_open_flag2 = 335544491;
gds_logh_open_flag2 = 335544491;
+ isc_logh_diff_dbname = 335544492;
gds_logh_diff_dbname = 335544492;
+ isc_logf_unexpected_eof = 335544493;
gds_logf_unexpected_eof = 335544493;
+ isc_logr_incomplete = 335544494;
gds_logr_incomplete = 335544494;
+ isc_logr_header_small = 335544495;
gds_logr_header_small = 335544495;
+ isc_logb_small = 335544496;
gds_logb_small = 335544496;
+ isc_wal_illegal_attach = 335544497;
gds_wal_illegal_attach = 335544497;
+ isc_wal_invalid_wpb = 335544498;
gds_wal_invalid_wpb = 335544498;
+ isc_wal_err_rollover = 335544499;
gds_wal_err_rollover = 335544499;
+ isc_no_wal = 335544500;
gds_no_wal = 335544500;
+ isc_drop_wal = 335544501;
gds_drop_wal = 335544501;
+ isc_stream_not_defined = 335544502;
gds_stream_not_defined = 335544502;
+ isc_wal_subsys_error = 335544503;
gds_wal_subsys_error = 335544503;
+ isc_wal_subsys_corrupt = 335544504;
gds_wal_subsys_corrupt = 335544504;
+ isc_no_archive = 335544505;
gds_no_archive = 335544505;
+ isc_shutinprog = 335544506;
gds_shutinprog = 335544506;
+ isc_range_in_use = 335544507;
gds_range_in_use = 335544507;
+ isc_range_not_found = 335544508;
gds_range_not_found = 335544508;
+ isc_charset_not_found = 335544509;
gds_charset_not_found = 335544509;
+ isc_lock_timeout = 335544510;
gds_lock_timeout = 335544510;
+ isc_prcnotdef = 335544511;
gds_prcnotdef = 335544511;
+ isc_prcmismat = 335544512;
gds_prcmismat = 335544512;
+ isc_wal_bugcheck = 335544513;
gds_wal_bugcheck = 335544513;
+ isc_wal_cant_expand = 335544514;
gds_wal_cant_expand = 335544514;
+ isc_codnotdef = 335544515;
gds_codnotdef = 335544515;
+ isc_xcpnotdef = 335544516;
gds_xcpnotdef = 335544516;
+ isc_except = 335544517;
gds_except = 335544517;
+ isc_cache_restart = 335544518;
gds_cache_restart = 335544518;
+ isc_bad_lock_handle = 335544519;
gds_bad_lock_handle = 335544519;
+ isc_jrn_present = 335544520;
gds_jrn_present = 335544520;
+ isc_wal_err_rollover2 = 335544521;
gds_wal_err_rollover2 = 335544521;
+ isc_wal_err_logwrite = 335544522;
gds_wal_err_logwrite = 335544522;
+ isc_wal_err_jrn_comm = 335544523;
gds_wal_err_jrn_comm = 335544523;
+ isc_wal_err_expansion = 335544524;
gds_wal_err_expansion = 335544524;
+ isc_wal_err_setup = 335544525;
gds_wal_err_setup = 335544525;
+ isc_wal_err_ww_sync = 335544526;
gds_wal_err_ww_sync = 335544526;
+ isc_wal_err_ww_start = 335544527;
gds_wal_err_ww_start = 335544527;
+ isc_shutdown = 335544528;
gds_shutdown = 335544528;
+ isc_existing_priv_mod = 335544529;
gds_existing_priv_mod = 335544529;
+ isc_primary_key_ref = 335544530;
gds_primary_key_ref = 335544530;
+ isc_primary_key_notnull = 335544531;
gds_primary_key_notnull = 335544531;
+ isc_ref_cnstrnt_notfound = 335544532;
gds_ref_cnstrnt_notfound = 335544532;
+ isc_foreign_key_notfound = 335544533;
gds_foreign_key_notfound = 335544533;
+ isc_ref_cnstrnt_update = 335544534;
gds_ref_cnstrnt_update = 335544534;
+ isc_check_cnstrnt_update = 335544535;
gds_check_cnstrnt_update = 335544535;
+ isc_check_cnstrnt_del = 335544536;
gds_check_cnstrnt_del = 335544536;
+ isc_integ_index_seg_del = 335544537;
gds_integ_index_seg_del = 335544537;
+ isc_integ_index_seg_mod = 335544538;
gds_integ_index_seg_mod = 335544538;
+ isc_integ_index_del = 335544539;
gds_integ_index_del = 335544539;
+ isc_integ_index_mod = 335544540;
gds_integ_index_mod = 335544540;
+ isc_check_trig_del = 335544541;
gds_check_trig_del = 335544541;
+ isc_check_trig_update = 335544542;
gds_check_trig_update = 335544542;
+ isc_cnstrnt_fld_del = 335544543;
gds_cnstrnt_fld_del = 335544543;
+ isc_cnstrnt_fld_rename = 335544544;
gds_cnstrnt_fld_rename = 335544544;
+ isc_rel_cnstrnt_update = 335544545;
gds_rel_cnstrnt_update = 335544545;
+ isc_constaint_on_view = 335544546;
gds_constaint_on_view = 335544546;
+ isc_invld_cnstrnt_type = 335544547;
gds_invld_cnstrnt_type = 335544547;
+ isc_primary_key_exists = 335544548;
gds_primary_key_exists = 335544548;
+ isc_systrig_update = 335544549;
gds_systrig_update = 335544549;
+ isc_not_rel_owner = 335544550;
gds_not_rel_owner = 335544550;
+ isc_grant_obj_notfound = 335544551;
gds_grant_obj_notfound = 335544551;
+ isc_grant_fld_notfound = 335544552;
gds_grant_fld_notfound = 335544552;
+ isc_grant_nopriv = 335544553;
gds_grant_nopriv = 335544553;
+ isc_nonsql_security_rel = 335544554;
gds_nonsql_security_rel = 335544554;
+ isc_nonsql_security_fld = 335544555;
gds_nonsql_security_fld = 335544555;
+ isc_wal_cache_err = 335544556;
gds_wal_cache_err = 335544556;
+ isc_shutfail = 335544557;
gds_shutfail = 335544557;
+ isc_check_constraint = 335544558;
gds_check_constraint = 335544558;
+ isc_bad_svc_handle = 335544559;
gds_bad_svc_handle = 335544559;
+ isc_shutwarn = 335544560;
gds_shutwarn = 335544560;
+ isc_wrospbver = 335544561;
gds_wrospbver = 335544561;
+ isc_bad_spb_form = 335544562;
gds_bad_spb_form = 335544562;
+ isc_svcnotdef = 335544563;
gds_svcnotdef = 335544563;
+ isc_no_jrn = 335544564;
gds_no_jrn = 335544564;
+ isc_transliteration_failed = 335544565;
gds_transliteration_failed = 335544565;
+ isc_start_cm_for_wal = 335544566;
gds_start_cm_for_wal = 335544566;
+ isc_wal_ovflow_log_required = 335544567;
gds_wal_ovflow_log_required = 335544567;
+ isc_text_subtype = 335544568;
gds_text_subtype = 335544568;
+ isc_dsql_error = 335544569;
gds_dsql_error = 335544569;
+ isc_dsql_command_err = 335544570;
gds_dsql_command_err = 335544570;
+ isc_dsql_constant_err = 335544571;
gds_dsql_constant_err = 335544571;
+ isc_dsql_cursor_err = 335544572;
gds_dsql_cursor_err = 335544572;
+ isc_dsql_datatype_err = 335544573;
gds_dsql_datatype_err = 335544573;
+ isc_dsql_decl_err = 335544574;
gds_dsql_decl_err = 335544574;
+ isc_dsql_cursor_update_err = 335544575;
gds_dsql_cursor_update_err = 335544575;
+ isc_dsql_cursor_open_err = 335544576;
gds_dsql_cursor_open_err = 335544576;
+ isc_dsql_cursor_close_err = 335544577;
gds_dsql_cursor_close_err = 335544577;
+ isc_dsql_field_err = 335544578;
gds_dsql_field_err = 335544578;
+ isc_dsql_internal_err = 335544579;
gds_dsql_internal_err = 335544579;
+ isc_dsql_relation_err = 335544580;
gds_dsql_relation_err = 335544580;
+ isc_dsql_procedure_err = 335544581;
gds_dsql_procedure_err = 335544581;
+ isc_dsql_request_err = 335544582;
gds_dsql_request_err = 335544582;
+ isc_dsql_sqlda_err = 335544583;
gds_dsql_sqlda_err = 335544583;
+ isc_dsql_var_count_err = 335544584;
gds_dsql_var_count_err = 335544584;
+ isc_dsql_stmt_handle = 335544585;
gds_dsql_stmt_handle = 335544585;
+ isc_dsql_function_err = 335544586;
gds_dsql_function_err = 335544586;
+ isc_dsql_blob_err = 335544587;
gds_dsql_blob_err = 335544587;
+ isc_collation_not_found = 335544588;
gds_collation_not_found = 335544588;
+ isc_collation_not_for_charset = 335544589;
gds_collation_not_for_charset = 335544589;
+ isc_dsql_dup_option = 335544590;
gds_dsql_dup_option = 335544590;
+ isc_dsql_tran_err = 335544591;
gds_dsql_tran_err = 335544591;
+ isc_dsql_invalid_array = 335544592;
gds_dsql_invalid_array = 335544592;
+ isc_dsql_max_arr_dim_exceeded = 335544593;
gds_dsql_max_arr_dim_exceeded = 335544593;
+ isc_dsql_arr_range_error = 335544594;
gds_dsql_arr_range_error = 335544594;
+ isc_dsql_trigger_err = 335544595;
gds_dsql_trigger_err = 335544595;
+ isc_dsql_subselect_err = 335544596;
gds_dsql_subselect_err = 335544596;
+ isc_dsql_crdb_prepare_err = 335544597;
gds_dsql_crdb_prepare_err = 335544597;
+ isc_specify_field_err = 335544598;
gds_specify_field_err = 335544598;
+ isc_num_field_err = 335544599;
gds_num_field_err = 335544599;
+ isc_col_name_err = 335544600;
gds_col_name_err = 335544600;
+ isc_where_err = 335544601;
gds_where_err = 335544601;
+ isc_table_view_err = 335544602;
gds_table_view_err = 335544602;
+ isc_distinct_err = 335544603;
gds_distinct_err = 335544603;
+ isc_key_field_count_err = 335544604;
gds_key_field_count_err = 335544604;
+ isc_subquery_err = 335544605;
gds_subquery_err = 335544605;
+ isc_expression_eval_err = 335544606;
gds_expression_eval_err = 335544606;
+ isc_node_err = 335544607;
gds_node_err = 335544607;
+ isc_command_end_err = 335544608;
gds_command_end_err = 335544608;
+ isc_index_name = 335544609;
gds_index_name = 335544609;
+ isc_exception_name = 335544610;
gds_exception_name = 335544610;
+ isc_field_name = 335544611;
gds_field_name = 335544611;
+ isc_token_err = 335544612;
gds_token_err = 335544612;
+ isc_union_err = 335544613;
gds_union_err = 335544613;
+ isc_dsql_construct_err = 335544614;
gds_dsql_construct_err = 335544614;
+ isc_field_aggregate_err = 335544615;
gds_field_aggregate_err = 335544615;
+ isc_field_ref_err = 335544616;
gds_field_ref_err = 335544616;
+ isc_order_by_err = 335544617;
gds_order_by_err = 335544617;
+ isc_return_mode_err = 335544618;
gds_return_mode_err = 335544618;
+ isc_extern_func_err = 335544619;
gds_extern_func_err = 335544619;
+ isc_alias_conflict_err = 335544620;
gds_alias_conflict_err = 335544620;
+ isc_procedure_conflict_error = 335544621;
gds_procedure_conflict_error = 335544621;
+ isc_relation_conflict_err = 335544622;
gds_relation_conflict_err = 335544622;
+ isc_dsql_domain_err = 335544623;
gds_dsql_domain_err = 335544623;
+ isc_idx_seg_err = 335544624;
gds_idx_seg_err = 335544624;
+ isc_node_name_err = 335544625;
gds_node_name_err = 335544625;
+ isc_table_name = 335544626;
gds_table_name = 335544626;
+ isc_proc_name = 335544627;
gds_proc_name = 335544627;
+ isc_idx_create_err = 335544628;
gds_idx_create_err = 335544628;
+ isc_wal_shadow_err = 335544629;
gds_wal_shadow_err = 335544629;
+ isc_dependency = 335544630;
gds_dependency = 335544630;
+ isc_idx_key_err = 335544631;
gds_idx_key_err = 335544631;
+ isc_dsql_file_length_err = 335544632;
gds_dsql_file_length_err = 335544632;
+ isc_dsql_shadow_number_err = 335544633;
gds_dsql_shadow_number_err = 335544633;
+ isc_dsql_token_unk_err = 335544634;
gds_dsql_token_unk_err = 335544634;
+ isc_dsql_no_relation_alias = 335544635;
gds_dsql_no_relation_alias = 335544635;
+ isc_indexname = 335544636;
gds_indexname = 335544636;
+ isc_no_stream_plan = 335544637;
gds_no_stream_plan = 335544637;
+ isc_stream_twice = 335544638;
gds_stream_twice = 335544638;
+ isc_stream_not_found = 335544639;
gds_stream_not_found = 335544639;
+ isc_collation_requires_text = 335544640;
gds_collation_requires_text = 335544640;
+ isc_dsql_domain_not_found = 335544641;
gds_dsql_domain_not_found = 335544641;
+ isc_index_unused = 335544642;
gds_index_unused = 335544642;
+ isc_dsql_self_join = 335544643;
gds_dsql_self_join = 335544643;
+ isc_stream_bof = 335544644;
gds_stream_bof = 335544644;
+ isc_stream_crack = 335544645;
gds_stream_crack = 335544645;
+ isc_db_or_file_exists = 335544646;
gds_db_or_file_exists = 335544646;
+ isc_invalid_operator = 335544647;
gds_invalid_operator = 335544647;
+ isc_conn_lost = 335544648;
gds_conn_lost = 335544648;
+ isc_bad_checksum = 335544649;
gds_bad_checksum = 335544649;
+ isc_page_type_err = 335544650;
gds_page_type_err = 335544650;
+ isc_ext_readonly_err = 335544651;
gds_ext_readonly_err = 335544651;
+ isc_sing_select_err = 335544652;
gds_sing_select_err = 335544652;
+ isc_psw_attach = 335544653;
gds_psw_attach = 335544653;
+ isc_psw_start_trans = 335544654;
gds_psw_start_trans = 335544654;
+ isc_invalid_direction = 335544655;
gds_invalid_direction = 335544655;
+ isc_dsql_var_conflict = 335544656;
gds_dsql_var_conflict = 335544656;
+ isc_dsql_no_blob_array = 335544657;
gds_dsql_no_blob_array = 335544657;
+ isc_dsql_base_table = 335544658;
gds_dsql_base_table = 335544658;
+ isc_duplicate_base_table = 335544659;
gds_duplicate_base_table = 335544659;
+ isc_view_alias = 335544660;
gds_view_alias = 335544660;
+ isc_index_root_page_full = 335544661;
gds_index_root_page_full = 335544661;
+ isc_dsql_blob_type_unknown = 335544662;
gds_dsql_blob_type_unknown = 335544662;
+ isc_req_max_clones_exceeded = 335544663;
gds_req_max_clones_exceeded = 335544663;
+ isc_dsql_duplicate_spec = 335544664;
gds_dsql_duplicate_spec = 335544664;
+ isc_unique_key_violation = 335544665;
gds_unique_key_violation = 335544665;
+ isc_srvr_version_too_old = 335544666;
gds_srvr_version_too_old = 335544666;
+ isc_drdb_completed_with_errs = 335544667;
gds_drdb_completed_with_errs = 335544667;
+ isc_dsql_procedure_use_err = 335544668;
gds_dsql_procedure_use_err = 335544668;
+ isc_dsql_count_mismatch = 335544669;
gds_dsql_count_mismatch = 335544669;
+ isc_blob_idx_err = 335544670;
gds_blob_idx_err = 335544670;
+ isc_array_idx_err = 335544671;
gds_array_idx_err = 335544671;
+ isc_key_field_err = 335544672;
gds_key_field_err = 335544672;
+ isc_no_delete = 335544673;
gds_no_delete = 335544673;
+ isc_del_last_field = 335544674;
gds_del_last_field = 335544674;
+ isc_sort_err = 335544675;
gds_sort_err = 335544675;
+ isc_sort_mem_err = 335544676;
gds_sort_mem_err = 335544676;
+ isc_version_err = 335544677;
gds_version_err = 335544677;
+ isc_inval_key_posn = 335544678;
gds_inval_key_posn = 335544678;
+ isc_no_segments_err = 335544679;
gds_no_segments_err = 335544679;
+ isc_crrp_data_err = 335544680;
gds_crrp_data_err ...
[truncated message content] |
|
From: <fir...@us...> - 2015-12-22 00:10:45
|
Revision: 62718
http://sourceforge.net/p/firebird/code/62718
Author: firebirds
Date: 2015-12-22 00:10:42 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-21 20:05:07 UTC (rev 62717)
+++ firebird/trunk/ChangeLog 2015-12-22 00:10:42 UTC (rev 62718)
@@ -1,3 +1,40 @@
+ 2015-12-21 17:01 alexpeshkoff
+ M builds/install/arch-specific/linux/makeInstallImage.sh.in
+ M builds/posix/Makefile.in
+ A examples/interfaces/01.create.pas
+ M extern/cloop/Makefile
+ M extern/cloop/src/cloop/Generator.cpp
+ M extern/cloop/src/cloop/Generator.h
+ M extern/cloop/src/cloop/Main.cpp
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msg_facs.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/misc/codes.epp
+ A src/misc/pascal
+ A src/misc/pascal/Pascal.Constants.awk
+ A src/misc/pascal/Pascal.implementation.pas
+ A src/misc/pascal/Pascal.interface.pas
+ A src/misc/pascal/fb_get_master_interface.pas
+Added support for using pascal to access OO API
+
+ 2015-12-21 13:34 egorpugin
+ M .travis.yml
+[ci] Switch to Ubuntu 14.04.
+
+ 2015-12-21 11:16 alexpeshkoff
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+Fixed strange mistype in error code. This error code is never used in sources, i.e. nothing to fix due to this change.
+
+ 2015-12-21 09:48 dimitr
+ M src/jrd/scl.epp
+Cleaned up the unused routine.
+
2015-12-19 10:43 dimitr
M src/jrd/jrd.cpp
Fixed CORE-4840: Transactions with isc_tpb_autocommit can hang the server.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-21 20:05:07 UTC (rev 62717)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-22 00:10:42 UTC (rev 62718)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32241
+ FORMAL BUILD NUMBER:32245
*/
-#define PRODUCT_VER_STRING "3.0.0.32241"
-#define FILE_VER_STRING "WI-V3.0.0.32241"
-#define LICENSE_VER_STRING "WI-V3.0.0.32241"
-#define FILE_VER_NUMBER 3, 0, 0, 32241
+#define PRODUCT_VER_STRING "3.0.0.32245"
+#define FILE_VER_STRING "WI-V3.0.0.32245"
+#define LICENSE_VER_STRING "WI-V3.0.0.32245"
+#define FILE_VER_NUMBER 3, 0, 0, 32245
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32241"
+#define FB_BUILD_NO "32245"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-21 20:05:07 UTC (rev 62717)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-22 00:10:42 UTC (rev 62718)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32241
+BuildNum=32245
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2015-12-22 17:53:33
|
Revision: 62720
http://sourceforge.net/p/firebird/code/62720
Author: alexpeshkoff
Date: 2015-12-22 17:53:30 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
Fixed CORE-4964: Real errors during connect to security database are hidden by Srp user manager. Errors should be logged no matter what AuthServer is used. (taking into an account Sean's request re. special error for system-related problems)
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/remote/server/server.cpp
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-12-22 17:53:30 UTC (rev 62720)
@@ -1622,6 +1622,8 @@
PARAMETER (GDS__invalid_attachment_charset = 335545104)
INTEGER*4 GDS__map_down
PARAMETER (GDS__map_down = 335545105)
+ INTEGER*4 GDS__login_error
+ PARAMETER (GDS__login_error = 335545106)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-12-22 17:53:30 UTC (rev 62720)
@@ -1617,6 +1617,8 @@
gds_invalid_attachment_charset = 335545104;
isc_map_down = 335545105;
gds_map_down = 335545105;
+ isc_login_error = 335545106;
+ gds_login_error = 335545106;
isc_gfix_db_name = 335740929;
gds_gfix_db_name = 335740929;
isc_gfix_invalid_sw = 335740930;
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-12-22 17:53:30 UTC (rev 62720)
@@ -276,6 +276,7 @@
switch(status->getErrors()[1])
{
case isc_stream_eof: // User name not found in security database
+ status->init();
return AUTH_CONTINUE;
default:
break;
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-12-22 17:53:30 UTC (rev 62720)
@@ -385,28 +385,21 @@
void SecurityDatabase::checkStatus(const char* callName, ISC_STATUS userError)
{
- // showing real problems with security database to users is not good idea
- // from security POV - therefore some generic message is used
- // also suppress throwing errors from destructor which passes userError == 0
-
if (status[1] == 0)
- {
return;
- }
+ // suppress throwing errors from destructor which passes userError == 0
+ if (!userError)
+ return;
+
+ Arg::Gds secDbError(userError);
+
string message;
message.printf("Error in %s() API call when working with legacy security database", callName);
- iscLogStatus(message.c_str(), status);
+ secDbError << Arg::Gds(isc_random) << message;
- if (userError)
- {
-#ifdef DEV_BUILD
- // throw original status error
- status_exception::raise(status);
-#else
- Arg::Gds(userError).raise();
-#endif
- }
+ secDbError << Arg::StatusVector(status);
+ secDbError.raise();
}
typedef HalfStaticArray<SecurityDatabase*, 4> InstancesArray;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/include/gen/codetext.h 2015-12-22 17:53:30 UTC (rev 62720)
@@ -807,6 +807,7 @@
{"domain_primary_key_notnull", 335545103},
{"invalid_attachment_charset", 335545104},
{"map_down", 335545105},
+ {"login_error", 335545106},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/include/gen/iberror.h 2015-12-22 17:53:30 UTC (rev 62720)
@@ -841,6 +841,7 @@
const ISC_STATUS isc_domain_primary_key_notnull = 335545103L;
const ISC_STATUS isc_invalid_attachment_charset = 335545104L;
const ISC_STATUS isc_map_down = 335545105L;
+const ISC_STATUS isc_login_error = 335545106L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1304,7 +1305,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1248;
+const ISC_STATUS isc_err_max = 1249;
#else /* c definitions */
@@ -2115,6 +2116,7 @@
#define isc_domain_primary_key_notnull 335545103L
#define isc_invalid_attachment_charset 335545104L
#define isc_map_down 335545105L
+#define isc_login_error 335545106L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2578,7 +2580,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1248
+#define isc_err_max 1249
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/include/gen/msgs.h 2015-12-22 17:53:30 UTC (rev 62720)
@@ -810,6 +810,7 @@
{335545103, "Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL"}, /* domain_primary_key_notnull */
{335545104, "CHARACTER SET @1 cannot be used as a attachment character set"}, /* invalid_attachment_charset */
{335545105, "Some database(s) were shutdown when trying to read mapping data"}, /* map_down */
+ {335545106, "Error occurred during login, please check server firebird.log for details"}, /* login_error */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/include/gen/sql_code.h 2015-12-22 17:53:30 UTC (rev 62720)
@@ -806,6 +806,7 @@
{335545103, -291}, /* 783 domain_primary_key_notnull */
{335545104, -204}, /* 784 invalid_attachment_charset */
{335545105, -901}, /* 785 map_down */
+ {335545106, -902}, /* 786 login_error */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/include/gen/sql_state.h 2015-12-22 17:53:30 UTC (rev 62720)
@@ -806,6 +806,7 @@
{335545103, "42000"}, // 783 domain_primary_key_notnull
{335545104, "2C000"}, // 784 invalid_attachment_charset
{335545105, "08004"}, // 785 map_down
+ {335545106, "08006"}, // 786 login_error
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/msgs/facilities2.sql 2015-12-22 17:53:30 UTC (rev 62720)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2015-08-17 20:53:01', 'JRD', 0, 786)
+('2015-12-22 20:33:22', 'JRD', 0, 787)
('2015-03-17 18:33:00', 'QLI', 1, 533)
('2015-01-07 18:01:51', 'GFIX', 3, 134)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/msgs/messages2.sql 2015-12-22 17:53:30 UTC (rev 62720)
@@ -893,6 +893,7 @@
('domain_primary_key_notnull', NULL, 'DdlNodes.epp', NULL, 0, 783, NULL, 'Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL', NULL, NULL);
('invalid_attachment_charset', NULL, NULL, NULL, 0, 784, NULL, 'CHARACTER SET @1 cannot be used as a attachment character set', NULL, NULL);
('map_down', NULL, 'Mapping.cpp', NULL, 0, 785, NULL, 'Some database(s) were shutdown when trying to read mapping data', NULL, NULL);
+('login_error', NULL, 'server.cpp', NULL, 0, 786, NULL, 'Error occurred during login, please check server firebird.log for details', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/msgs/system_errors2.sql 2015-12-22 17:53:30 UTC (rev 62720)
@@ -792,6 +792,7 @@
(-291, '42', '000', 0, 783, 'domain_primary_key_notnull', NULL, NULL)
(-204, '2C', '000', 0, 784, 'invalid_attachment_charset', NULL, NULL)
(-901, '08', '004', 0, 785, 'map_down', NULL, NULL)
+(-902, '08', '006', 0, 786, 'login_error', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp 2015-12-22 10:48:36 UTC (rev 62719)
+++ firebird/trunk/src/remote/server/server.cpp 2015-12-22 17:53:30 UTC (rev 62720)
@@ -460,6 +460,7 @@
{
authServer = NULL;
working = false;
+ (Arg::Gds(isc_random) << "Plugin not supported by network protocol").copyTo(&st); // add port_protocol parameter
break;
}
@@ -495,6 +496,7 @@
{
authServer = NULL;
working = false;
+ (Arg::Gds(isc_random) << "Plugin not supported by network protocol").copyTo(&st); // add port_protocol parameter
break;
}
}
@@ -517,14 +519,21 @@
// no success - perform failure processing
loginFail(userName, authPort->getRemoteId());
- Arg::Gds loginError(isc_login);
-#ifndef DEV_BUILD
- if (st.getErrors()[1] == isc_missing_data_structures)
-#endif
+ if (st.hasData())
{
+ if (st.getErrors()[1] == isc_missing_data_structures)
+ status_exception::raise(&st);
+
+ iscLogStatus("Authentication error", &st);
+ Arg::Gds loginError(isc_login_error);
+#ifdef DEV_BUILD
loginError << Arg::StatusVector(&st);
+#endif
+ loginError.raise();
}
- status_exception::raise(loginError.value());
+ else
+ Arg::Gds(isc_login).raise();
+
return false; // compiler warning silencer
}
@@ -6416,11 +6425,13 @@
if (final.getCount() == 0)
{
HANDSHAKE_DEBUG(fprintf(stderr, "Srv: createPluginsItr: No matching plugins on server\n"));
- (Arg::Gds(isc_login)
+
+ Arg::Gds loginError(isc_login_error);
#ifdef DEV_BUILD
- << Arg::Gds(isc_random) << "No matching plugins on server"
+ loginError << Arg::Gds(isc_random) << "No matching plugins on server";
#endif
- ).raise();
+ gds__log("Authentication error\n\tNo matching plugins on server");
+ loginError.raise();
}
// reorder to make it match first, already passed, plugin data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-23 00:10:20
|
Revision: 62722
http://sourceforge.net/p/firebird/code/62722
Author: firebirds
Date: 2015-12-23 00:10:18 +0000 (Wed, 23 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-22 20:01:29 UTC (rev 62721)
+++ firebird/trunk/ChangeLog 2015-12-23 00:10:18 UTC (rev 62722)
@@ -1,3 +1,19 @@
+ 2015-12-22 17:53 alexpeshkoff
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+ M src/remote/server/server.cpp
+Fixed CORE-4964: Real errors during connect to security database are hidden by Srp user manager. Errors should be logged no matter what AuthServer is used. (taking into an account Sean's request re. special error for system-related problems)
+
2015-12-21 17:01 alexpeshkoff
M builds/install/arch-specific/linux/makeInstallImage.sh.in
M builds/posix/Makefile.in
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-22 20:01:29 UTC (rev 62721)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-23 00:10:18 UTC (rev 62722)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32245
+ FORMAL BUILD NUMBER:32246
*/
-#define PRODUCT_VER_STRING "3.0.0.32245"
-#define FILE_VER_STRING "WI-V3.0.0.32245"
-#define LICENSE_VER_STRING "WI-V3.0.0.32245"
-#define FILE_VER_NUMBER 3, 0, 0, 32245
+#define PRODUCT_VER_STRING "3.0.0.32246"
+#define FILE_VER_STRING "WI-V3.0.0.32246"
+#define LICENSE_VER_STRING "WI-V3.0.0.32246"
+#define FILE_VER_NUMBER 3, 0, 0, 32246
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32245"
+#define FB_BUILD_NO "32246"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-22 20:01:29 UTC (rev 62721)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-23 00:10:18 UTC (rev 62722)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32245
+BuildNum=32246
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-24 00:09:41
|
Revision: 62725
http://sourceforge.net/p/firebird/code/62725
Author: firebirds
Date: 2015-12-24 00:09:39 +0000 (Thu, 24 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-23 19:42:49 UTC (rev 62724)
+++ firebird/trunk/ChangeLog 2015-12-24 00:09:39 UTC (rev 62725)
@@ -1,3 +1,14 @@
+ 2015-12-23 19:42 hvlad
+ M builds/win32/make_examples.bat
+Build and copy udrcpp_example.dll
+
+ 2015-12-23 19:10 hvlad
+ M builds/install/misc/plugins.conf
+ M builds/win32/msvc10/udr_engine.vcxproj.filters
+ M builds/win32/msvc10/udrcpp_example.vcxproj
+ M builds/win32/msvc10/udrcpp_example.vcxproj.filters
+Fixed MSVC10 build of UDR examples
+
2015-12-22 17:53 alexpeshkoff
M lang_helpers/gds_codes.ftn
M lang_helpers/gds_codes.pas
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-23 19:42:49 UTC (rev 62724)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-24 00:09:39 UTC (rev 62725)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32246
+ FORMAL BUILD NUMBER:32248
*/
-#define PRODUCT_VER_STRING "3.0.0.32246"
-#define FILE_VER_STRING "WI-V3.0.0.32246"
-#define LICENSE_VER_STRING "WI-V3.0.0.32246"
-#define FILE_VER_NUMBER 3, 0, 0, 32246
+#define PRODUCT_VER_STRING "3.0.0.32248"
+#define FILE_VER_STRING "WI-V3.0.0.32248"
+#define LICENSE_VER_STRING "WI-V3.0.0.32248"
+#define FILE_VER_NUMBER 3, 0, 0, 32248
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32246"
+#define FB_BUILD_NO "32248"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-23 19:42:49 UTC (rev 62724)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-24 00:09:39 UTC (rev 62725)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32246
+BuildNum=32248
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-25 00:09:26
|
Revision: 62727
http://sourceforge.net/p/firebird/code/62727
Author: firebirds
Date: 2015-12-25 00:09:23 +0000 (Fri, 25 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-24 11:17:13 UTC (rev 62726)
+++ firebird/trunk/ChangeLog 2015-12-25 00:09:23 UTC (rev 62727)
@@ -1,3 +1,7 @@
+ 2015-12-24 11:17 alexpeshkoff
+ M src/misc/src_bundle.sh
+Fixed CORE-5008: add missing cmake files to fb3 linux tarball
+
2015-12-23 19:42 hvlad
M builds/win32/make_examples.bat
Build and copy udrcpp_example.dll
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-24 11:17:13 UTC (rev 62726)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-25 00:09:23 UTC (rev 62727)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32248
+ FORMAL BUILD NUMBER:32249
*/
-#define PRODUCT_VER_STRING "3.0.0.32248"
-#define FILE_VER_STRING "WI-V3.0.0.32248"
-#define LICENSE_VER_STRING "WI-V3.0.0.32248"
-#define FILE_VER_NUMBER 3, 0, 0, 32248
+#define PRODUCT_VER_STRING "3.0.0.32249"
+#define FILE_VER_STRING "WI-V3.0.0.32249"
+#define LICENSE_VER_STRING "WI-V3.0.0.32249"
+#define FILE_VER_NUMBER 3, 0, 0, 32249
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32248"
+#define FB_BUILD_NO "32249"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-24 11:17:13 UTC (rev 62726)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-25 00:09:23 UTC (rev 62727)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32248
+BuildNum=32249
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-26 00:09:58
|
Revision: 62732
http://sourceforge.net/p/firebird/code/62732
Author: firebirds
Date: 2015-12-26 00:09:56 +0000 (Sat, 26 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-25 18:19:49 UTC (rev 62731)
+++ firebird/trunk/ChangeLog 2015-12-26 00:09:56 UTC (rev 62732)
@@ -1,3 +1,16 @@
+ 2015-12-25 18:19 alexpeshkoff
+ M builds/install/arch-specific/linux/linuxLibrary.sh.in
+ M builds/install/posix-common/posixLibrary.sh.in
+ M builds/install/posix-common/preinstall.sh.in
+Fixed CORE-4842: Installer script fails in some linux environments
+
+ 2015-12-25 01:08 robocop
+ M src/jrd/CryptoManager.cpp
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/os/win32/xnet.h
+ M src/remote/server/os/posix/inet_server.cpp
+Misc.
+
2015-12-24 11:17 alexpeshkoff
M src/misc/src_bundle.sh
Fixed CORE-5008: add missing cmake files to fb3 linux tarball
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-25 18:19:49 UTC (rev 62731)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-26 00:09:56 UTC (rev 62732)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32249
+ FORMAL BUILD NUMBER:32251
*/
-#define PRODUCT_VER_STRING "3.0.0.32249"
-#define FILE_VER_STRING "WI-V3.0.0.32249"
-#define LICENSE_VER_STRING "WI-V3.0.0.32249"
-#define FILE_VER_NUMBER 3, 0, 0, 32249
+#define PRODUCT_VER_STRING "3.0.0.32251"
+#define FILE_VER_STRING "WI-V3.0.0.32251"
+#define LICENSE_VER_STRING "WI-V3.0.0.32251"
+#define FILE_VER_NUMBER 3, 0, 0, 32251
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32249"
+#define FB_BUILD_NO "32251"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-25 18:19:49 UTC (rev 62731)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-26 00:09:56 UTC (rev 62732)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32249
+BuildNum=32251
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-29 00:10:42
|
Revision: 62741
http://sourceforge.net/p/firebird/code/62741
Author: firebirds
Date: 2015-12-29 00:10:39 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-28 17:22:57 UTC (rev 62740)
+++ firebird/trunk/ChangeLog 2015-12-29 00:10:39 UTC (rev 62741)
@@ -1,3 +1,15 @@
+ 2015-12-28 14:10 alexpeshkoff
+ M builds/install/arch-specific/linux/firebird.init.d.debian.in
+ M builds/install/arch-specific/linux/firebird.init.d.generic.in
+ M builds/install/arch-specific/linux/linuxLibrary.sh.in
+ M builds/install/posix-common/changeServerMode.sh.in
+ M builds/install/posix-common/posixLibrary.sh.in
+Fixed CORE-5053: changeServerMode.sh can mess with configuration
+
+ 2015-12-28 06:22 dimitr
+ M src/jrd/jrd.cpp
+Unwind the cache before throwing. This prevents lock-ups during database shutdown.
+
2015-12-25 18:19 alexpeshkoff
M builds/install/arch-specific/linux/linuxLibrary.sh.in
M builds/install/posix-common/posixLibrary.sh.in
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-28 17:22:57 UTC (rev 62740)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-29 00:10:39 UTC (rev 62741)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32251
+ FORMAL BUILD NUMBER:32253
*/
-#define PRODUCT_VER_STRING "3.0.0.32251"
-#define FILE_VER_STRING "WI-V3.0.0.32251"
-#define LICENSE_VER_STRING "WI-V3.0.0.32251"
-#define FILE_VER_NUMBER 3, 0, 0, 32251
+#define PRODUCT_VER_STRING "3.0.0.32253"
+#define FILE_VER_STRING "WI-V3.0.0.32253"
+#define LICENSE_VER_STRING "WI-V3.0.0.32253"
+#define FILE_VER_NUMBER 3, 0, 0, 32253
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32251"
+#define FB_BUILD_NO "32253"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-28 17:22:57 UTC (rev 62740)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-29 00:10:39 UTC (rev 62741)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32251
+BuildNum=32253
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-12-30 00:12:05
|
Revision: 62747
http://sourceforge.net/p/firebird/code/62747
Author: firebirds
Date: 2015-12-30 00:12:03 +0000 (Wed, 30 Dec 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-12-29 19:00:05 UTC (rev 62746)
+++ firebird/trunk/ChangeLog 2015-12-30 00:12:03 UTC (rev 62747)
@@ -1,3 +1,23 @@
+ 2015-12-29 19:00 dimitr
+ M src/jrd/Monitoring.cpp
+ M src/jrd/Monitoring.h
+Fixed CORE-4708: Content of MON$EXPLAINED_PLAN in MON$STATEMENTS is truncated if exceeds the 32KB limit.
+
+ 2015-12-29 15:17 dimitr
+ M src/jrd/DbCreators.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/Monitoring.cpp
+ M src/jrd/Monitoring.h
+ M src/jrd/UserManagement.cpp
+Tag the shmem session clumplets with username. This allows much faster lookups for non-locksmith users. Also, it allows to simplify some code. While being there, cleaned up some unused logic.
+
+ 2015-12-29 14:39 alexpeshkoff
+ M src/jrd/Mapping.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+Fixed CORE-5047: mapUser() routine establish secondary attach using wrong provider
+
2015-12-28 14:10 alexpeshkoff
M builds/install/arch-specific/linux/firebird.init.d.debian.in
M builds/install/arch-specific/linux/firebird.init.d.generic.in
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-12-29 19:00:05 UTC (rev 62746)
+++ firebird/trunk/src/jrd/build_no.h 2015-12-30 00:12:03 UTC (rev 62747)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32253
+ FORMAL BUILD NUMBER:32256
*/
-#define PRODUCT_VER_STRING "3.0.0.32253"
-#define FILE_VER_STRING "WI-V3.0.0.32253"
-#define LICENSE_VER_STRING "WI-V3.0.0.32253"
-#define FILE_VER_NUMBER 3, 0, 0, 32253
+#define PRODUCT_VER_STRING "3.0.0.32256"
+#define FILE_VER_STRING "WI-V3.0.0.32256"
+#define LICENSE_VER_STRING "WI-V3.0.0.32256"
+#define FILE_VER_NUMBER 3, 0, 0, 32256
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32253"
+#define FB_BUILD_NO "32256"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-12-29 19:00:05 UTC (rev 62746)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-12-30 00:12:03 UTC (rev 62747)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32253
+BuildNum=32256
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X