Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2010-12-20 03:17:32
|
Revision: 52062
http://firebird.svn.sourceforge.net/firebird/?rev=52062&view=rev
Author: firebirds
Date: 2010-12-20 03:17:25 +0000 (Mon, 20 Dec 2010)
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 2010-12-19 21:42:32 UTC (rev 52061)
+++ firebird/trunk/ChangeLog 2010-12-20 03:17:25 UTC (rev 52062)
@@ -1,3 +1,18 @@
+ 2010-12-19 21:42 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/pass1.cpp
+Refactor DSQL's nod_field
+
+ 2010-12-19 18:57 asfernandes
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/parse.y
+Fix comparation problem with boolean and NULL
+
2010-12-18 19:13 dimitr
D src/lock/driver.cpp
D src/lock/reset.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-12-19 21:42:32 UTC (rev 52061)
+++ firebird/trunk/src/jrd/build_no.h 2010-12-20 03:17:25 UTC (rev 52062)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28949
+ FORMAL BUILD NUMBER:28951
*/
-#define PRODUCT_VER_STRING "3.0.0.28949"
-#define FILE_VER_STRING "WI-T3.0.0.28949"
-#define LICENSE_VER_STRING "WI-T3.0.0.28949"
-#define FILE_VER_NUMBER 3, 0, 0, 28949
+#define PRODUCT_VER_STRING "3.0.0.28951"
+#define FILE_VER_STRING "WI-T3.0.0.28951"
+#define LICENSE_VER_STRING "WI-T3.0.0.28951"
+#define FILE_VER_NUMBER 3, 0, 0, 28951
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28949"
+#define FB_BUILD_NO "28951"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2010-12-19 21:42:32 UTC (rev 52061)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-12-20 03:17:25 UTC (rev 52062)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28949
+BuildNum=28951
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...> - 2010-12-24 03:20:00
|
Revision: 52073
http://firebird.svn.sourceforge.net/firebird/?rev=52073&view=rev
Author: firebirds
Date: 2010-12-24 03:19:53 +0000 (Fri, 24 Dec 2010)
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 2010-12-23 18:42:06 UTC (rev 52072)
+++ firebird/trunk/ChangeLog 2010-12-24 03:19:53 UTC (rev 52073)
@@ -1,3 +1,15 @@
+ 2010-12-23 18:42 asfernandes
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+ M src/dsql/gen.cpp
+ M src/dsql/metd.epp
+ M src/dsql/metd_proto.h
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/dsql/pass1_proto.h
+Refactored the DSQL support of cursor statements, execute procedure and execute statement
+
2010-12-19 21:42 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/ExprNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-12-23 18:42:06 UTC (rev 52072)
+++ firebird/trunk/src/jrd/build_no.h 2010-12-24 03:19:53 UTC (rev 52073)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28951
+ FORMAL BUILD NUMBER:28952
*/
-#define PRODUCT_VER_STRING "3.0.0.28951"
-#define FILE_VER_STRING "WI-T3.0.0.28951"
-#define LICENSE_VER_STRING "WI-T3.0.0.28951"
-#define FILE_VER_NUMBER 3, 0, 0, 28951
+#define PRODUCT_VER_STRING "3.0.0.28952"
+#define FILE_VER_STRING "WI-T3.0.0.28952"
+#define LICENSE_VER_STRING "WI-T3.0.0.28952"
+#define FILE_VER_NUMBER 3, 0, 0, 28952
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28951"
+#define FB_BUILD_NO "28952"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2010-12-23 18:42:06 UTC (rev 52072)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-12-24 03:19:53 UTC (rev 52073)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28951
+BuildNum=28952
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...> - 2010-12-27 03:17:07
|
Revision: 52076
http://firebird.svn.sourceforge.net/firebird/?rev=52076&view=rev
Author: firebirds
Date: 2010-12-27 03:17:00 +0000 (Mon, 27 Dec 2010)
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 2010-12-27 00:34:31 UTC (rev 52075)
+++ firebird/trunk/ChangeLog 2010-12-27 03:17:00 UTC (rev 52076)
@@ -1,3 +1,11 @@
+ 2010-12-27 00:34 asfernandes
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/BoolNodes.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/parse.y
+Make UNKNOWN a boolean value/test, and not something exactly like NULL
+
2010-12-23 18:42 asfernandes
M src/dsql/StmtNodes.cpp
M src/dsql/StmtNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-12-27 00:34:31 UTC (rev 52075)
+++ firebird/trunk/src/jrd/build_no.h 2010-12-27 03:17:00 UTC (rev 52076)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28952
+ FORMAL BUILD NUMBER:28953
*/
-#define PRODUCT_VER_STRING "3.0.0.28952"
-#define FILE_VER_STRING "WI-T3.0.0.28952"
-#define LICENSE_VER_STRING "WI-T3.0.0.28952"
-#define FILE_VER_NUMBER 3, 0, 0, 28952
+#define PRODUCT_VER_STRING "3.0.0.28953"
+#define FILE_VER_STRING "WI-T3.0.0.28953"
+#define LICENSE_VER_STRING "WI-T3.0.0.28953"
+#define FILE_VER_NUMBER 3, 0, 0, 28953
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28952"
+#define FB_BUILD_NO "28953"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2010-12-27 00:34:31 UTC (rev 52075)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-12-27 03:17:00 UTC (rev 52076)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28952
+BuildNum=28953
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...> - 2010-12-29 03:20:42
|
Revision: 52083
http://firebird.svn.sourceforge.net/firebird/?rev=52083&view=rev
Author: firebirds
Date: 2010-12-29 03:20:33 +0000 (Wed, 29 Dec 2010)
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 2010-12-29 00:49:21 UTC (rev 52082)
+++ firebird/trunk/ChangeLog 2010-12-29 03:20:33 UTC (rev 52083)
@@ -1,3 +1,10 @@
+ 2010-12-29 00:49 asfernandes
+ M src/jrd/svc.cpp
+ M src/remote/inet.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+Misc
+
2010-12-27 00:34 asfernandes
M src/dsql/BoolNodes.cpp
M src/dsql/BoolNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-12-29 00:49:21 UTC (rev 52082)
+++ firebird/trunk/src/jrd/build_no.h 2010-12-29 03:20:33 UTC (rev 52083)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28953
+ FORMAL BUILD NUMBER:28954
*/
-#define PRODUCT_VER_STRING "3.0.0.28953"
-#define FILE_VER_STRING "WI-T3.0.0.28953"
-#define LICENSE_VER_STRING "WI-T3.0.0.28953"
-#define FILE_VER_NUMBER 3, 0, 0, 28953
+#define PRODUCT_VER_STRING "3.0.0.28954"
+#define FILE_VER_STRING "WI-T3.0.0.28954"
+#define LICENSE_VER_STRING "WI-T3.0.0.28954"
+#define FILE_VER_NUMBER 3, 0, 0, 28954
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28953"
+#define FB_BUILD_NO "28954"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2010-12-29 00:49:21 UTC (rev 52082)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-12-29 03:20:33 UTC (rev 52083)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28953
+BuildNum=28954
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...> - 2011-01-08 03:23:13
|
Revision: 52096
http://firebird.svn.sourceforge.net/firebird/?rev=52096&view=rev
Author: firebirds
Date: 2011-01-08 03:23:07 +0000 (Sat, 08 Jan 2011)
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 2011-01-07 11:32:45 UTC (rev 52095)
+++ firebird/trunk/ChangeLog 2011-01-08 03:23:07 UTC (rev 52096)
@@ -1,3 +1,8 @@
+ 2011-01-07 11:32 dimitr
+ M src/dsql/AggNodes.cpp
+ M src/jrd/opt.cpp
+Fixed CORE-3302: Distinct aggregates return wrong (duplicated) data.
+
2010-12-29 00:49 asfernandes
M src/jrd/svc.cpp
M src/remote/inet.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-07 11:32:45 UTC (rev 52095)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-08 03:23:07 UTC (rev 52096)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28954
+ FORMAL BUILD NUMBER:28955
*/
-#define PRODUCT_VER_STRING "3.0.0.28954"
-#define FILE_VER_STRING "WI-T3.0.0.28954"
-#define LICENSE_VER_STRING "WI-T3.0.0.28954"
-#define FILE_VER_NUMBER 3, 0, 0, 28954
+#define PRODUCT_VER_STRING "3.0.0.28955"
+#define FILE_VER_STRING "WI-T3.0.0.28955"
+#define LICENSE_VER_STRING "WI-T3.0.0.28955"
+#define FILE_VER_NUMBER 3, 0, 0, 28955
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28954"
+#define FB_BUILD_NO "28955"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-07 11:32:45 UTC (rev 52095)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-08 03:23:07 UTC (rev 52096)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28954
+BuildNum=28955
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...> - 2011-01-10 03:17:16
|
Revision: 52099
http://firebird.svn.sourceforge.net/firebird/?rev=52099&view=rev
Author: firebirds
Date: 2011-01-10 03:17:09 +0000 (Mon, 10 Jan 2011)
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 2011-01-09 21:58:56 UTC (rev 52098)
+++ firebird/trunk/ChangeLog 2011-01-10 03:17:09 UTC (rev 52099)
@@ -1,3 +1,20 @@
+ 2011-01-09 21:58 asfernandes
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/Parser.h
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/gen.cpp
+ M src/dsql/gen_proto.h
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/RecordSourceNodes.h
+Refactor nod_aggregate, nod_relation, nod_rse, nod_derived_table, nod_query_spec and nod_limit
+
2011-01-07 11:32 dimitr
M src/dsql/AggNodes.cpp
M src/jrd/opt.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-09 21:58:56 UTC (rev 52098)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-10 03:17:09 UTC (rev 52099)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28955
+ FORMAL BUILD NUMBER:28956
*/
-#define PRODUCT_VER_STRING "3.0.0.28955"
-#define FILE_VER_STRING "WI-T3.0.0.28955"
-#define LICENSE_VER_STRING "WI-T3.0.0.28955"
-#define FILE_VER_NUMBER 3, 0, 0, 28955
+#define PRODUCT_VER_STRING "3.0.0.28956"
+#define FILE_VER_STRING "WI-T3.0.0.28956"
+#define LICENSE_VER_STRING "WI-T3.0.0.28956"
+#define FILE_VER_NUMBER 3, 0, 0, 28956
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28955"
+#define FB_BUILD_NO "28956"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-09 21:58:56 UTC (rev 52098)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-10 03:17:09 UTC (rev 52099)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28955
+BuildNum=28956
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...> - 2011-01-11 03:18:07
|
Revision: 52102
http://firebird.svn.sourceforge.net/firebird/?rev=52102&view=rev
Author: firebirds
Date: 2011-01-11 03:18:01 +0000 (Tue, 11 Jan 2011)
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 2011-01-10 16:28:11 UTC (rev 52101)
+++ firebird/trunk/ChangeLog 2011-01-11 03:18:01 UTC (rev 52102)
@@ -1,3 +1,7 @@
+ 2011-01-10 15:41 asfernandes
+ M src/jrd/RecordSourceNodes.h
+Fixed CORE-3306 - Invariant sub-query is treated as variant thus causing multiple invokations of a nested stored procedure
+
2011-01-09 21:58 asfernandes
M src/dsql/BoolNodes.cpp
M src/dsql/DdlNodes.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-10 16:28:11 UTC (rev 52101)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-11 03:18:01 UTC (rev 52102)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28956
+ FORMAL BUILD NUMBER:28957
*/
-#define PRODUCT_VER_STRING "3.0.0.28956"
-#define FILE_VER_STRING "WI-T3.0.0.28956"
-#define LICENSE_VER_STRING "WI-T3.0.0.28956"
-#define FILE_VER_NUMBER 3, 0, 0, 28956
+#define PRODUCT_VER_STRING "3.0.0.28957"
+#define FILE_VER_STRING "WI-T3.0.0.28957"
+#define LICENSE_VER_STRING "WI-T3.0.0.28957"
+#define FILE_VER_NUMBER 3, 0, 0, 28957
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28956"
+#define FB_BUILD_NO "28957"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-10 16:28:11 UTC (rev 52101)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-11 03:18:01 UTC (rev 52102)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28956
+BuildNum=28957
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...> - 2011-01-12 03:17:23
|
Revision: 52108
http://firebird.svn.sourceforge.net/firebird/?rev=52108&view=rev
Author: firebirds
Date: 2011-01-12 03:17:17 +0000 (Wed, 12 Jan 2011)
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 2011-01-12 00:15:13 UTC (rev 52107)
+++ firebird/trunk/ChangeLog 2011-01-12 03:17:17 UTC (rev 52108)
@@ -1,3 +1,7 @@
+ 2011-01-11 07:49 alexpeshkoff
+ M doc/README.fb_shutdown
+front-ported doc changes
+
2011-01-10 15:41 asfernandes
M src/jrd/RecordSourceNodes.h
Fixed CORE-3306 - Invariant sub-query is treated as variant thus causing multiple invokations of a nested stored procedure
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-12 00:15:13 UTC (rev 52107)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-12 03:17:17 UTC (rev 52108)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28957
+ FORMAL BUILD NUMBER:28958
*/
-#define PRODUCT_VER_STRING "3.0.0.28957"
-#define FILE_VER_STRING "WI-T3.0.0.28957"
-#define LICENSE_VER_STRING "WI-T3.0.0.28957"
-#define FILE_VER_NUMBER 3, 0, 0, 28957
+#define PRODUCT_VER_STRING "3.0.0.28958"
+#define FILE_VER_STRING "WI-T3.0.0.28958"
+#define LICENSE_VER_STRING "WI-T3.0.0.28958"
+#define FILE_VER_NUMBER 3, 0, 0, 28958
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28957"
+#define FB_BUILD_NO "28958"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-12 00:15:13 UTC (rev 52107)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-12 03:17:17 UTC (rev 52108)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28957
+BuildNum=28958
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...> - 2011-01-13 03:17:42
|
Revision: 52113
http://firebird.svn.sourceforge.net/firebird/?rev=52113&view=rev
Author: firebirds
Date: 2011-01-13 03:17:35 +0000 (Thu, 13 Jan 2011)
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 2011-01-12 10:56:42 UTC (rev 52112)
+++ firebird/trunk/ChangeLog 2011-01-13 03:17:35 UTC (rev 52113)
@@ -1,3 +1,11 @@
+ 2011-01-12 10:56 dimitr
+ M doc/license/README.license.usage.txt
+Corrected the license URLs.
+
+ 2011-01-12 10:46 dimitr
+ M builds/win32/make_boot.bat
+Fixed the debug boot build.
+
2011-01-11 07:49 alexpeshkoff
M doc/README.fb_shutdown
front-ported doc changes
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-12 10:56:42 UTC (rev 52112)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-13 03:17:35 UTC (rev 52113)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28958
+ FORMAL BUILD NUMBER:28960
*/
-#define PRODUCT_VER_STRING "3.0.0.28958"
-#define FILE_VER_STRING "WI-T3.0.0.28958"
-#define LICENSE_VER_STRING "WI-T3.0.0.28958"
-#define FILE_VER_NUMBER 3, 0, 0, 28958
+#define PRODUCT_VER_STRING "3.0.0.28960"
+#define FILE_VER_STRING "WI-T3.0.0.28960"
+#define LICENSE_VER_STRING "WI-T3.0.0.28960"
+#define FILE_VER_NUMBER 3, 0, 0, 28960
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28958"
+#define FB_BUILD_NO "28960"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-12 10:56:42 UTC (rev 52112)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-13 03:17:35 UTC (rev 52113)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28958
+BuildNum=28960
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...> - 2011-01-14 17:31:50
|
Revision: 52121
http://firebird.svn.sourceforge.net/firebird/?rev=52121&view=rev
Author: alexpeshkoff
Date: 2011-01-14 17:31:40 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
New plugin manager. Use it for all types of plugins.
Modified Paths:
--------------
firebird/trunk/builds/install/misc/aliases.conf.in
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/firebird.vers
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/posix/make.shared.variables
firebird/trunk/builds/posix/prefix.linux
firebird/trunk/builds/posix/prefix.linux_amd64
firebird/trunk/builds/posix/udr_engine.vers
firebird/trunk/configure.in
firebird/trunk/src/auth/AuthDbg.cpp
firebird/trunk/src/auth/AuthDbg.h
firebird/trunk/src/auth/AuthInterface.h
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
firebird/trunk/src/auth/SecurityDatabase/pwd.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/auth/trusted/AuthSspi.h
firebird/trunk/src/common/Auth.cpp
firebird/trunk/src/common/Auth.h
firebird/trunk/src/common/IntlUtil.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/ThreadStart.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/init.h
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/config/config_file.h
firebird/trunk/src/common/fb_exception.cpp
firebird/trunk/src/common/thd.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/include/FirebirdExternalApi.h
firebird/trunk/src/include/FirebirdPluginApi.h
firebird/trunk/src/include/ProviderInterface.h
firebird/trunk/src/include/consts_pub.h
firebird/trunk/src/jrd/Attachment.cpp
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/JrdStatement.cpp
firebird/trunk/src/jrd/JrdStatement.h
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/blb.cpp
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/event.cpp
firebird/trunk/src/jrd/event.h
firebird/trunk/src/jrd/event_proto.h
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd_proto.h
firebird/trunk/src/jrd/ntrace.h
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceManager.h
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/remot_proto.h
firebird/trunk/src/remote/remote.h
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/gsec/security.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/utilities/ntrace/TraceConfiguration.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.h
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/why.cpp
Added Paths:
-----------
firebird/trunk/builds/install/misc/plugins.conf
firebird/trunk/builds/posix/fbplugin.vers
firebird/trunk/src/include/Interface.h
firebird/trunk/src/remote/client/interface.h
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/PluginManager.h
Removed Paths:
-------------
firebird/trunk/builds/posix/fbtrace.vers
firebird/trunk/builds/posix/udr_engine.hpux.vers
firebird/trunk/src/common/classes/Interface.h
firebird/trunk/src/jrd/PluginManager.cpp
firebird/trunk/src/jrd/PluginManager.h
Modified: firebird/trunk/builds/install/misc/aliases.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/aliases.conf.in 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/install/misc/aliases.conf.in 2011-01-14 17:31:40 UTC (rev 52121)
@@ -5,8 +5,11 @@
#
# Example Database:
#
-employee.fdb = @FB_SAMPLEDBDIR@/employee.fdb
-employee = @FB_SAMPLEDBDIR@/employee.fdb
+#employee.fdb = @FB_SAMPLEDBDIR@/employee.fdb
+#employee = @FB_SAMPLEDBDIR@/employee.fdb
+# TODO: When added appropriate feature to config - use $(SAMPLEDBDIR) instead
+employee.fdb = $(root)/examples/empbuild/employee.fdb
+employee = $(root)/examples/empbuild/employee.fdb
#
# Live Databases:
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2011-01-14 17:31:40 UTC (rev 52121)
@@ -349,6 +349,44 @@
# ----------------------------
#
+# This group of parameters determines what plugins will be used by firebird.
+# Format of string is the list of plugins, separated by space, ',' or ';'.
+# Plugins will be tried in an order, specified here.
+# In many cases correct order is important!
+#
+# Type: string
+
+# AuthServer and AuthClient determine what uthentication methods will be used
+# by network server and client redirector. For non-windows systems default
+# for both is Legacy_Auth.
+#
+#AuthServer = Legacy_Auth, Win_Sspi
+#AuthClient = Legacy_Auth, Win_Sspi
+
+# UserManager sets plugin used to work with security database. If more than
+# one plugin is given, first plugin from the list is used.
+#
+#UserManager = Legacy_Auth
+
+# TracePlugin is used by firebird trace facility to send trace data to the user
+# or log file in audit case.
+#
+#TracePlugin = fbtrace
+
+
+# ----------------------------
+#
+# This parameter determines what providers will be used by firebird.
+# Format is the same as for the list of plugins (see a few lines before).
+# This is not strange because internally provider is just a kind of plugin.
+#
+# Type: string
+#
+#Providers = Remote,Engine12,Loopback
+
+
+# ----------------------------
+#
# Determines the number of seconds that the lock manager will wait after a
# conflict has been encountered before purging locks from dead processes
# and doing extra deadlock scan cycle. Engine detects deadlocks instantly
Added: firebird/trunk/builds/install/misc/plugins.conf
===================================================================
--- firebird/trunk/builds/install/misc/plugins.conf (rev 0)
+++ firebird/trunk/builds/install/misc/plugins.conf 2011-01-14 17:31:40 UTC (rev 52121)
@@ -0,0 +1,8 @@
+Plugin = UDR {
+ Module = $(root)/plugins/udr_engine
+ Config = UDR_config
+}
+
+Config = UDR_config {
+ path = $(root)/plugins/udr
+}
Property changes on: firebird/trunk/builds/install/misc/plugins.conf
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/Makefile.in 2011-01-14 17:31:40 UTC (rev 52121)
@@ -107,7 +107,7 @@
# main build target for both debug abd release builds
#
-.PHONY: boot yvalve engine fbintl gpre utilities plugins rest codes
+.PHONY: boot yvalve engine fbintl gpre utilities plugins rest codes examples
master_process:
$(MAKE) updateBuildNum
@@ -130,6 +130,7 @@
$(MAKE) codes
endif
$(MAKE) plugins
+ $(MAKE) examples
$(MAKE) rest
#___________________________________________________________________________
@@ -197,12 +198,11 @@
#___________________________________________________________________________
# full gpre
# when switching to it we also build databases needed later
-# and libib_util needed to start engine smart
#
-.PHONY: databases udfsupport
+.PHONY: databases
-gpre: $(GPRE) databases udfsupport
+gpre: $(GPRE) databases
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
@@ -250,7 +250,7 @@
$(TOUCH) $@
-.PHONY: udfs ibutil ibudf fbudf
+.PHONY: udfs ibutil ibudf fbudf udfsupport
udfsupport:
$(MAKE) ibutil
@@ -279,13 +279,13 @@
#___________________________________________________________________________
-# most of utilities, including network server
+# most of utilities, including network server and UDFs
# qli is not here cause it needs special database (help.fdb), therefore needs gbak
#
.PHONY: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup
-utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup
+utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup udfsupport
firebird_server: $(FB_DAEMON)
@@ -306,6 +306,8 @@
$(FBSVCMGR): $(FBSVCMGR_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+#$(FBSVCMGR): $(FBSVCMGR_Objects) $(YValve_Objects) $(Remote_Client_Objects) $(COMMON_LIB)
+# $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS)
fbtracemgr: $(FBTRACEMGR)
@@ -352,12 +354,19 @@
# plugins - some of them are required to build examples, use separate entry for them
#
-.PHONY: udr legacy_user_management trace
-UDR_PLUGIN = $(PLUGINS)/$(LIB_PREFIX)udr_engine.$(SHRLIB_EXT)
-LEGACY_USER_MANAGER = $(PLUGINS)/$(LIB_PREFIX)user_management.$(SHRLIB_EXT)
+.PHONY: udr legacy_user_management trace auth_debug
+makePluginName= $(PLUGINS)/$(LIB_PREFIX)$(1).$(SHRLIB_EXT)
+UDR_PLUGIN = $(call makePluginName,udr_engine)
+LEGACY_USER_MANAGER = $(call makePluginName,Legacy_Auth)
+AUTH_DEBUGGER = $(call makePluginName,Auth_Debug)
-plugins: udr legacy_user_management trace
+BUILD_DEBUG:=
+ifeq ($(TARGET),Debug)
+ BUILD_DEBUG:=auth_debug
+endif
+plugins: udr legacy_user_management trace $(BUILD_DEBUG)
+
udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
$(PLUGINS)/udr_engine.conf: $(ROOT)/src/plugins/udr_engine/udr_engine.conf
@@ -376,7 +385,12 @@
$(FBTRACE): $(FBTRACE_UTIL_Objects) $(COMMON_LIB)
$(LINK_TRACE) -o $@ $^ $(FIREBIRD_LIBRARY_LINK) $(LINK_TRACE_LIBS)
+auth_debug: $(AUTH_DEBUGGER)
+$(AUTH_DEBUGGER): $(AUTH_DEBUGGER_Objects) $(COMMON_LIB)
+ $(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+
+
#___________________________________________________________________________
# codes - developers change them sometimes
#
@@ -401,9 +415,9 @@
# all the rest we need to build
#
-.PHONY: qli examples message_file
+.PHONY: qli message_file
-rest: qli examples message_file include_generic
+rest: qli message_file
qli: $(QLI)
@@ -524,10 +538,11 @@
# -$(MAKE) -C $(ROOT)/extern/icu/source clean
clean_objects:
- $(RM) `find $(ROOT)/extern/ -type f -name '*.lo' -print`
$(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print`
+ $(RM) `find $(TMP_ROOT)/ -type f -name '*.a' -print`
clean_extern_objects:
+ $(RM) `find $(ROOT)/extern/ -type f -name '*.lo' -print`
$(RM) `find $(ROOT)/extern/ -type f -name '*.o' -print`
# Clear out dependancies files created by the gcc compiler
Copied: firebird/trunk/builds/posix/fbplugin.vers (from rev 52016, firebird/trunk/builds/posix/fbtrace.vers)
===================================================================
--- firebird/trunk/builds/posix/fbplugin.vers (rev 0)
+++ firebird/trunk/builds/posix/fbplugin.vers 2011-01-14 17:31:40 UTC (rev 52121)
@@ -0,0 +1,28 @@
+#
+# Version script to hide private symbols from Firebird libraries
+# GNU and Solaris linkers should understand it
+#
+# The contents of this file are subject to the Initial
+# Developer's Public License Version 1.0 (the "License");
+# you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+#
+# Software distributed under the License is distributed AS IS,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied.
+# See the License for the specific language governing rights
+# and limitations under the License.
+#
+# The Original Code was created by Nickolay Samofatov
+# for the Firebird Open Source RDBMS project.
+#
+# Copyright (c) 2004 Nickolay Samofatov <nic...@br...>
+# and all contributors signed below.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Adriano dos Santos Fernandes
+# Alex Peshkov
+#
+
+firebird_plugin
Property changes on: firebird/trunk/builds/posix/fbplugin.vers
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: firebird/trunk/builds/posix/fbtrace.vers
===================================================================
--- firebird/trunk/builds/posix/fbtrace.vers 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/fbtrace.vers 2011-01-14 17:31:40 UTC (rev 52121)
@@ -1,28 +0,0 @@
-#
-# Version script to hide private symbols from Firebird libraries
-# GNU and Solaris linkers should understand it
-#
-# The contents of this file are subject to the Initial
-# Developer's Public License Version 1.0 (the "License");
-# you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-#
-# Software distributed under the License is distributed AS IS,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# See the License for the specific language governing rights
-# and limitations under the License.
-#
-# The Original Code was created by Nickolay Samofatov
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) 2004 Nickolay Samofatov <nic...@br...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Adriano dos Santos Fernandes
-# Alex Peshkov
-#
-
-trace_create
Modified: firebird/trunk/builds/posix/firebird.vers
===================================================================
--- firebird/trunk/builds/posix/firebird.vers 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/firebird.vers 2011-01-14 17:31:40 UTC (rev 52121)
@@ -338,15 +338,10 @@
fb_shutdown_callback
fb_ping
-# Plugins support
+# Master firebird object access
-fb_register_plugin
-fb_query_plugin
+fb_get_master_interface
-# COM emulation
-
-fb_get_status_instance
-
# Other misc functions
isc_ftof
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/make.defaults 2011-01-14 17:31:40 UTC (rev 52121)
@@ -218,9 +218,9 @@
# The firebird engine library name
-EngineFileName=libengine${OdsVersion}
+EngineFileName=libEngine${OdsVersion}
EngineSoName=$(EngineFileName).${SHRLIB_EXT}
-ENGINE_SONAME = $(LIB)/$(EngineSoName)
+ENGINE_SONAME = $(PLUGINS)/$(EngineSoName)
# intl will load dynamically, and having the whole soname set with version
# confuses the dynamic load process. So we only have the .$(SHRLIB_EXT) file
@@ -249,22 +249,21 @@
endif
FIREBIRD_VERS = firebird.vers
-FBTRACE_VERS = fbtrace.vers
FBINTL_VERS = fbintl.vers
IB_UTIL_VERS = ib_util.vers
UDR_ENGINE_VERS = udr_engine.vers
EMPTY_VERS = empty.vers
+PLUGIN_VERS = fbplugin.vers
-ALLVERS = $(FIREBIRD_VERS) $(FBTRACE_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
-ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS)
+ALLVERS = $(FIREBIRD_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
+ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS) $(PLUGIN_VERS)
LINK_FIREBIRD_SYMBOLS = $(LIB_LINK_MAPFILE)$(FIREBIRD_VERS)
-LINK_TRACE_SYMBOLS = $(LIB_LINK_MAPFILE)$(FBTRACE_VERS)
LINK_FBINTL_SYMBOLS = $(LIB_LINK_MAPFILE)$(FBINTL_VERS)
LINK_IBUTIL_SYMBOLS = $(LIB_LINK_MAPFILE)$(IB_UTIL_VERS)
LINK_UDRENG_SYMBOLS = $(LIB_LINK_MAPFILE)$(UDR_ENGINE_VERS)
LINK_EMPTY_SYMBOLS = $(LIB_LINK_MAPFILE)$(EMPTY_VERS)
-LINK_PLUGIN_SYMBOLS = $(LINK_EMPTY_SYMBOLS)
+LINK_PLUGIN_SYMBOLS = $(LIB_LINK_MAPFILE)$(PLUGIN_VERS)
LINK_EXEC_EXPORT=-rdynamic
LIB_PLATFORM_RPATH = -Wl,-rpath,$(1)
@@ -301,7 +300,7 @@
$(call LIB_LINK_SONAME,libintl.$(SHRLIB_EXT).1) $(call LIB_LINK_RPATH,lib)
LINK_INTL_LIBS = -L$(LIB) $(ICU_LIBS) $(SO_LINK_LIBS) $(FIREBIRD_LIBRARY_LINK)
-LINK_TRACE = $(LIB_LINK) $(LINK_TRACE_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
+LINK_TRACE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(LIB_PREFIX)fbtrace.$(SHRLIB_EXT).0) $(call LIB_LINK_RPATH,lib)
LINK_TRACE_LIBS = -L$(LIB) $(SO_LINK_LIBS) $(ICU_LIBS)
Modified: firebird/trunk/builds/posix/make.shared.variables
===================================================================
--- firebird/trunk/builds/posix/make.shared.variables 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/make.shared.variables 2011-01-14 17:31:40 UTC (rev 52121)
@@ -165,6 +165,12 @@
AllObjects += $(LEGACY_USERS_MANAGE_Objects)
+# Multihop authentication debugger
+AUTH_DEBUGGER_Objects:= $(call makeObjects,auth,AuthDbg.cpp)
+
+AllObjects += $(AUTH_DEBUGGER_Objects)
+
+
# UDR engine
UDRENG_Objects:= $(call dirObjects,plugins/udr_engine)
Modified: firebird/trunk/builds/posix/prefix.linux
===================================================================
--- firebird/trunk/builds/posix/prefix.linux 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/prefix.linux 2011-01-14 17:31:40 UTC (rev 52121)
@@ -20,7 +20,7 @@
COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor
+WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
Modified: firebird/trunk/builds/posix/prefix.linux_amd64
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_amd64 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/prefix.linux_amd64 2011-01-14 17:31:40 UTC (rev 52121)
@@ -20,7 +20,7 @@
COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
-WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-non-virtual-dtor
+WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
Deleted: firebird/trunk/builds/posix/udr_engine.hpux.vers
===================================================================
--- firebird/trunk/builds/posix/udr_engine.hpux.vers 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/udr_engine.hpux.vers 2011-01-14 17:31:40 UTC (rev 52121)
@@ -1,33 +0,0 @@
-#
-# Version script to hide private symbols from Firebird libraries
-# GNU and Solaris linkers should understand it
-#
-# The contents of this file are subject to the Initial
-# Developer's Public License Version 1.0 (the "License");
-# you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-#
-# Software distributed under the License is distributed AS IS,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# See the License for the specific language governing rights
-# and limitations under the License.
-#
-# The Original Code was created by Nickolay Samofatov
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) 2004 Nickolay Samofatov <nic...@br...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Adriano dos Santos Fernandes
-#
-#
-
-
-+e firebirdPlugin
-+e fbUdrRegFunction
-+e fbUdrRegProcedure
-+e fbUdrRegTrigger
-+e fbUdrGetFunction
Modified: firebird/trunk/builds/posix/udr_engine.vers
===================================================================
--- firebird/trunk/builds/posix/udr_engine.vers 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/builds/posix/udr_engine.vers 2011-01-14 17:31:40 UTC (rev 52121)
@@ -25,7 +25,7 @@
#
#
-firebirdPlugin
+firebird_plugin
fbUdrRegFunction
fbUdrRegProcedure
fbUdrRegTrigger
Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/configure.in 2011-01-14 17:31:40 UTC (rev 52121)
@@ -1055,6 +1055,11 @@
done
src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version
+
+dnl # sql files for UDF declarations
+ for sql_file in src/extlib/ib_udf.sql src/extlib/fbudf/fbudf.sql src/extlib/ib_udf2.sql; do
+ cp \$sql_file gen/\$fb_tgt/firebird/UDF
+ done
done
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do
@@ -1080,6 +1085,8 @@
gen/Release/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf
gen/Debug/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf
gen/Release/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf
+gen/Debug/firebird/plugins.conf:builds/install/misc/plugins.conf
+gen/Release/firebird/plugins.conf:builds/install/misc/plugins.conf
gen/Release/firebird/bin/fb_config:builds/install/misc/fb_config.in
gen/Release/firebird/bin/posixLibrary.sh:builds/install/misc/posixLibrary.sh.in
gen/Release/firebird/bin/classicLibrary.sh:builds/install/misc/classicLibrary.sh.in
Modified: firebird/trunk/src/auth/AuthDbg.cpp
===================================================================
--- firebird/trunk/src/auth/AuthDbg.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/AuthDbg.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -28,104 +28,160 @@
#include "firebird.h"
#include "../auth/AuthDbg.h"
#include "../jrd/ibase.h"
-#include "../common/classes/ImplementHelper.h"
#ifdef AUTH_DEBUG
-namespace {
- char name[] = "DEBUG_AUTH";
- Firebird::PluginHelper<Auth::DebugServer, Firebird::Plugin::AuthServer, name> debugServer;
- Firebird::PluginHelper<Auth::DebugClient, Firebird::Plugin::AuthClient, name> debugClient;
-}
+//#define AUTH_VERBOSE
-namespace Auth {
+// register plugin
+static Firebird::SimpleFactory<Auth::DebugClient> clientFactory;
+static Firebird::SimpleFactory<Auth::DebugServer> serverFactory;
-ServerInstance* DebugServer::instance()
+extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
- return Firebird::interfaceAlloc<DebugServerInstance>();
-}
+ const char* name = "Auth_Debug";
-ClientInstance* DebugClient::instance()
-{
- return Firebird::interfaceAlloc<DebugClientInstance>();
+ Firebird::IPlugin* iPlugin = master->getPluginInterface();
+
+ clientFactory.addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthClient, name, &clientFactory);
+ serverFactory.addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthServer, name, &serverFactory);
+
+ iPlugin->release();
}
-DebugServerInstance::DebugServerInstance()
- : str(*getDefaultMemoryPool())
+
+namespace Auth {
+
+DebugServer::DebugServer(Firebird::IFactoryParameter*)
+ : str(getPool())
{ }
-Result DebugServerInstance::startAuthentication(bool isService, const char* dbName,
- const unsigned char* dpb, unsigned int dpbSize,
- WriterInterface* writerInterface)
+Result FB_CARG DebugServer::startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ const unsigned char* dpb, unsigned int dpbSize,
+ WriterInterface* writerInterface)
{
- str.erase();
- Firebird::ClumpletReader rdr(isService ?
- Firebird::ClumpletReader::spbList :
- Firebird::ClumpletReader::dpbList, dpb, dpbSize);
+ try
+ {
+ str.erase();
+ Firebird::ClumpletReader rdr(isService ?
+ Firebird::ClumpletReader::spbList :
+ Firebird::ClumpletReader::dpbList, dpb, dpbSize);
- if (rdr.find(isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth))
+ if (rdr.find(isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth))
+ {
+ str.assign(rdr.getBytes(), rdr.getClumpLength());
+ }
+
+ str += '_';
+ return AUTH_MORE_DATA;
+ }
+ catch (const Firebird::Exception& ex)
{
- str.assign(rdr.getBytes(), rdr.getClumpLength());
+ ex.stuffException(status);
+ return AUTH_FAILED;
}
-
- str += '_';
- return AUTH_MORE_DATA;
}
-Result DebugServerInstance::contAuthentication(WriterInterface* writerInterface,
- const unsigned char* data, unsigned int size)
+Result FB_CARG DebugServer::contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ const unsigned char* data, unsigned int size)
{
- //fprintf(stderr, "DebugServerInstance::contAuthentication: %.*s\n", size, data);
- writerInterface->add(Firebird::string((const char*) data, size).c_str(), "DEBUG", "");
- return AUTH_SUCCESS;
+ try
+ {
+#ifdef AUTH_VERBOSE
+ fprintf(stderr, "DebugServerInstance::contAuthentication: %.*s\n", size, data);
+#endif
+ writerInterface->add(Firebird::string((const char*) data, size).c_str(), "DEBUG", "");
+ return AUTH_SUCCESS;
+ }
+ catch (const Firebird::Exception& ex)
+ {
+ ex.stuffException(status);
+ return AUTH_FAILED;
+ }
}
-void DebugServerInstance::getData(const unsigned char** data, unsigned short* dataSize)
+void FB_CARG DebugServer::getData(const unsigned char** data, unsigned short* dataSize)
{
*data = reinterpret_cast<const unsigned char*>(str.c_str());
*dataSize = str.length();
- //fprintf(stderr, "DebugServerInstance::getData: %.*s\n", *dataSize, *data);
+#ifdef AUTH_VERBOSE
+ fprintf(stderr, "DebugServerInstance::getData: %.*s\n", *dataSize, *data);
+#endif
}
-void DebugServerInstance::release()
+int FB_CARG DebugServer::release()
{
- Firebird::interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
}
-DebugClientInstance::DebugClientInstance()
- : str(*getDefaultMemoryPool())
+DebugClient::DebugClient(Firebird::IFactoryParameter*)
+ : str(getPool())
{ }
-Result DebugClientInstance::startAuthentication(bool isService, const char*, DpbInterface* dpb)
+Result FB_CARG DebugClient::startAuthentication(Firebird::Status* status, bool isService, const char*, DpbInterface* dpb)
{
- str = "HAND";
- if (dpb)
+ try
{
- dpb->add((isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth),
- str.c_str(), str.length());
- return AUTH_SUCCESS;
+ str = "HAND";
+ if (dpb)
+ {
+ dpb->add((isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth),
+ str.c_str(), str.length());
+ return AUTH_SUCCESS;
+ }
+ return AUTH_MORE_DATA;
}
- return AUTH_MORE_DATA;
+ catch (const Firebird::Exception& ex)
+ {
+ ex.stuffException(status);
+ return AUTH_FAILED;
+ }
}
-Result DebugClientInstance::contAuthentication(const unsigned char* data, unsigned int size)
+Result FB_CARG DebugClient::contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size)
{
- //fprintf(stderr, "DebugClientInstance::contAuthentication: %.*s\n", size, data);
- str.assign(data, size);
- str += "SHAKE";
- return AUTH_CONTINUE;
+ try
+ {
+#ifdef AUTH_VERBOSE
+ fprintf(stderr, "DebugClientInstance::contAuthentication: %.*s\n", size, data);
+#endif
+ str.assign(data, size);
+ str += "SHAKE";
+ return AUTH_CONTINUE;
+ }
+ catch (const Firebird::Exception& ex)
+ {
+ ex.stuffException(status);
+ return AUTH_FAILED;
+ }
}
-void DebugClientInstance::getData(const unsigned char** data, unsigned short* dataSize)
+void FB_CARG DebugClient::getData(const unsigned char** data, unsigned short* dataSize)
{
*data = reinterpret_cast<const unsigned char*>(str.c_str());
*dataSize = str.length();
- //fprintf(stderr, "DebugClientInstance::getData: %.*s\n", *dataSize, *data);
+#ifdef AUTH_VERBOSE
+ fprintf(stderr, "DebugClientInstance::getData: %.*s\n", *dataSize, *data);
+#endif
}
-void DebugClientInstance::release()
+int FB_CARG DebugClient::release()
{
- Firebird::interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
}
} // namespace Auth
Modified: firebird/trunk/src/auth/AuthDbg.h
===================================================================
--- firebird/trunk/src/auth/AuthDbg.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/AuthDbg.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -30,11 +30,12 @@
#ifndef FB_AUTHDBG_H
#define FB_AUTHDBG_H
-//#define AUTH_DEBUG
+#define AUTH_DEBUG
#ifdef AUTH_DEBUG
#include "../auth/AuthInterface.h"
+#include "../common/classes/ImplementHelper.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/classes/init.h"
#include "../common/classes/array.h"
@@ -45,44 +46,32 @@
// The idea of debug plugin is to send some data from server to client,
// modify them on client and return result (which becomes login name) to the server
-class DebugServer : public ServerPlugin
+class DebugServer : public Firebird::StdPlugin<Server, FB_AUTH_SERVER_VERSION>
{
public:
- ServerInstance* instance();
-};
+ DebugServer(Firebird::IFactoryParameter*);
-class DebugClient : public ClientPlugin
-{
-public:
- ClientInstance* instance();
-};
-
-class DebugServerInstance : public ServerInstance
-{
-public:
- DebugServerInstance();
-
- Result startAuthentication(bool isService, const char* dbName,
+ Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
- Result contAuthentication(WriterInterface* writerInterface,
+ Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
private:
Firebird::string str;
};
-class DebugClientInstance : public ClientInstance
+class DebugClient : public Firebird::StdPlugin<Client, FB_AUTH_CLIENT_VERSION>
{
public:
- DebugClientInstance();
+ DebugClient(Firebird::IFactoryParameter*);
- Result startAuthentication(bool isService, const char* dbName, DpbInterface* dpb);
- Result contAuthentication(const unsigned char* data, unsigned int size);
+ Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
+ Result contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
private:
Firebird::string str;
Modified: firebird/trunk/src/auth/AuthInterface.h
===================================================================
--- firebird/trunk/src/auth/AuthInterface.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/AuthInterface.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -29,7 +29,7 @@
#ifndef FB_AUTH_INTERFACE
#define FB_AUTH_INTERFACE
-#include "../common/classes/Interface.h"
+#include "FirebirdPluginApi.h"
// This is temporal measure - see later
struct internal_user_data;
@@ -43,61 +43,54 @@
enum Result {AUTH_SUCCESS, AUTH_CONTINUE, AUTH_FAILED, AUTH_MORE_DATA};
-class WriterInterface
+class WriterInterface : public Firebird::Interface
{
public:
- virtual void reset() = 0;
- virtual void add(const char* user, const char* method, const char* details) = 0;
+ virtual void FB_CARG reset() = 0;
+ virtual void FB_CARG add(const char* user, const char* method, const char* details) = 0;
};
+#define FB_AUTH_WRITER_VERSION (FB_INTERFACE_VERSION + 2)
-class DpbInterface
+class DpbInterface : public Firebird::Interface
{
public:
- virtual int find(UCHAR tag) = 0;
- virtual void add(UCHAR tag, const void* bytes, unsigned int count) = 0;
- virtual void drop() = 0;
+ virtual int FB_CARG find(UCHAR tag) = 0;
+ virtual void FB_CARG add(UCHAR tag, const void* bytes, unsigned int count) = 0;
+ virtual void FB_CARG drop() = 0;
};
+#define FB_AUTH_DBP_VERSION (FB_INTERFACE_VERSION + 3)
-class ServerInstance : public Firebird::Interface
+class Server : public Firebird::Plugin
{
public:
- virtual Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ virtual Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface) = 0;
- virtual Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ virtual Result FB_CARG contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size) = 0;
- virtual void getData(const unsigned char** data, unsigned short* dataSize) = 0;
+ virtual void FB_CARG getData(const unsigned char** data, unsigned short* dataSize) = 0;
};
+#define FB_AUTH_SERVER_VERSION (FB_PLUGIN_VERSION + 3)
-class ServerPlugin : public Firebird::Plugin
+class Client : public Firebird::Plugin
{
public:
- virtual ServerInstance* instance() = 0;
+ virtual Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb) = 0;
+ virtual Result FB_CARG contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size) = 0;
+ virtual void FB_CARG getData(const unsigned char** data, unsigned short* dataSize) = 0;
};
+#define FB_AUTH_CLIENT_VERSION (FB_PLUGIN_VERSION + 3)
-class ClientInstance : public Firebird::Interface
+class Management : public Firebird::Plugin
{
public:
- virtual Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb) = 0;
- virtual Result contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size) = 0;
- virtual void getData(const unsigned char** data, unsigned short* dataSize) = 0;
-};
-
-class ClientPlugin : public Firebird::Plugin
-{
-public:
- virtual ClientInstance* instance() = 0;
-};
-
-class ManagementPlugin : public Firebird::Plugin
-{
-public:
// work in progress - we must avoid both internal_user_data and callback function
- virtual int execLine(ISC_STATUS* isc_status, const char *realUser,
+ virtual int FB_CARG execLine(ISC_STATUS* isc_status, const char *realUser,
FB_API_HANDLE db, FB_API_HANDLE trans,
internal_user_data* io_user_data,
FPTR_SECURITY_CALLBACK display_func, void* callback_arg) = 0;
};
+#define FB_AUTH_MANAGE_VERSION (FB_PLUGIN_VERSION + 1)
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -29,41 +29,45 @@
#include "../jrd/ibase.h"
#include "../auth/SecurityDatabase/LegacyClient.h"
#include "../common/classes/ImplementHelper.h"
+#include "../common/classes/init.h"
-namespace {
-#ifndef WIN_NT
- char name[] = "LEGACY_AUTH";
- Firebird::PluginHelper<Auth::SecurityDatabaseClient, Firebird::Plugin::AuthClient, 200, name> client;
-#endif
-}
-
namespace Auth {
-ClientInstance* SecurityDatabaseClient::instance()
+Result SecurityDatabaseClient::startAuthentication(Firebird::Status*, bool, const char*, DpbInterface* dpb)
{
- return Firebird::interfaceAlloc<SecurityDatabaseClientInstance>();
-}
-
-Result SecurityDatabaseClientInstance::startAuthentication(Firebird::Status*, bool, const char*, DpbInterface* dpb)
-{
return dpb->find(isc_dpb_user_name) &&
(dpb->find(isc_dpb_password) || dpb->find(isc_dpb_password_enc)) ?
AUTH_SUCCESS : AUTH_CONTINUE;
}
-Result SecurityDatabaseClientInstance::contAuthentication(Firebird::Status*, const unsigned char*, unsigned int)
+Result SecurityDatabaseClient::contAuthentication(Firebird::Status*, const unsigned char*, unsigned int)
{
return AUTH_FAILED;
}
-void SecurityDatabaseClientInstance::getData(const unsigned char**, unsigned short* dataSize)
+void SecurityDatabaseClient::getData(const unsigned char**, unsigned short* dataSize)
{
*dataSize = 0;
}
-void SecurityDatabaseClientInstance::release()
+int SecurityDatabaseClient::release()
{
- interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+ return 1;
}
+namespace {
+ Firebird::Static<Firebird::SimpleFactory<SecurityDatabaseClient> > factory;
+}
+
+void registerLegacyClient(Firebird::IPlugin* iPlugin)
+{
+ factory->addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthClient, "Legacy_Auth", &factory);
+}
+
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -28,27 +28,28 @@
#define AUTH_LEGACY_CLIENT_H
#include "../auth/AuthInterface.h"
+#include "../common/classes/ImplementHelper.h"
namespace Auth {
// Required to stop analyzing rest of plugins before first roundtrip to server
// if legacy login is present in DPB
-class SecurityDatabaseClient : public ClientPlugin
+class SecurityDatabaseClient : public Firebird::StdPlugin<Client, FB_AUTH_CLIENT_VERSION>
{
public:
- ClientInstance* instance();
-};
+ explicit SecurityDatabaseClient(Firebird::IFactoryParameter*)
+ {
+ }
-class SecurityDatabaseClientInstance : public ClientInstance
-{
-public:
Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
Result contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
};
+void registerLegacyClient(Firebird::IPlugin* iPlugin);
+
} // namespace Auth
#endif // AUTH_LEGACY_CLIENT_H
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -39,20 +39,15 @@
#include "../common/classes/UserBlob.h"
#include "../auth/SecurityDatabase/LegacyManagement.h"
#include "../common/classes/ImplementHelper.h"
+#include "FirebirdPluginApi.h"
// Here we use version-independent symbolic link (or copy) of actual database
DATABASE DB = STATIC FILENAME "security.fdb";
-namespace {
+static Firebird::GlobalPtr<Firebird::Mutex> execLineMutex; // protects various gpre generated structures
-Firebird::GlobalPtr<Firebird::Mutex> execLineMutex; // protects various gpre generated structures
-
-// register plugin
-char name[] = "LEGACY_AUTH";
-Firebird::PluginHelper<Auth::SecurityDatabaseManagement, Firebird::Plugin::UserManagement, 0, name> manage;
-
-bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans,
- const internal_user_data* io_user_data)
+static bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans,
+ const internal_user_data* io_user_data)
{
if (!io_user_data->admin_entered)
{
@@ -93,7 +88,7 @@
}
/*
-bool storePasswd(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans,
+static bool storePasswd(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HANDLE trans,
ISC_QUAD& blobId, const Firebird::string& passwd)
{
UserBlob blob(isc_status);
@@ -113,13 +108,8 @@
}
*/
-} // anonymous namespace
-
-namespace Auth {
-
// work in progress - we must avoid both internal_user_data and callback function
-
-int SecurityDatabaseManagement::execLine(ISC_STATUS* isc_status,
+int Auth::SecurityDatabaseManagement::execLine(ISC_STATUS* isc_status,
const char* realUser,
FB_API_HANDLE DB,
FB_API_HANDLE trans,
@@ -550,4 +540,26 @@
return ret;
}
-} // namespace Auth
+int Auth::SecurityDatabaseManagement::release()
+{
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
+}
+
+// register plugin
+static Firebird::Static<Firebird::SimpleFactory<Auth::SecurityDatabaseManagement> > factory;
+
+extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
+{
+ Firebird::IPlugin* iPlugin = master->getPluginInterface();
+
+ factory->addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthUserManagement, "Legacy_Auth", &factory);
+
+ iPlugin->release();
+}
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -27,19 +27,26 @@
#ifndef AUTH_LEGACY_MANAGEMENT_H
#define AUTH_LEGACY_MANAGEMENT_H
+#include "../common/classes/ImplementHelper.h"
#include "../auth/AuthInterface.h"
namespace Auth {
-class SecurityDatabaseManagement : public ManagementPlugin
+class SecurityDatabaseManagement : public Firebird::StdPlugin<Management, FB_AUTH_MANAGE_VERSION>
{
public:
+ explicit SecurityDatabaseManagement(Firebird::IFactoryParameter*)
+ {
+ }
+
// work in progress - we must avoid both internal_user_data and callback function
int execLine(ISC_STATUS* isc_status, const char* realUser,
FB_API_HANDLE db, FB_API_HANDLE trans,
internal_user_data* io_user_data,
FPTR_SECURITY_CALLBACK display_func, void* callback_arg);
+
+ int release();
};
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -32,6 +32,7 @@
#include "../common/sha.h"
#include "gen/iberror.h"
#include "../common/classes/ClumpletWriter.h"
+#include "../common/classes/ImplementHelper.h"
#include "../auth/AuthInterface.h"
@@ -108,24 +109,30 @@
}
};
-class SecurityDatabaseServer : public ServerPlugin
+class SecurityDatabaseServerFactory : public Firebird::StdIface<Firebird::PluginsFactory, FB_PLUGINS_FACTORY_VERSION>
{
public:
- ServerInstance* instance();
+ Firebird::Plugin* FB_CARG createPlugin(const char* name, const char* configFile);
};
-class SecurityDatabaseServerInstance : public ServerInstance
+class SecurityDatabaseServer : public Firebird::StdPlugin<Server, FB_AUTH_SERVER_VERSION>
{
public:
+ explicit SecurityDatabaseServer(Firebird::IFactoryParameter*)
+ {
+ }
+
Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
};
+void registerLegacyServer(Firebird::IPlugin* iPlugin);
+
} // namespace Auth
#endif // JRD_PWD_H
Modified: firebird/trunk/src/auth/SecurityDatabase/pwd.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/pwd.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/SecurityDatabase/pwd.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -47,10 +47,6 @@
namespace {
-// register plugin
-char name[] = "LEGACY_AUTH";
-PluginHelper<Auth::SecurityDatabaseServer, Firebird::Plugin::AuthServer, 200, name> server;
-
// temporal implementation of timer
GlobalPtr<Mutex> timerMutex;
@@ -454,12 +450,7 @@
instance.fini();
}
-ServerInstance* SecurityDatabaseServer::instance()
-{
- return Firebird::interfaceAlloc<SecurityDatabaseServerInstance>();
-}
-
-Result SecurityDatabaseServerInstance::startAuthentication(Firebird::Status* status,
+Result SecurityDatabaseServer::startAuthentication(Firebird::Status* status,
bool isService, const char*,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface)
@@ -476,22 +467,38 @@
}
}
-Result SecurityDatabaseServerInstance::contAuthentication(Firebird::Status*,
+Result SecurityDatabaseServer::contAuthentication(Firebird::Status*,
WriterInterface* /*writerInterface*/,
const unsigned char* /*data*/, unsigned int /*size*/)
{
return AUTH_FAILED;
}
-void SecurityDatabaseServerInstance::getData(const unsigned char** data, unsigned short* dataSize)
+void SecurityDatabaseServer::getData(const unsigned char** data, unsigned short* dataSize)
{
*data = NULL;
*dataSize = 0;
}
-void SecurityDatabaseServerInstance::release()
+int SecurityDatabaseServer::release()
{
- interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
}
+namespace {
+ Firebird::Static<Firebird::SimpleFactory<SecurityDatabaseServer> > factory;
+}
+
+void registerLegacyServer(Firebird::IPlugin* iPlugin)
+{
+ factory->addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthServer, "Legacy_Auth", &factory);
+}
+
} // namespace Auth
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -35,14 +35,13 @@
using namespace Firebird;
-namespace {
- char name[] = "WIN_SSPI";
- PluginHelper<Auth::WinSspiServer, Plugin::AuthServer, 100, name> server;
- PluginHelper<Auth::WinSspiClient, Plugin::AuthClient, 100, name> client;
-}
-
namespace
{
+ Firebird::SimpleFactory<Auth::WinSspiClient> clientFactory;
+ Firebird::SimpleFactory<Auth::WinSspiServer> serverFactory;
+
+ const char* plugName = "Win_Sspi";
+
void makeDesc(SecBufferDesc& d, SecBuffer& b, size_t len, void* p)
{
b.BufferType = SECBUFFER_TOKEN;
@@ -333,30 +332,19 @@
}
-ServerInstance* WinSspiServer::instance()
-{
- return interfaceAlloc<WinSspiServerInstance>();
-}
-
-ClientInstance* WinSspiClient::instance()
-{
- return interfaceAlloc<WinSspiClientInstance>();
-}
-
-
-WinSspiServerInstance::WinSspiServerInstance()
- : sspiData(*getDefaultMemoryPool())
+WinSspiServer::WinSspiServer(Firebird::IFactoryParameter*)
+ : sspiData(getPool())
{ }
-WinSspiClientInstance::WinSspiClientInstance()
- : sspiData(*getDefaultMemoryPool())
+WinSspiClient::WinSspiClient(Firebird::IFactoryParameter*)
+ : sspiData(getPool())
{ }
-Result WinSspiServerInstance::startAuthentication(Firebird::Status* status,
- bool isService,
- const char* /*dbName*/,
- const unsigned char* dpb, unsigned int dpbSize,
- WriterInterface* /*writerInterface*/)
+Result WinSspiServer::startAuthentication(Firebird::Status* status,
+ bool isService,
+ const char* /*dbName*/,
+ const unsigned char* dpb, unsigned int dpbSize,
+ WriterInterface* /*writerInterface*/)
{
const UCHAR tag = isService ? isc_spb_trusted_auth : isc_dpb_trusted_auth;
ClumpletReader rdr((isService ? ClumpletReader::spbList : ClumpletReader::dpbList),
@@ -375,9 +363,9 @@
return AUTH_MORE_DATA;
}
-Result WinSspiServerInstance::contAuthentication(Firebird::Status* status,
- WriterInterface* writerInterface,
- const unsigned char* data, unsigned int size)
+Result WinSspiServer::contAuthentication(Firebird::Status* status,
+ WriterInterface* writerInterface,
+ const unsigned char* data, unsigned int size)
{
sspiData.clear();
sspiData.add(data, size);
@@ -403,21 +391,27 @@
return AUTH_MORE_DATA;
}
-void WinSspiServerInstance::getData(const unsigned char** data, unsigned short* dataSize)
+void WinSspiServer::getData(const unsigned char** data, unsigned short* dataSize)
{
*data = sspiData.begin();
*dataSize = sspiData.getCount();
}
-void WinSspiServerInstance::release()
+void WinSspiServer::release()
{
- interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
}
-Result WinSspiClientInstance::startAuthentication(Firebird::Status* status,
- bool isService,
- const char* /*dbName*/,
- DpbInterface* dpb)
+Result WinSspiClient::startAuthentication(Firebird::Status* status,
+ bool isService,
+ const char* /*dbName*/,
+ DpbInterface* dpb)
{
sspi.request(sspiData);
@@ -443,8 +437,8 @@
return sspi.isActive() ? AUTH_SUCCESS : AUTH_CONTINUE;
}
-Result WinSspiClientInstance::contAuthentication(Firebird::Status* status,
- const unsigned char* data, unsigned int size)
+Result WinSspiClient::contAuthentication(Firebird::Status* status,
+ const unsigned char* data, unsigned int size)
{
sspiData.clear();
sspiData.add(data, size);
@@ -456,17 +450,35 @@
return sspi.isActive() ? AUTH_MORE_DATA : AUTH_CONTINUE;
}
-void WinSspiClientInstance::getData(const unsigned char** data, unsigned short* dataSize)
+void WinSspiClient::getData(const unsigned char** data, unsigned short* dataSize)
{
*data = sspiData.begin();
*dataSize = sspiData.getCount();
}
-void WinSspiClientInstance::release()
+int WinSspiClient::release()
{
- interfaceFree(this);
+ if (--refCounter == 0)
+ {
+ delete this;
+ return 0;
+ }
+
+ return 1;
}
+void registerTrustedClient(Firebird::IPlugin* iPlugin)
+{
+ clientFactory.addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthClient, plugName, &clientFactory);
+}
+
+void registerTrustedServer(Firebird::IPlugin* iPlugin)
+{
+ serverFactory.addRef();
+ iPlugin->registerPlugin(Firebird::PluginType::AuthServer, plugName, &serverFactory);
+}
+
} // namespace Auth
#endif // TRUSTED_AUTH
Modified: firebird/trunk/src/auth/trusted/AuthSspi.h
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -34,6 +34,7 @@
#include <../common/classes/fb_string.h>
#include <../common/classes/array.h>
+#include "../common/classes/ImplementHelper.h"
#include <../jrd/ibase.h>
#include "../auth/AuthInterface.h"
@@ -95,37 +96,25 @@
bool getLogin(Firebird::string& login, bool& wh);
};
-class WinSspiServer : public ServerPlugin
+class WinSspiServer : public Firebird::StdPlugin<Server, FB_AUTH_SERVER_VERSION>
{
public:
- ServerInstance* instance();
-};
-
-class WinSspiClient : public ClientPlugin
-{
-public:
- ClientInstance* instance();
-};
-
-class WinSspiServerInstance : public ServerInstance
-{
-public:
Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
- WinSspiServerInstance();
+ WinSspiServer(Firebird::IFactoryParameter*);
private:
AuthSspi::DataHolder sspiData;
AuthSspi sspi;
};
-class WinSspiClientInstance : public ClientInstance
+class WinSspiClient : public Firebird::StdPlugin<Client, FB_AUTH_CLIENT_VERSION>
{
public:
Result startAuthentication(Firebird::Status* status, bool isService,
@@ -133,15 +122,18 @@
Result contAuthentication(Firebird::Status* status,
const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int release();
- WinSspiClientInstance();
+ WinSspiClient(Firebird::IFactoryParameter*);
private:
AuthSspi::DataHolder sspiData;
AuthSspi sspi;
};
+void registerTrustedClient(Firebird::IPlugin* iPlugin);
+void registerTrustedServer(Firebird::IPlugin* iPlugin);
+
} // namespace Auth
#endif // TRUSTED_AUTH
Modified: firebird/trunk/src/common/Auth.cpp
===================================================================
--- firebird/trunk/src/common/Auth.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/common/Auth.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -32,9 +32,8 @@
namespace Auth {
-WriterImplementation::WriterImplementation(Firebird::MemoryPool& pool, bool svcFlag)
- : Firebird::PermanentStorage(pool), body(getPool()),
- sequence(0), tag(svcFlag ? isc_spb_auth_block : isc_dpb_auth_block)
+WriterImplementation::WriterImplementation(bool svcFlag)
+ : body(getPool()), sequence(0), tag(svcFlag ? isc_spb_auth_block : isc_dpb_auth_block)
{ }
void WriterImplementation::store(Firebird::ClumpletWriter& to)
@@ -75,11 +74,10 @@
}
-bool legacy(Firebird::Plugin* plugin)
+bool legacy(const char* nm)
{
const char* legacyTrusted = "WIN_SSPI";
const unsigned short legLength = strlen(legacyTrusted);
- const char* nm = plugin->name();
return strlen(nm) == legLength && memcmp(legacyTrusted, nm, legLength) == 0;
}
Modified: firebird/trunk/src/common/Auth.h
===================================================================
--- firebird/trunk/src/common/Auth.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/common/Auth.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -35,20 +35,21 @@
#include "../common/classes/init.h"
#include "../common/classes/array.h"
#include "../common/classes/fb_string.h"
+#include "../common/classes/ImplementHelper.h"
namespace Auth {
-bool legacy(Firebird::Plugin* plugin);
+bool legacy(const char* nm);
-class WriterImplementation : public WriterInterface, public Firebird::PermanentStorage
+class WriterImplementation : public Firebird::StackIface<WriterInterface, FB_AUTH_WRITER_VERSION>
{
public:
- WriterImplementation(Firebird::MemoryPool&, bool svcFlag);
+ WriterImplementation(bool svcFlag);
- void store(Firebird::ClumpletWriter& to);
+ void FB_CARG store(Firebird::ClumpletWriter& to);
- void reset();
- void add(const char* name, const char* method, const char* details);
+ void FB_CARG reset();
+ void FB_CARG add(const char* name, const char* method, const char* details);
private:
Firebird::AuthWriter body;
@@ -56,41 +57,41 @@
unsigned char tag;
};
-class DpbImplementation : public DpbInterface
+class DpbImplementation : public Firebird::StackIface<DpbInterface, FB_AUTH_DBP_VERSION>
{
public:
DpbImplementation(Firebird::ClumpletWriter& base);
- int find(UCHAR tag);
- void add(UCHAR tag, const void* bytes, unsigned int count);
- void drop();
+ int FB_CARG find(UCHAR tag);
+ void FB_CARG add(UCHAR tag, const void* bytes, unsigned int count);
+ void FB_CARG drop();
private:
Firebird::ClumpletWriter* body;
};
-#define AUTH_DEBUG
+//#define AUTH_DEBUG
#ifdef AUTH_DEBUG
// The idea of debug plugin is to send some data from server to client,
// modify them on client and return result (which becomes login name) to the server
-class DebugServer : public ServerPlugin
+class DebugServer : Firebird::StdIface<public Firebird::PluginsFactory, FB_PLUGINS_FACTORY_VERSION>
{
public:
- ServerInstance* instance();
- void release();
+ Firebird::Interface* FB_CARG createPlugin(const char* name, const char* configFile);
+ int FB_CARG release();
};
-class DebugClient : public ClientPlugin
+class DebugClient : public Firebird::StdIface<Firebird::PluginsFactory, FB_PLUGINS_FACTORY_VERSION>
{
public:
- ClientInstance* instance();
- void release();
+ Firebird::Interface* FB_CARG createPlugin(const char* name, const char* configFile);
+ int FB_CARG release();
};
-class DebugServerInstance : public ServerInstance
+class DebugServerInstance : public Firebird::StdPlugin<ServerInstance, FB_AUTH_SERVER_VERSION>
{
public:
DebugServerInstance();
@@ -101,13 +102,13 @@
Result contAuthentication(WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int FB_CARG release();
private:
Firebird::string str;
};
-class DebugClientInstance : public ClientInstance
+class DebugClientInstance : public Firebird::StdPlugin<ClientInstance, FB_AUTH_CLIENT_VERSION>
{
public:
DebugClientInstance();
@@ -115,7 +116,7 @@
Result startAuthentication(bool isService, const char* dbName, DpbInterface* dpb);
Result contAuthentication(const unsigned char* data, unsigned int size);
void getData(const unsigned char** data, unsigned short* dataSize);
- void release();
+ int FB_CARG release();
private:
Firebird::string str;
Modified: firebird/trunk/src/common/IntlUtil.cpp
===================================================================
--- firebird/trunk/src/common/IntlUtil.cpp 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/common/IntlUtil.cpp 2011-01-14 17:31:40 UTC (rev 52121)
@@ -461,6 +461,7 @@
catch (...)
{
delete charSet;
+ gds__log("initUnicodeCollation failed - unexpected exception caught");
return false;
}
@@ -497,7 +498,10 @@
UnicodeUtil::Utf16Collation::create(tt, attributes, map16, configInfo);
if (!collation)
+ {
+ gds__log("initUnicodeCollation failed - UnicodeUtil::Utf16Collation::create failed");
return false;
+ }
tt->texttype_impl = new TextTypeImpl(cs, collation);
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2011-01-14 17:01:40 UTC (rev 52120)
+++ firebird/trunk/src/common/StatusHolder.h 2011-01-14 17:31:40 UTC (rev 52121)
@@ -31,6 +31,7 @@
#include "ProviderInterface.h"
#include "../common/utils_proto.h"
+#include "../common/classes/ImplementHelper.h"
namespace Firebird {
@@ -42,7 +43,7 @@
set(fb_utils::statusLength(value), value);
}
- virtual void set(size_t length, const ISC_STATUS* value)
+ virtual void set(unsigned int length, const ISC_STATUS* value)
{
fb_utils::copyStatus(vector, FB_NELEM(vector), value, length);
}
@@ -72,14 +73,8 @@
ISC_STATUS vector[40]; // FixMe - may be a kind of dynamic storage will be better?
};
-class LocalStatus : public BaseStatus
+class LocalStatus : public StackIface<BaseStatus, FB_STATUS_VERSION>
{
-public:
- virtual void release()
- {
- // do nothing - we are supposed to be on stack or a part of other object
- fb_assert(false);
- }
};
class StatusH...
[truncated message content] |
|
From: <fir...@us...> - 2011-01-15 03:19:05
|
Revision: 52122
http://firebird.svn.sourceforge.net/firebird/?rev=52122&view=rev
Author: firebirds
Date: 2011-01-15 03:18:57 +0000 (Sat, 15 Jan 2011)
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 2011-01-14 17:31:40 UTC (rev 52121)
+++ firebird/trunk/ChangeLog 2011-01-15 03:18:57 UTC (rev 52122)
@@ -1,3 +1,104 @@
+ 2011-01-14 17:31 alexpeshkoff
+ M builds/install/misc/aliases.conf.in
+ M builds/install/misc/firebird.conf.in
+ A builds/install/misc/plugins.conf
+ M builds/posix/Makefile.in
+ A builds/posix/fbplugin.vers (from /firebird/trunk/builds/posix/fbtrace.vers:52016)
+ D builds/posix/fbtrace.vers
+ M builds/posix/firebird.vers
+ M builds/posix/make.defaults
+ M builds/posix/make.shared.variables
+ M builds/posix/prefix.linux
+ M builds/posix/prefix.linux_amd64
+ D builds/posix/udr_engine.hpux.vers
+ M builds/posix/udr_engine.vers
+ M configure.in
+ M src/auth/AuthDbg.cpp
+ M src/auth/AuthDbg.h
+ M src/auth/AuthInterface.h
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyClient.h
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyManagement.h
+ M src/auth/SecurityDatabase/jrd_pwd.h
+ M src/auth/SecurityDatabase/pwd.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/auth/trusted/AuthSspi.h
+ M src/common/Auth.cpp
+ M src/common/Auth.h
+ M src/common/IntlUtil.cpp
+ M src/common/StatusHolder.h
+ M src/common/ThreadStart.cpp
+ M src/common/classes/ImplementHelper.h
+ D src/common/classes/Interface.h
+ M src/common/classes/init.h
+ M src/common/config/config.cpp
+ M src/common/config/config.h
+ M src/common/config/config_file.cpp
+ M src/common/config/config_file.h
+ M src/common/fb_exception.cpp
+ M src/common/thd.cpp
+ M src/common/unicode_util.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/include/FirebirdExternalApi.h
+ M src/include/FirebirdPluginApi.h
+ A src/include/Interface.h (from /firebird/trunk/src/common/classes/Interface.h:52016)
+ M src/include/ProviderInterface.h
+ M src/include/consts_pub.h
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/JrdStatement.h
+ D src/jrd/PluginManager.cpp
+ D src/jrd/PluginManager.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/blb.h
+ M src/jrd/event.cpp
+ M src/jrd/event.h
+ M src/jrd/event_proto.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+ M src/jrd/ntrace.h
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/client/interface.cpp
+ A src/remote/client/interface.h
+ M src/remote/remot_proto.h
+ M src/remote/remote.h
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/security.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/utilities/ntrace/TraceConfiguration.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/TracePluginImpl.h
+ M src/utilities/ntrace/traceplugin.cpp
+ A src/yvalve/MasterImplementation.cpp
+ A src/yvalve/PluginManager.cpp (from /firebird/trunk/src/jrd/PluginManager.cpp:52016)
+ A src/yvalve/PluginManager.h (from /firebird/trunk/src/jrd/PluginManager.h:52016)
+ M src/yvalve/gds.cpp
+ M src/yvalve/why.cpp
+New plugin manager. Use it for all types of plugins.
+
+ 2011-01-14 17:01 alexpeshkoff
+ M src/lock/print.cpp
+misc
+
+ 2011-01-14 06:51 dimitr
+ M src/jrd/met.epp
+Tuned the code a little in order to avoid redundant retrievals. As a side effect, it downgrades three-way joins to two-way ones, thus helping the optimizer to choose a good plan in the worst (zero selectivity) cases. This should resolve CORE-2933 (Very slow execution of a script that creates a lot of metadata) and CORE-3237 (Slow compilation of stored procedures) without tweaking the optimizer constants.
+
2011-01-12 10:56 dimitr
M doc/license/README.license.usage.txt
Corrected the license URLs.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-14 17:31:40 UTC (rev 52121)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-15 03:18:57 UTC (rev 52122)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28960
+ FORMAL BUILD NUMBER:28963
*/
-#define PRODUCT_VER_STRING "3.0.0.28960"
-#define FILE_VER_STRING "WI-T3.0.0.28960"
-#define LICENSE_VER_STRING "WI-T3.0.0.28960"
-#define FILE_VER_NUMBER 3, 0, 0, 28960
+#define PRODUCT_VER_STRING "3.0.0.28963"
+#define FILE_VER_STRING "WI-T3.0.0.28963"
+#define LICENSE_VER_STRING "WI-T3.0.0.28963"
+#define FILE_VER_NUMBER 3, 0, 0, 28963
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28960"
+#define FB_BUILD_NO "28963"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-14 17:31:40 UTC (rev 52121)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-15 03:18:57 UTC (rev 52122)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28960
+BuildNum=28963
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2011-01-16 02:16:22
|
Revision: 52134
http://firebird.svn.sourceforge.net/firebird/?rev=52134&view=rev
Author: asfernandes
Date: 2011-01-16 02:16:15 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Misc
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/doc/README.fb_shutdown
firebird/trunk/src/common/ThreadStart.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/include/ProviderInterface.h
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/blb.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceManager.h
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/client/interface.h
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2011-01-16 02:16:15 UTC (rev 52134)
@@ -356,7 +356,7 @@
#
# Type: string
-# AuthServer and AuthClient determine what uthentication methods will be used
+# AuthServer and AuthClient determine what authentication methods will be used
# by network server and client redirector. For non-windows systems default
# for both is Legacy_Auth.
#
Modified: firebird/trunk/doc/README.fb_shutdown
===================================================================
--- firebird/trunk/doc/README.fb_shutdown 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/doc/README.fb_shutdown 2011-01-16 02:16:15 UTC (rev 52134)
@@ -43,7 +43,7 @@
fb_shut_confirmation - callback function may return non-zero value to abort shutdown
fb_shut_preproviders - callback function will be called before shutting down engine
fb_shut_postproviders - callback function will be called after shutting down engine
-fb_shut_finish - final step, callback function may wait for some activity to be treminated
+fb_shut_finish - final step, callback function may wait for some activity to be terminated
or ORed combination of them (to make same function be called in required cases).
Callback function has 3 parameters - reason of shutdown, actual value of mask with which it was
Modified: firebird/trunk/src/common/ThreadStart.cpp
===================================================================
--- firebird/trunk/src/common/ThreadStart.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/common/ThreadStart.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -37,8 +37,6 @@
#include "../common/isc_s_proto.h"
#include "../common/gdsassert.h"
-
-
#ifdef WIN_NT
#include <process.h>
#include <windows.h>
@@ -139,7 +137,6 @@
pthread_attr_t pattr;
int state;
-
#if defined (LINUX) || defined (FREEBSD)
if (state = pthread_create(&thread, NULL, THREAD_ENTRYPOINT, THREAD_ARG))
Firebird::system_call_failed::raise("pthread_create", state);
Modified: firebird/trunk/src/common/classes/ImplementHelper.h
===================================================================
--- firebird/trunk/src/common/classes/ImplementHelper.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/common/classes/ImplementHelper.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -261,7 +261,7 @@
void getPlugin()
{
- currentPlugin = (P*)(pluginSet->plugin());
+ currentPlugin = (P*) pluginSet->plugin();
}
};
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/common/config/config.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -662,7 +662,7 @@
const char* Config::getPlugins(unsigned int type)
{
- switch(type)
+ switch (type)
{
case Firebird::PluginType::Provider:
return (const char*) getDefaultConfig()->values[KEY_PLUG_PROVIDERS];
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/common/unicode_util.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -779,10 +779,8 @@
ObjectsArray<string> versions;
getVersions(configInfo, versions);
- if (!versions.getCount())
- {
+ if (versions.isEmpty())
gds__log("No versions");
- }
string version = icuVersion.isEmpty() ? versions[0] : icuVersion;
if (version == "default")
Modified: firebird/trunk/src/include/ProviderInterface.h
===================================================================
--- firebird/trunk/src/include/ProviderInterface.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/include/ProviderInterface.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -67,9 +67,9 @@
virtual void FB_CARG getInfo(Firebird::Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer) = 0;
- virtual unsigned int FB_CARG getSegment(Firebird::Status* status, unsigned int length,
+ virtual unsigned int FB_CARG getSegment(Firebird::Status* status, unsigned int length,
unsigned char* buffer) = 0; // returns real length
- virtual void FB_CARG putSegment(Firebird::Status* status, unsigned int length,
+ virtual void FB_CARG putSegment(Firebird::Status* status, unsigned int length,
const unsigned char* buffer) = 0;
virtual void FB_CARG cancel(Firebird::Status* status) = 0;
virtual void FB_CARG close(Firebird::Status* status) = 0;
Modified: firebird/trunk/src/jrd/ExtEngineManager.cpp
===================================================================
--- firebird/trunk/src/jrd/ExtEngineManager.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/ExtEngineManager.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -659,7 +659,7 @@
but that module is not actually unloaded - because UDR module (libudrcpp_example.so) is using
symbols from plugin module, therefore raising plugin module's reference count.
UDR module can be unloaded only from plugin module's global variable (ModuleMap modules) dtor,
-which is not called as long as plugin module is not inloaded. As the result all this will be
+which is not called as long as plugin module is not unloaded. As the result all this will be
unloaded only on program exit, causing at that moment AV if this code is active: it happens that
~ModuleMap dlcloses itself.
Modified: firebird/trunk/src/jrd/blb.cpp
===================================================================
--- firebird/trunk/src/jrd/blb.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/blb.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -2592,20 +2592,10 @@
}
+// Release a blob and associated blocks. Among other things, disconnect it from the transaction.
+// However, if purge_flag is false, then only release the associated blocks.
void blb::destroy(blb* blob, const bool purge_flag)
{
-/**************************************
- *
- * r e l e a s e _ b l o b
- *
- **************************************
- *
- * Functional description
- * Release a blob and associated blocks. Among other things,
- * disconnect it from the transaction. However, if purge_flag
- * is false, then only release the associated blocks.
- *
- **************************************/
jrd_tra* const transaction = blob->blb_transaction;
// Disconnect blob from transaction block.
@@ -2646,7 +2636,7 @@
blob->blb_transaction->getBlobSpace()->releaseSpace(blob->blb_temp_offset, blob->blb_temp_size);
}
- --(blob->refCounter);
+ --blob->refCounter;
delete blob;
}
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/jrd.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -3725,7 +3725,8 @@
try
{
CounterGuard guard(shutCounter);
-/*
+
+ /***
if (unloading)
{
return;
@@ -3738,7 +3739,8 @@
{
return;
}
-*/
+ ***/
+
ThreadContextHolder tdbb;
ULONG attach_count, database_count, svc_count;
Modified: firebird/trunk/src/jrd/tra.h
===================================================================
--- firebird/trunk/src/jrd/tra.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/tra.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -194,11 +194,10 @@
{
if (transaction)
{
- --(transaction->refCounter);
+ --transaction->refCounter;
+
if (!dbb || transaction->tra_outer)
- {
delete transaction;
- }
else
{
MemoryPool* const pool = transaction->tra_pool;
Modified: firebird/trunk/src/jrd/trace/TraceManager.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/trace/TraceManager.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -53,6 +53,7 @@
virtual int FB_CARG noEvent()
{
static bool flagFirst = true;
+
if (flagFirst)
{
flagFirst = false;
@@ -154,7 +155,7 @@
init_factories = true;
for (PluginsSet<TraceFactory, IgnoreMissing> traceItr(PluginType::Trace, FB_TRACE_PLUGIN_VERSION);
- traceItr.hasData(); traceItr.next())
+ traceItr.hasData(); traceItr.next())
{
FactoryInfo info;
info.factory = traceItr.plugin();
@@ -241,7 +242,7 @@
}
}
- for (FactoryInfo* info = factories->begin(); info < factories->end(); ++info)
+ for (FactoryInfo* info = factories->begin(); info != factories->end(); ++info)
{
TraceInitInfoImpl attachInfo(session, attachment, filename);
LocalStatus status;
Modified: firebird/trunk/src/jrd/trace/TraceManager.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/jrd/trace/TraceManager.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -150,21 +150,23 @@
TraceFactory* factory;
char name[MAXPATHLEN];
};
+
class Factories : public Firebird::Array<FactoryInfo>
{
public:
Factories(Firebird::MemoryPool& p)
: Firebird::Array<FactoryInfo>(p)
{ }
+
~Factories()
{
Firebird::PluginInterface pi;
+
for (unsigned int i = 0; i < getCount(); ++i)
- {
pi->releasePlugin(getElement(i).factory);
- }
}
};
+
static Firebird::GlobalPtr<Factories> factories;
static Firebird::GlobalPtr<Firebird::Mutex> init_factories_mtx;
static volatile bool init_factories;
Modified: firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
===================================================================
--- firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -90,13 +90,16 @@
{
// this plugin is not ready to support different configurations
// therefore keep legacy approach
+
IConfigParameter* icp = NULL;
+
for (int n = 0; (icp = defaultConfig->findPos("path", n)); ++n)
{
PathName newPath(icp->value());
icp->release();
bool found = false;
+
for (ObjectsArray<PathName>::iterator i = paths->begin(); i != paths->end(); ++i)
{
if (*i == newPath)
@@ -779,7 +782,7 @@
//--------------------------------------
-/*
+/***
class ExternalEngineFactoryImpl : public ExternalEngineFactory
{
public:
@@ -796,7 +799,8 @@
error->addString(msg, strlen(msg));
return NULL;
}
- */
+***/
+
class ExternalEngineFactoryImpl : public SimpleFactory<Engine>
{
} factory;
@@ -807,7 +811,8 @@
Firebird::IPlugin* plugin = master->getPluginInterface();
plugin->registerPlugin(Firebird::PluginType::ExternalEngine, "UDR", &factory);
plugin->release();
-/*
+
+ /***
if (plugin->getLibraryName())
libraryName->assign(plugin->getLibraryName());
libraryModule = ModuleLoader::loadModule(libraryName);
@@ -823,7 +828,7 @@
}
plugin->setExternalEngineFactory(&factory);
- */
+ ***/
}
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/remote/client/interface.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -165,9 +165,8 @@
cancel(&status);
}
else
- {
delete this;
- }
+
return 0;
}
@@ -209,10 +208,12 @@
public:
Transaction(Rtr* handle) : transaction(handle) { }
+
Rtr* getTransaction()
{
return transaction;
}
+
void clear()
{
transaction = NULL;
@@ -226,9 +227,7 @@
int Transaction::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (transaction)
{
@@ -236,9 +235,7 @@
rollback(&status);
}
else
- {
delete this;
- }
return 0;
}
@@ -287,9 +284,7 @@
int Statement::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (statement)
{
@@ -297,9 +292,7 @@
free(&status, DSQL_drop);
}
else
- {
delete this;
- }
return 0;
}
@@ -331,9 +324,7 @@
int Request::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (rq)
{
@@ -341,9 +332,7 @@
free(&status);
}
else
- {
delete this;
- }
return 0;
}
@@ -364,9 +353,7 @@
int Events::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (rvnt)
{
@@ -374,9 +361,7 @@
cancel(&status);
}
else
- {
delete this;
- }
return 0;
}
@@ -410,6 +395,7 @@
public:
Attachment(Rdb* handle) : rdb(handle) { }
+
Rdb* getRdb()
{
return rdb;
@@ -422,9 +408,7 @@
int Attachment::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (rdb)
{
@@ -432,9 +416,7 @@
detach(&status);
}
else
- {
delete this;
- }
return 0;
}
@@ -461,9 +443,7 @@
int Service::release()
{
if (--refCounter != 0)
- {
return 1;
- }
if (rdb)
{
@@ -471,9 +451,7 @@
detach(&status);
}
else
- {
delete this;
- }
return 0;
}
@@ -502,6 +480,7 @@
delete this;
return 0;
}
+
return 1;
}
@@ -5667,7 +5646,7 @@
if (n && n->cstr_length && authItr.hasData())
{
// if names match, do not change instance
- if (strlen(authItr.name()) == n->cstr_length &&
+ if (strlen(authItr.name()) == n->cstr_length &&
memcmp(authItr.name(), n->cstr_address, n->cstr_length) == 0)
{
n = NULL;
Modified: firebird/trunk/src/remote/client/interface.h
===================================================================
--- firebird/trunk/src/remote/client/interface.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/remote/client/interface.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -28,7 +28,10 @@
#ifndef REMOTE_CLIENT_INTERFACE_H
#define REMOTE_CLIENT_INTERFACE_H
-namespace Remote {
+
+namespace Remote
+{
void registerRedirector(Firebird::IPlugin* iPlugin);
}
+
#endif // REMOTE_CLIENT_INTERFACE_H
Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/remote/remote.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -845,7 +845,7 @@
if (!rsr_status) {
rsr_status = new Firebird::StatusHolder();
}
-
+
if (overwrite || !rsr_status->getError())
{
ISC_STATUS_ARRAY temp;
Modified: firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
===================================================================
--- firebird/trunk/src/utilities/ntrace/PluginLogWriter.h 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/utilities/ntrace/PluginLogWriter.h 2011-01-16 02:16:15 UTC (rev 52134)
@@ -54,6 +54,7 @@
~PluginLogWriter();
virtual size_t write(const void* buf, size_t size);
+
virtual int release()
{
if (--refCounter == 0)
Modified: firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
===================================================================
--- firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -2154,7 +2154,7 @@
{
try
{
- log_event_service_query(service, send_item_length, send_items,
+ log_event_service_query(service, send_item_length, send_items,
recv_item_length, recv_items, query_result);
return true;
}
Modified: firebird/trunk/src/yvalve/MasterImplementation.cpp
===================================================================
--- firebird/trunk/src/yvalve/MasterImplementation.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/yvalve/MasterImplementation.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -93,12 +93,12 @@
if (toUpgrade->version() >= desiredVersion)
return;
- CVirtualClass* target = (CVirtualClass*)toUpgrade;
+ CVirtualClass* target = (CVirtualClass*) toUpgrade;
FunctionPtr* newTab = NULL;
- if (!functionMap->get((U_IPTR)(target->vTab), newTab))
+ if (!functionMap->get((U_IPTR) target->vTab, newTab))
{
- CVirtualClass* miss = (CVirtualClass*)missingFunctionClass;
+ CVirtualClass* miss = (CVirtualClass*) missingFunctionClass;
newTab = FB_NEW(*getDefaultMemoryPool()) FunctionPtr[desiredVersion];
for (int i = 0; i < toUpgrade->version(); ++i)
@@ -106,7 +106,7 @@
for (int j = toUpgrade->version(); j < desiredVersion; ++j)
newTab[j] = miss->vTab[0];
- functionMap->put((U_IPTR)(target->vTab), newTab);
+ functionMap->put((U_IPTR) target->vTab, newTab);
}
target->vTab = newTab;
Modified: firebird/trunk/src/yvalve/PluginManager.cpp
===================================================================
--- firebird/trunk/src/yvalve/PluginManager.cpp 2011-01-15 09:30:24 UTC (rev 52133)
+++ firebird/trunk/src/yvalve/PluginManager.cpp 2011-01-16 02:16:15 UTC (rev 52134)
@@ -142,12 +142,12 @@
if (--refCounter == 0)
{
if (cf)
- {
cf->release();
- }
+
delete this;
return 0;
}
+
return 1;
}
@@ -200,6 +200,7 @@
delete this;
return 0;
}
+
return 1;
}
@@ -213,6 +214,7 @@
addRef();
return new ConfigParameterAccess(this, p);
}
+
return NULL;
}
};
@@ -220,9 +222,8 @@
IConfig* ConfigParameterAccess::sub()
{
if (par && par->sub.hasData())
- {
return new ConfigAccess(par->sub);
- }
+
return NULL;
}
@@ -231,6 +232,7 @@
RegisteredPlugin(PluginsFactory* f, const char* nm, unsigned int t)
: factory(f), name(nm), type(t)
{ }
+
RegisteredPlugin()
: factory(NULL), name(NULL), type(0)
{ }
@@ -364,6 +366,7 @@
delete this;
return 0;
}
+
return 1;
}
@@ -495,6 +498,7 @@
delete this;
return 0;
}
+
return 1;
}
@@ -509,6 +513,7 @@
AutoPtr<IMaster, AutoInterface> masterInterface;
RefPtr<PluginModule> loadModule(const PathName& modName);
+
void loadError(const Arg::StatusVector& error)
{
iscLogStatus("PluginSet", error.value());
@@ -576,7 +581,7 @@
RegisteredPlugin* r = m->findPlugin(interfaceType, regName);
if (! r)
{
- gds__log("Misconfigured: module %s does not contain plugin %s type %d",
+ gds__log("Misconfigured: module %s does not contain plugin %s type %d",
curModule.c_str(), regName.c_str(), interfaceType);
continue;
}
@@ -586,7 +591,7 @@
currentPlugin = new ConfiguredPlugin(m, r, conf, plugConfigFile, currentName);
currentPlugin->release(); // std interface is created with refCounter == 1
- // cause currentPlugin holds refernce itself, that 1 should be released() here
+ // cause currentPlugin holds reference itself, that 1 should be released() here
plugins->put(MapKey(interfaceType, currentName), currentPlugin);
return;
@@ -698,6 +703,7 @@
MutexLockGuard g(plugins->mutex);
Interface* parent = plugin->owner(NULL);
+
if (plugin->release() == 0)
{
fb_assert(parent);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-01-16 03:17:18
|
Revision: 52135
http://firebird.svn.sourceforge.net/firebird/?rev=52135&view=rev
Author: firebirds
Date: 2011-01-16 03:17:11 +0000 (Sun, 16 Jan 2011)
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 2011-01-16 02:16:15 UTC (rev 52134)
+++ firebird/trunk/ChangeLog 2011-01-16 03:17:11 UTC (rev 52135)
@@ -1,3 +1,39 @@
+ 2011-01-16 02:16 asfernandes
+ M builds/install/misc/firebird.conf.in
+ M doc/README.fb_shutdown
+ M src/common/ThreadStart.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/config/config.cpp
+ M src/common/unicode_util.cpp
+ M src/include/ProviderInterface.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/client/interface.h
+ M src/remote/remote.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+Misc
+
+ 2011-01-15 09:30 robocop
+ M src/remote/remote.h
+Misc.
+
+ 2011-01-15 09:29 robocop
+ M src/remote/remote.cpp
+Misc.
+
+ 2011-01-15 09:27 robocop
+ M src/remote/inet.cpp
+Misc and small fix.
+
2011-01-14 17:31 alexpeshkoff
M builds/install/misc/aliases.conf.in
M builds/install/misc/firebird.conf.in
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-16 02:16:15 UTC (rev 52134)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-16 03:17:11 UTC (rev 52135)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28963
+ FORMAL BUILD NUMBER:28967
*/
-#define PRODUCT_VER_STRING "3.0.0.28963"
-#define FILE_VER_STRING "WI-T3.0.0.28963"
-#define LICENSE_VER_STRING "WI-T3.0.0.28963"
-#define FILE_VER_NUMBER 3, 0, 0, 28963
+#define PRODUCT_VER_STRING "3.0.0.28967"
+#define FILE_VER_STRING "WI-T3.0.0.28967"
+#define LICENSE_VER_STRING "WI-T3.0.0.28967"
+#define FILE_VER_NUMBER 3, 0, 0, 28967
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28963"
+#define FB_BUILD_NO "28967"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-16 02:16:15 UTC (rev 52134)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-16 03:17:11 UTC (rev 52135)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28963
+BuildNum=28967
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...> - 2011-01-17 03:17:24
|
Revision: 52147
http://firebird.svn.sourceforge.net/firebird/?rev=52147&view=rev
Author: firebirds
Date: 2011-01-17 03:17:16 +0000 (Mon, 17 Jan 2011)
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 2011-01-16 17:45:25 UTC (rev 52146)
+++ firebird/trunk/ChangeLog 2011-01-17 03:17:16 UTC (rev 52147)
@@ -1,3 +1,55 @@
+ 2011-01-16 17:45 alexpeshkoff
+ M src/common/classes/ImplementHelper.h
+cleanup
+
+ 2011-01-16 16:45 asfernandes
+ M src/yvalve/why.cpp
+Misc
+
+ 2011-01-16 14:29 alexpeshkoff
+ M configure.in
+misc
+
+ 2011-01-16 14:03 alexpeshkoff
+ M builds/posix/darwin.defaults
+ M builds/posix/make.defaults
+ M builds/posix/prefix.aix_powerpc
+ M builds/posix/prefix.aix_powerpc_xlc
+ M builds/posix/prefix.darwin_i386
+ M builds/posix/prefix.darwin_powerpc
+ M builds/posix/prefix.darwin_ppc64
+ M builds/posix/prefix.darwin_x86_64
+ M builds/posix/prefix.example
+ M builds/posix/prefix.freebsd
+ M builds/posix/prefix.freebsd_amd64
+ M builds/posix/prefix.hpux
+ M builds/posix/prefix.hpux_aCC
+ M builds/posix/prefix.hpux_ia64
+ M builds/posix/prefix.linux
+ M builds/posix/prefix.linux_amd64
+ M builds/posix/prefix.linux_arm
+ M builds/posix/prefix.linux_generic
+ M builds/posix/prefix.linux_ia64
+ M builds/posix/prefix.linux_mips
+ M builds/posix/prefix.linux_mipsel
+ M builds/posix/prefix.linux_powerpc
+ M builds/posix/prefix.linux_s390x
+ M builds/posix/prefix.linux_sparc32
+ M builds/posix/prefix.mingw
+ M builds/posix/prefix.netbsd
+ M builds/posix/prefix.solaris
+ M builds/posix/prefix.solaris-64gcc
+ M builds/posix/prefix.solx86
+ M builds/posix/prefix.solx86gcc
+ M builds/posix/prefix.solx86gcc_64
+cleanup
+
+ 2011-01-16 08:42 dimitr
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+ M src/jrd/opt.cpp
+Misc.
+
2011-01-16 02:16 asfernandes
M builds/install/misc/firebird.conf.in
M doc/README.fb_shutdown
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-16 17:45:25 UTC (rev 52146)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-17 03:17:16 UTC (rev 52147)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28967
+ FORMAL BUILD NUMBER:28972
*/
-#define PRODUCT_VER_STRING "3.0.0.28967"
-#define FILE_VER_STRING "WI-T3.0.0.28967"
-#define LICENSE_VER_STRING "WI-T3.0.0.28967"
-#define FILE_VER_NUMBER 3, 0, 0, 28967
+#define PRODUCT_VER_STRING "3.0.0.28972"
+#define FILE_VER_STRING "WI-T3.0.0.28972"
+#define LICENSE_VER_STRING "WI-T3.0.0.28972"
+#define FILE_VER_NUMBER 3, 0, 0, 28972
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28967"
+#define FB_BUILD_NO "28972"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-16 17:45:25 UTC (rev 52146)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-17 03:17:16 UTC (rev 52147)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28967
+BuildNum=28972
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...> - 2011-01-17 17:38:33
|
Revision: 52151
http://firebird.svn.sourceforge.net/firebird/?rev=52151&view=rev
Author: alexpeshkoff
Date: 2011-01-17 17:38:25 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Fixed binary packages build. No more CS/SS difference. No more linux RPMs on SF.
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/linux/Makefile.in
firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
firebird/trunk/builds/install/misc/posixLibrary.sh.in
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/configure.in
Removed Paths:
-------------
firebird/trunk/builds/install/arch-specific/linux/classic/
firebird/trunk/builds/install/arch-specific/linux/super/
firebird/trunk/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
firebird/trunk/builds/install/misc/classicLibrary.sh.in
firebird/trunk/builds/install/misc/firebird.init.d.generic.in
firebird/trunk/builds/install/misc/firebird.init.d.mandrake.in
firebird/trunk/builds/install/misc/superLibrary.sh.in
Modified: firebird/trunk/builds/install/arch-specific/linux/Makefile.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/Makefile.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/arch-specific/linux/Makefile.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -33,7 +33,7 @@
@SET_MAKE@
-.PHONY: install dist packages tarfile rpmfile
+.PHONY: install dist packages tarfile
.PHONY: buildTarDir buildImageDir buildRoot buildDebugInfo
# Some of these targets are run from the root tree of the build.
@@ -55,41 +55,23 @@
TarDir= Firebird$(ArchPrefix)-$(Version).$(CpuType)
TarFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).tar.gz
-RPMFile=Firebird$(ArchPrefix)-$(Version).$(CpuType).rpm
DebugDir=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType)
DebugFile=Firebird$(ArchPrefix)-debuginfo-$(Version).$(CpuType).tar.gz
-# Determine where the packages are built. Each distribution builds them in
-# their own spot.
-# This should be moved to configure.in file
-RedhatPackageDir=/usr/src/redhat/RPMS/$(CpuType)
-MandrakePackageDir=/usr/src/RPM/RPMS/$(CpuType)
-SuSEPackageDir=/usr/src/packages/RPMS/$(CpuType)
-
-PackageDir:=$(shell if [ -d $(RedhatPackageDir) ]; then echo $(RedhatPackageDir); \
- elif [ -d $(MandrakePackageDir) ]; then echo $(MandrakePackageDir); \
- elif [ -d $(SuSEPackageDir) ]; then echo $(SuSEPackageDir); \
- fi)
-
-
-
PkgSrcDir=$(InstallRoot)/$(ArchType)
ScriptDir=$(GEN_ROOT)/install/scripts/
-RPMSrcDir=$(GEN_ROOT)/install/scripts
TarInstallDir=$(GEN_ROOT)/install
-#Target for required libraries detection
-RpmRequiredVersionTarget=$(GEN_ROOT)/firebird/bin/isql
#Curses library
TermLib=@TERMLIB@.so
dist : packages
-packages: tarfile rpmfile debugfile
+packages: tarfile debugfile
tarfile: $(TarFile)
@@ -159,45 +141,3 @@
install: buildTarDir
(cd $(GEN_ROOT)/$(TarDir); FIREBIRD= ./install.sh)
cp -r $(GEN_ROOT)/$(DebugDir)/* /
-
-
-rpmfile: $(RPMFile)
-
-$(RPMFile) : $(GEN_ROOT)/install/rpmscript buildImageDir
- rpmbuild --define='_topdir @BUILD_ROOT_DIR@/gen/RPM' -bb --target @CPU_TYPE@ $(GEN_ROOT)/install/rpmscript
-# rpmbuild -bb --buildroot `pwd`/buildroot $(GEN_ROOT)/rpmscript
- cp @BUILD_ROOT_DIR@/gen/RPM/RPMS/@CPU_TYPE@/$(RPMFile) $(GEN_ROOT)
-
-
-.PHONY: $(GEN_ROOT)/install/rpmscript
-
-$(GEN_ROOT)/install/rpmscript :
- echo $@
- awk < $(RPMSrcDir)/rpmheader.txt 'BEGIN {fl=1;} ($$1 == "Requires:") {fl=0;} (fl) {print $$0;}' > $@
- echo -n "Requires: `ldd $(RpmRequiredVersionTarget) | grep $(TermLib) | awk '{print $$1;}'`" >> $@
- echo ", `ldd $(RpmRequiredVersionTarget) | grep libstdc++ | awk '{print $$1;}'`" >> $@
- awk < $(RPMSrcDir)/rpmheader.txt 'BEGIN {fl=0;} (fl) {print $$0;} ($$1 == "Requires:") {fl=1;}' >> $@
- echo "" >> $@
- echo "%prep" >> $@
-# cat $(ClassicSrcDir)/prepinstall.sh >> $@
- echo "" >> $@
- echo "%build" >> $@
-# cat $(ScriptDir)/buildinstall.sh >> $@
- echo "" >> $@
- echo "%install" >> $@
-# cat $(ScriptDir)/install.sh >> $@
- echo "" >> $@
- echo "%files" >> $@
- cat $(RPMSrcDir)/rpmfiles.txt >> $@
- echo "" >> $@
- echo "%pre" >> $@
- cat $(ScriptDir)/preinstall.sh >> $@
- echo "" >> $@
- echo "%post" >> $@
- cat $(ScriptDir)/postinstall.sh >> $@
- echo "" >> $@
- echo "%preun" >> $@
- cat $(ScriptDir)/preuninstall.sh >> $@
- echo "" >> $@
- echo "%postun" >> $@
- cat $(ScriptDir)/postuninstall.sh >> $@
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -48,12 +48,12 @@
AdditionalParameter=$1
testStr=`grep firebird /etc/group`
-
+
if [ -z "$testStr" ]
then
groupadd $AdditionalParameter firebird
fi
-
+
}
@@ -61,11 +61,11 @@
AdditionalParameter=$1
testStr=`grep firebird /etc/passwd`
-
+
if [ -z "$testStr" ]
then
- useradd $AdditionalParameter -d @FB_CONFDIR@ -s /bin/false \
- -c "Firebird Database Owner" -g firebird firebird
+ useradd $AdditionalParameter -d @FB_CONFDIR@ -s /sbin/nologin \
+ -c "Firebird Database Owner" -g firebird firebird
fi
}
@@ -153,7 +153,7 @@
# stop super server if it is running
stopSuperServerIfRunning() {
- checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server|firebird)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
@@ -166,7 +166,7 @@
do
$init_d stop
sleep 1
- checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server|firebird)\b" |grep -v grep`
if [ -z "$checkString" ]
then
return
@@ -297,7 +297,7 @@
initScript=/etc/rc.d/init.d/firebird
fi
-
+
if [ "$initScript" ]
then
# Install the firebird init.d script
@@ -320,13 +320,13 @@
elif [ -x /sbin/insserv ]
then
/sbin/insserv /etc/init.d/firebird
-
+
# One more way to register service - used in Knoppix (& Debian ?)
elif [ -x /usr/sbin/update-rc.d ]
then
/usr/sbin/update-rc.d firebird start 14 2 3 5 . stop 20 0 1 6 .
fi
-
+
# More SuSE - rc.config fillup
if [ -f /etc/rc.config ]
then
@@ -338,7 +338,7 @@
then
cp @FB_MISCDIR@/rc.config.firebird /etc/sysconfig/firebird
fi
-
+
else
echo "Couldn't autodetect linux type. You must select"
echo "the most appropriate startup script in @FB_MISCDIR@"
@@ -369,15 +369,19 @@
then
"$InitFile" start
- checkString=`ps -eaf | egrep "\b(fbserver|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps -eaf | egrep "\b(firebird)\b" |grep -v grep`
if [ -z "$checkString" ]
then
- # server didn't start - possible reason bad shell /bin/false for user "firebird"
- echo
- echo Fixing firebird\'s shell to /bin/sh
- echo
- usermod -s /bin/sh firebird
+ # server didn't start - wait a bit and recheck
+ sleep 2
"$InitFile" start
+
+ checkString=`ps -eaf | egrep "\b(firebird)\b" |grep -v grep`
+ if [ -z "$checkString" ]
+ then
+ echo "Looks like standalone server failed to start"
+ echo "Trying to continue anyway..."
+ fi
fi
fi
}
@@ -393,7 +397,7 @@
if [ -x /sbin/insserv ]; then
/sbin/insserv /etc/init.d/
fi
-
+
if [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --del firebird
fi
@@ -407,15 +411,19 @@
then
rm -f /usr/sbin/rcfirebird
fi
-
+
# Remove initd script
- if [ -e /etc/init.d/firebird ]; then
- rm -f /etc/init.d/firebird
- fi
+ rm -f $InitFile
+ fi
+}
- if [ -e /etc/rc.d/init.d/firebird ]; then
- rm -f /etc/rc.d/init.d/firebird
- fi
+#------------------------------------------------------------------------
+# Returns TRUE if SA server is installed
+
+isStandaloneServerInstalled() {
+ InitFile=`getInitScriptLocation`
+ if [ -f "$InitFile" ]; then
+ return 0
fi
+ return 1
}
-
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -35,9 +35,9 @@
# Making an assumption that this program is being run in the gen directory
BuildRootDir=..
-BuiltFBDir=./firebird # Where the just build fb exists.
+BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image
-SecurityDatabase=security2.fdb
+SecurityDatabase=security3.fdb
#------------------------------------------------------------------------
@@ -53,7 +53,7 @@
rm -f $libTarget
touch $libTarget
- for i in posixLibrary.sh @FIR...@Li... linuxLibrary.sh
+ for i in posixLibrary.sh linuxLibrary.sh
do
echo "# $i" >>$libTarget
cat $libSdir/$i >>$libTarget
@@ -161,17 +161,14 @@
chmod 0755 ${TargetDir}@FB_BINDIR@/*
#sbin
- copyIfExists $BuiltFBDir/bin/fb_smp_server ${TargetDir}@FB_SBINDIR@
- copyIfExists $BuiltFBDir/bin/fbserver ${TargetDir}@FB_SBINDIR@
+ cp -f $BuiltFBDir/bin/firebird ${TargetDir}@FB_SBINDIR@/firebird
cp -f $BuiltFBDir/bin/fbguard ${TargetDir}@FB_SBINDIR@
copyIfExists $BuiltFBDir/bin/fb_lock_print ${TargetDir}@FB_SBINDIR@
- copyIfExists $BuiltFBDir/bin/fbmgr.bin ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeDBAPassword.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeMultiConnectMode.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuiltFBDir/bin changeGdsLibraryCompatibleLink.sh ${TargetDir}@FB_SBINDIR@
+ addLibs $BuiltFBDir/bin changeRunUser.sh ${TargetDir}@FB_SBINDIR@
+ addLibs $BuiltFBDir/bin restoreRootRunUser.sh ${TargetDir}@FB_SBINDIR@
+ addLibs $BuiltFBDir/bin changeDBAPassword.sh ${TargetDir}@FB_SBINDIR@
+ addLibs $BuiltFBDir/bin changeMultiConnectMode.sh ${TargetDir}@FB_SBINDIR@
cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
@@ -180,14 +177,14 @@
chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
#install scripts
- addLibs $BuildRootDir/gen/firebird/bin tarMainInstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin tarinstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin preinstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin postinstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin preuninstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin postuninstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin taruninstall.sh $BuildRootDir/gen/install/scripts
- addLibs $BuildRootDir/gen/firebird/bin tarMainUninstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin tarMainInstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin tarinstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin preinstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin postinstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin preuninstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin postuninstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin taruninstall.sh $BuildRootDir/gen/install/scripts
+ addLibs $BuiltFBDir/bin tarMainUninstall.sh $BuildRootDir/gen/install/scripts
#examples - copy only if we have them
exampleFiles=`find $BuiltFBDir/examples/README -type f -print`
@@ -247,10 +244,12 @@
chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so*
#plugins
- cp -df $BuiltFBDir/plugins/* ${TargetDir}@FB_PLUGDIR@
+ (cd $BuiltFBDir/plugins;tar cf - .) | (cd ${TargetDir}@FB_PLUGDIR@; tar xvf -)
- chown root:root ${TargetDir}@FB_PLUGDIR@/*.so*
- chmod 0755 ${TargetDir}@FB_PLUGDIR@/*.so*
+ for file in `find ${TargetDir}@FB_PLUGDIR@ -name '*.so*' -print`; do
+ chown root:root ${file}
+ chmod 0755 ${file}
+ done
#intl
cp $BuiltFBDir/intl/libfbintl.so ${TargetDir}@FB_INTLDIR@/fbintl
@@ -306,6 +305,7 @@
cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@
chown root:root ${TargetDir}@FB_CONFDIR@/*.conf
chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf
Deleted: firebird/trunk/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# 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 Mark O'Donohue
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) Mark O'Donohue <mar...@lu...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Alex Peshkoff
-#
-
-# This script allows the user to change the link on classic for the
-# client library from
-#
-# a) libfbembed.so original classic direct connection
-# b) libfbclient.so multithreaded client connection
-#
-
-#------------------------------------------------------------------------
-# quitIfRealFile
-# Quit if library is real file, not link somewhere
-
-quitIfRealFile() {
-
- fileToCheck=$1
-
- # Don't worry about symbolic links
- if [ -L $fileToCheck ]
- then
- return
- fi
-
- if [ -f $fileToCheck ]
- then
- echo "The file $fileToCheck is a real file not just a link to an "
- echo "existing file. It therefore may be from a"
- echo "previous firebird or InterBase(r) installation"
- echo "You will need to manually check the status of this file"
- echo "and remove it before running this script again"
- exit
- fi
-}
-
-
-#------------------------------------------------------------------------
-# printStatus
-
-printStatus() {
- printStatus=`ls -l @libdir@/libgds.so | sed 's@^.* /usr@/usr@'`
- echo $printStatus
-
-}
-
-
-#= Main ====================================================================
-
-
-cat <<EOF
-For classic server there are two optional backward compatible client libraries.
-These are libfbclient.so and libfbembed.so.
-
-libfbclient.so) enables your client to be multithreaded but must connect to a
- database via a server.
-libfbembed.so) allows the client to directly open the database file, but does
- not support multithreaded access
-
-Your current setting is:
-EOF
- printStatus
-
- echo ""
-
- quitIfRealFile @libdir@/libgds.so
- quitIfRealFile @libdir@/libgds.so.0
-
-
- AskQuestion "Which option would you like to choose (client|embed|remove) [client] " "client"
-
- case $Answer in
- embed)
- createLinksForBackCompatibility libfbembed.so
- ;;
- client)
- createLinksForBackCompatibility libfbclient.so
- ;;
- remove)
- removeLinksForBackCompatibility
- ;;
- *)
- echo "Unknown option $Answer chosen"
- ;;
- esac
Deleted: firebird/trunk/builds/install/misc/classicLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/classicLibrary.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/classicLibrary.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# 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 Mark O'Donohue
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) Mark O'Donohue <mar...@lu...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Alex Peshkoff
-#
-
-#------------------------------------------------------------------------
-# init defaults
-DefaultLibrary=libfbembed
-
-
-#------------------------------------------------------------------------
-# For security reasons most files in firebird installation are
-# root-owned and world-readable(executable) only (including firebird).
-
-# For some files RunUser and RunGroup (firebird)
-# must have write access - lock and log for example.
-
-MakeFileFirebirdWritable() {
- FileName=$1
- chown $RunUser:$RunGroup $FileName
-
- if [ "$RunUser" = "root" ]
- # In that case we must open databases, locks, etc. to the world...
- # That's a pity, but required if root RunUser choosen.
- then
- chmod a=rw $FileName
- else
- # This is good secure setting
- chmod ug=rw,o= $FileName
- fi
-}
-
-
-#------------------------------------------------------------------------
-# fixArcSpecificPermissions
-# Change the permissions specific for CS
-
-fixArcSpecificPermissions() {
- # Fix QLI help
- cd @FB_HELPDIR@
- chmod a=r help.fdb
-}
-
-
-#------------------------------------------------------------------------
-# changeXinetdServiceUser
-# Change the run user of the xinetd service
-
-changeXinetdServiceUser() {
- InitFile=/etc/xinetd.d/firebird
- if [ -f $InitFile ]
- then
- editFile $InitFile user "\tuser\t\t\t= $RunUser"
- fi
-}
-
-
-#------------------------------------------------------------------------
-# Update inetd service entry
-# This just adds/replaces the service entry line
-
-updateInetdEntry() {
- newLine="@FB_SERVICE_NAME@ stream tcp nowait.30000 $RunUser @FB_SBINDIR@/fb_smp_server fb_smp_server # Firebird Database Remote Server"
- replaceLineInFile /etc/inetd.conf "$newLine" "^@FB_SERVICE_NAME@"
-}
-
-
-#------------------------------------------------------------------------
-# Update xinetd service entry
-
-updateXinetdEntry() {
- cp @FB_MISCDIR@/firebird.xinetd /etc/xinetd.d/firebird
- changeXinetdServiceUser
-}
-
-
-#------------------------------------------------------------------------
-# Update inetd service entry
-# Check to see if we have xinetd installed or plain inetd.
-# Install differs for each of them.
-
-updateInetdServiceEntry() {
- if [ -d /etc/xinetd.d ]
- then
- updateXinetdEntry
- else
- updateInetdEntry
- fi
-}
Deleted: firebird/trunk/builds/install/misc/firebird.init.d.generic.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.init.d.generic.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/firebird.init.d.generic.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# chkconfig: 345 20 80
-# description: Start/Stop firebird database server
-#
-# This file belongs in /etc/init.d where it will be run
-# on system startup and shutdown to start the background
-# Firebird database server daemon
-
-
-
-: ${FIREBIRD:=@prefix@}
-: ${ISC_USER:=SYSDBA}
-: ${ISC_PASSWORD:=masterkey}
-: ${FBRunUser:=root}
-# WARNING: in a real-world installation, you should not put the
-# SYSDBA password in a publicly-readable file.
-# Eventually this file should not need to contain any passwords.
-# as root user alone should be sufficient privledge to stop/start
-# the server.
-
-
-export FIREBIRD
-export ISC_USER
-export ISC_PASSWORD
-
-
-# Check the file is there and is executable.
-[ -x $FIREBIRD/bin/fbmgr ] || exit 0
-
-
-
-# See how we were called.
-case "$1" in
- start)
- echo -n "Starting Firebird server: "
- echo '$FIREBIRD/bin/fbmgr -start -forever' | su $FBRunUser
- RETVAL=$?
- ;;
- stop)
- echo -n "Stopping Firebird server: "
- $FIREBIRD/bin/fbmgr -shut
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd
- ;;
- status)
- RETVAL=0
- ;;
- restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- *)
- echo "Usage: firebird {start|stop|status|restart|reload}"
- exit 1
-esac
-
-exit $RETVAL
-
Deleted: firebird/trunk/builds/install/misc/firebird.init.d.mandrake.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.init.d.mandrake.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/firebird.init.d.mandrake.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# chkconfig: 345 20 80
-# description: Start/Stop firebird database server
-#
-# This file belongs in /etc/init.d where it will be run
-# on system startup and shutdown to start the background
-# Firebird database server daemon
-
-
-# This init script contains functions specific for redhat
-# and mandrake init scripts.
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-
-: ${FIREBIRD:=@prefix@}
-: ${ISC_USER:=SYSDBA}
-: ${ISC_PASSWORD:=masterkey}
-: ${FBRunUser:=root}
-# WARNING: in a real-world installation, you should not put the
-# SYSDBA password in a publicly-readable file.
-# Eventually this file should not need to contain any passwords.
-# as root user alone should be sufficient privledge to stop/start
-# the server.
-
-
-export FIREBIRD
-export ISC_USER
-export ISC_PASSWORD
-
-
-# Check the file is there and is executable.
-[ -x $FIREBIRD/bin/fbmgr ] || exit 0
-
-
-
-# See how we were called.
-case "$1" in
- start)
- echo -n "Starting Firebird server: "
- daemon --user $FBRunUser $FIREBIRD/bin/fbmgr -start -forever
-# echo '$FIREBIRD/bin/ibmgr -start -forever' | su $FBRunUser
- RETVAL=$?
- echo
- ;;
- stop)
- echo -n "Stopping Firebird server: "
- $FIREBIRD/bin/fbmgr -shut
-# killproc ibserver
- RETVAL=$?
-# echo
-# [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd
- ;;
- status)
- status fbserver
- RETVAL=$?
- ;;
- restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- *)
- echo "Usage: firebird {start|stop|status|restart|reload}"
- exit 1
-esac
-
-exit $RETVAL
-
Modified: firebird/trunk/builds/install/misc/posixLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/posixLibrary.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/posixLibrary.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -42,7 +42,8 @@
Answer=""
OrigPasswd=""
TmpFile=""
-SecurityDatabase=security2.fdb
+SecurityDatabase=security3.fdb
+DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh
ArchiveDateTag=`date +"%Y%m%d_%H%M"`
export ArchiveDateTag
@@ -202,7 +203,7 @@
checkIfServerRunning() {
- checkString=`ps -ef$psOptions | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps -ef$psOptions | egrep "\b(fbserver|fbguard|fb_smp_server|firebird)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
serverMode=super
@@ -217,6 +218,14 @@
# Check is server is being actively used.
+ checkString=`ps -ef$psOptions | egrep "\b(firebird)\b" |grep -v grep`
+ if [ ! -z "$checkString" ]
+ then
+ echo "An instance of the Firebird server seems to be running."
+ echo "Please quit all Firebird applications and then proceed."
+ exit 1
+ fi
+
checkString=`ps -ef$psOptions | egrep "\b(fb_smp_server)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
@@ -233,7 +242,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "\b(fb_inet_server|fb_smp_server|gds_pipe)\b" |grep -v grep`
+ checkString=`ps -ef$psOptions | egrep "\b(fb_inet_server|gds_pipe)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird Classic server seems to be running."
@@ -487,20 +496,11 @@
# These two links are required for compatibility with existing ib programs
# If the program had been linked with libgds.so then this link is required
- # to ensure it loads the fb equivalent. Eventually these should be
- # optional and in a seperate rpm install. MOD 7-Nov-2002.
+ # to ensure it loads the fb equivalent. MOD 7-Nov-2002.
- if [ "$1" ]
- then
- # Use library name from parameter
- newLibrary=@FB_LIBDIR@/$1
- else
- # Use DefaultLibrary, set by appropriate install library
- newLibrary=@FB_LIBDIR@/$DefaultLibrary.so
- fi
-
- safeLink $newLibrary @libdir@/libgds.so
- safeLink $newLibrary @libdir@/libgds.so.0
+ newLibrary=@FB_LIBDIR@/$DefaultLibrary.@SHRLIB_EXT@
+ safeLink $newLibrary @libdir@/libgds.@SHRLIB_EXT@
+ safeLink $newLibrary @libdir@/libgds.@SHRLIB_EXT@.0
}
@@ -510,8 +510,8 @@
# linked systems.
removeLinksForBackCompatibility() {
- removeIfOnlyAlink @libdir@/libgds.so
- removeIfOnlyAlink @libdir@/libgds.so.0
+ removeIfOnlyAlink @libdir@/libgds.@SHRLIB_EXT@
+ removeIfOnlyAlink @libdir@/libgds.@SHRLIB_EXT@.0
}
@@ -609,7 +609,7 @@
fi
done
- for i in libib_util.so libfbclient.so*
+ for i in libib_util.@SHRLIB_EXT@ libfbclient.@SHRLIB_EXT@*
do
for DestFile in usr/lib/$i
do
@@ -630,7 +630,7 @@
fi
fi
done
-
+
if [ ! -z "$archiveFileList" ]
then
displayMessage "Archiving..."
@@ -723,6 +723,29 @@
#------------------------------------------------------------------------
+# For security reasons most files in firebird installation are
+# root-owned and world-readable(executable) only (including firebird).
+
+# For some files RunUser and RunGroup (firebird)
+# must have write access - lock and log for example.
+
+MakeFileFirebirdWritable() {
+ FileName=$1
+ chown $RunUser:$RunGroup $FileName
+
+ if [ "$RunUser" = "root" ]
+ # In that case we must open databases, locks, etc. to the world...
+ # That's a pity, but required if root RunUser choosen.
+ then
+ chmod a=rw $FileName
+ else
+ # This is good secure setting
+ chmod ug=rw,o= $FileName
+ fi
+}
+
+
+#------------------------------------------------------------------------
# fixFilePermissions
# Change the permissions to restrict access to server programs to
# firebird group only. This is MUCH better from a safety point of
@@ -742,7 +765,7 @@
cd @FB_LOGDIR@
touch firebird.log
MakeFileFirebirdWritable firebird.log
-
+
# Security database
cd @FB_SECDBDIR@
MakeFileFirebirdWritable $SecurityDatabase
@@ -753,7 +776,57 @@
MakeFileFirebirdWritable $i
done
- # Architecture (CS/SS) specific permissions
- fixArcSpecificPermissions
+ # Fix QLI help
+ cd @FB_HELPDIR@
+ chmod a=r help.fdb
}
+
+#------------------------------------------------------------------------
+# changeXinetdServiceUser
+# Change the run user of the xinetd service
+
+changeXinetdServiceUser() {
+ InitFile=/etc/xinetd.d/firebird
+ if [ -f $InitFile ]
+ then
+ editFile $InitFile user "\tuser\t\t\t= $RunUser"
+ fi
+}
+
+
+#------------------------------------------------------------------------
+# Update inetd service entry
+# This just adds/replaces the service entry line
+
+updateInetdEntry() {
+ newLine="@FB_SERVICE_NAME@ stream tcp nowait.30000 $RunUser @FB_SBINDIR@/firebird firebird # Firebird Database Remote Server"
+ replaceLineInFile /etc/inetd.conf "$newLine" "^@FB_SERVICE_NAME@"
+}
+
+
+#------------------------------------------------------------------------
+# Update xinetd service entry
+
+updateXinetdEntry() {
+ cp @FB_MISCDIR@/firebird.xinetd /etc/xinetd.d/firebird
+ changeXinetdServiceUser
+}
+
+
+#------------------------------------------------------------------------
+# Update inetd service entry
+# Check to see if we have xinetd installed or plain inetd.
+# Install differs for each of them.
+
+updateInetdServiceEntry() {
+ if ! isStandaloneServerInstalled
+ then
+ if [ -d /etc/xinetd.d ]
+ then
+ updateXinetdEntry
+ else
+ updateInetdEntry
+ fi
+ fi
+}
Deleted: firebird/trunk/builds/install/misc/superLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/superLibrary.sh.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/install/misc/superLibrary.sh.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# 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 Mark O'Donohue
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) Mark O'Donohue <mar...@lu...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-# Alex Peshkoff
-#
-
-#------------------------------------------------------------------------
-# init defaults
-DefaultLibrary=libfbclient
-
-
-#------------------------------------------------------------------------
-# For security reasons most files in firebird installation are
-# root-owned and world-readable(executable) only (including firebird).
-
-# For some files RunUser (firebird)
-# must have write access - lock and log for examples.
-
-MakeFileFirebirdWritable() {
- FileName=$1
- chown $RunUser:$RunGroup $FileName
- chmod u=rw,go= $FileName
-}
-
-
-#------------------------------------------------------------------------
-# fixArcSpecificPermissions
-# Change the permissions specific for CS
-
-fixArcSpecificPermissions() {
- # No such permissions for SS
- return 0
-}
-
-
-#------------------------------------------------------------------------
-# Update inetd service entry
-# Check to see if we have xinetd installed or plain inetd.
-# Install differs for each of them.
-
-updateInetdServiceEntry() {
- # do nothing for SS
- return 0
-}
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/builds/posix/Makefile.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -207,41 +207,41 @@
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+HELP_FDB = $(FIREBIRD)/help/help.fdb
+SECURITY_FDB = $(FIREBIRD)/security3.fdb
+SECURITY_TMP = security.tmp
-databases: yachts.lnk help.fdb security.fdb msg.timestamp
+databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
+export LD_LIBRARY_PATH += $(FIREBIRD)/lib
+
yachts.lnk: metadata.fdb
-$(RM) $@
$(LN) $^ $@
-export LD_LIBRARY_PATH += :$(FIREBIRD)/lib
-
metadata.fdb: $(BLD_ROOT)/misc/metadata.gbak
$(GBAK) -MODE read_only -R $< $@
- $(TOUCH) $@
$(CHMOD) 0444 $@
-help.fdb: $(FIREBIRD)/help/help.fdb
+$(HELP_FDB): help.fdb
-$(RM) $@
- $(LN) $^ $@
+ $(CP) $^ $@
+ $(CHMOD) 0444 $@
-$(FIREBIRD)/help/help.fdb: $(BLD_ROOT)/misc/help.gbak
+help.fdb: $(BLD_ROOT)/misc/help.gbak
$(GBAK) -MODE read_only -R $< $@
- $(TOUCH) $@
- $(CHMOD) 0444 $@
-security.fdb: $(SECURITY_FDB)
+$(SECURITY_FDB): security.fdb
-$(RM) $@
- $(LN) $(SECDB) $@
+ $(CP) $^ $@
-SECDB = security.tmp
-$(SECURITY_FDB): $(SRC_ROOT)/dbs/security.sql
+security.fdb: $(SRC_ROOT)/dbs/security.sql
-$(RM) $@
- -$(RM) $(SECDB)
- echo create database \'$(SECDB)\'\; | $(ISQL)
- $(ISQL) -i $^ $(SECDB)
- $(CHMOD) a=rw $(SECDB)
- $(CP) $(SECDB) $@
+ -$(RM) $(SECURITY_TMP)
+ echo create database \'$(SECURITY_TMP)\'\; | $(ISQL)
+ $(ISQL) -i $^ $(SECURITY_TMP)
+ $(CHMOD) a=rw $(SECURITY_TMP)
+ $(CP) $(SECURITY_TMP) $@
msg.timestamp: $(MSG_FILES)
-$(RM) msg.fdb
@@ -491,7 +491,16 @@
Dependencies = $(AllObjects:.o=.d)
-include $(Dependencies)
+
#___________________________________________________________________________
+# create binary packages
+#
+
+install install-embedded package packages dist:
+ $(MAKE) -f Makefile.install $@
+
+
+#___________________________________________________________________________
# various cleaning
#
.PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in 2011-01-17 14:13:57 UTC (rev 52150)
+++ firebird/trunk/configure.in 2011-01-17 17:38:25 UTC (rev 52151)
@@ -66,7 +66,6 @@
dnl Should system editline be used
STD_EDITLINE=false
-RPM64=
dnl Test for special ar options?
AR_OPT_CHECK=false
@@ -196,7 +195,6 @@
libdir=/usr/lib64
fi
CPU_TYPE=amd64
- RPM64='()(64bit)'
;;
ia64*-*-linux*)
@@ -208,7 +206,6 @@
SHRLIB_EXT=so
libdir=/usr/lib
CPU_TYPE=ia64
- RPM64='()(64bit)'
;;
arm*-*-linux*)
@@ -426,7 +423,6 @@
AC_SUBST(PLATFORM)
AC_SUBST(SHRLIB_EXT)
AC_DEFINE(CASE_SENSITIVITY, true, [Define this if paths are case sensitive])
-AC_SUBST(RPM64)
dnl Some controllable options
@@ -1088,8 +1084,6 @@
gen/Release/firebird/plugins.conf:builds/install/misc/plugins.conf
gen/Release/firebird/bin/fb_config:builds/install/misc/fb_config.in
gen/Release/firebird/bin/posixLibrary.sh:builds/install/misc/posixLibrary.sh.in
-gen/Release/firebird/bin/classicLibrary.sh:builds/install/misc/classicLibrary.sh.in
-gen/Release/firebird/bin/superLibrary.sh:builds/install/misc/superLibrary.sh.in
gen/Release/firebird/bin/changeRunUser.sh:builds/install/misc/changeRunUser.sh.in
gen/Release/firebird/bin/restoreRootRunUser.sh:builds/install/misc/restoreRootRunUser.sh.in
gen/Release/firebird/bin/tarMainInstall.sh:builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
@@ -1103,7 +1097,6 @@
gen/vers.sh:builds/posix/vers.sh.in
gen/Release/firebird/bin/changeDBAPassword.sh:builds/install/misc/changeDBAPassword.sh.in
gen/Release/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in
-gen/Release/firebird/bin/changeGdsLibraryCompatibleLink.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
gen/Release/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in
],
[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
@@ -1114,15 +1107,11 @@
LINUX|GENTOOFREEBSD)
AC_CONFIG_COMMANDS(,,[
mkdir -p gen/install/scripts
- mkdir -p gen/install/misc
- mkdir -p gen/RPM/RPMS/i686
- mkdir -p gen/RPM/BUILD])
+ mkdir -p gen/install/misc])
INSTALL_SRC_DIR=builds/install/arch-specific/linux/${FIREBIRD_ARCH_TYPE}
AC_CONFIG_FILES([
gen/install/makeInstallImage.sh:builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
- gen/install/scripts/rpmheader.txt:${INSTALL_SRC_DIR}/rpmheader.txt.in
- gen/install/scripts/rpmfiles.txt:${INSTALL_SRC_DIR}/rpmfiles.txt.in
gen/install/misc/firebird.xinetd:builds/install/arch-specific/linux/misc/firebird.xinetd.in
gen/install/misc/firebird.init.d.generic:builds/install/arch-specific/linux/misc/firebird.init.d.generic.in
gen/install/misc/firebird.init.d.mandrake:builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-01-18 03:32:08
|
Revision: 52154
http://firebird.svn.sourceforge.net/firebird/?rev=52154&view=rev
Author: firebirds
Date: 2011-01-18 03:32:00 +0000 (Tue, 18 Jan 2011)
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 2011-01-17 19:28:45 UTC (rev 52153)
+++ firebird/trunk/ChangeLog 2011-01-18 03:32:00 UTC (rev 52154)
@@ -1,3 +1,44 @@
+ 2011-01-17 19:28 asfernandes
+ M src/common/unicode_util.cpp
+Misc
+
+ 2011-01-17 19:28 asfernandes
+ M src/plugins/udr_engine/UdrEngine.cpp
+Correction
+
+ 2011-01-17 17:38 alexpeshkoff
+ M builds/install/arch-specific/linux/Makefile.in
+ D builds/install/arch-specific/linux/classic
+ M builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
+ M builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+ D builds/install/arch-specific/linux/super
+ D builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
+ D builds/install/misc/classicLibrary.sh.in
+ D builds/install/misc/firebird.init.d.generic.in
+ D builds/install/misc/firebird.init.d.mandrake.in
+ M builds/install/misc/posixLibrary.sh.in
+ D builds/install/misc/superLibrary.sh.in
+ M builds/posix/Makefile.in
+ M configure.in
+Fixed binary packages build. No more CS/SS difference. No more linux RPMs on SF.
+
+ 2011-01-17 14:13 alexpeshkoff
+ M src/include/FirebirdPluginApi.h
+ M src/include/ProviderInterface.h
+ M src/jrd/ntrace.h
+Fixed calling conventions in interfaces - thanks to Dmitry Kovalenko
+
+ 2011-01-17 12:17 alexpeshkoff
+ M src/auth/AuthDbg.cpp
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/pwd.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+Fixed bug, found by Adriano - destructor of statically allocated factory should better never be called
+
2011-01-16 17:45 alexpeshkoff
M src/common/classes/ImplementHelper.h
cleanup
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-17 19:28:45 UTC (rev 52153)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-18 03:32:00 UTC (rev 52154)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28972
+ FORMAL BUILD NUMBER:28977
*/
-#define PRODUCT_VER_STRING "3.0.0.28972"
-#define FILE_VER_STRING "WI-T3.0.0.28972"
-#define LICENSE_VER_STRING "WI-T3.0.0.28972"
-#define FILE_VER_NUMBER 3, 0, 0, 28972
+#define PRODUCT_VER_STRING "3.0.0.28977"
+#define FILE_VER_STRING "WI-T3.0.0.28977"
+#define LICENSE_VER_STRING "WI-T3.0.0.28977"
+#define FILE_VER_NUMBER 3, 0, 0, 28977
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28972"
+#define FB_BUILD_NO "28977"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-17 19:28:45 UTC (rev 52153)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-18 03:32:00 UTC (rev 52154)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28972
+BuildNum=28977
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...> - 2011-01-19 03:17:20
|
Revision: 52156
http://firebird.svn.sourceforge.net/firebird/?rev=52156&view=rev
Author: firebirds
Date: 2011-01-19 03:17:13 +0000 (Wed, 19 Jan 2011)
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 2011-01-18 09:57:58 UTC (rev 52155)
+++ firebird/trunk/ChangeLog 2011-01-19 03:17:13 UTC (rev 52156)
@@ -1,3 +1,7 @@
+ 2011-01-18 09:57 alexpeshkoff
+ M src/yvalve/PluginManager.cpp
+Use smart pointer in ConfigParameterAccess - thanks to Dmitry Kovalenko
+
2011-01-17 19:28 asfernandes
M src/common/unicode_util.cpp
Misc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-18 09:57:58 UTC (rev 52155)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-19 03:17:13 UTC (rev 52156)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28977
+ FORMAL BUILD NUMBER:28978
*/
-#define PRODUCT_VER_STRING "3.0.0.28977"
-#define FILE_VER_STRING "WI-T3.0.0.28977"
-#define LICENSE_VER_STRING "WI-T3.0.0.28977"
-#define FILE_VER_NUMBER 3, 0, 0, 28977
+#define PRODUCT_VER_STRING "3.0.0.28978"
+#define FILE_VER_STRING "WI-T3.0.0.28978"
+#define LICENSE_VER_STRING "WI-T3.0.0.28978"
+#define FILE_VER_NUMBER 3, 0, 0, 28978
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28977"
+#define FB_BUILD_NO "28978"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-18 09:57:58 UTC (rev 52155)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-19 03:17:13 UTC (rev 52156)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28977
+BuildNum=28978
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...> - 2011-01-20 03:20:38
|
Revision: 52164
http://firebird.svn.sourceforge.net/firebird/?rev=52164&view=rev
Author: firebirds
Date: 2011-01-20 03:20:31 +0000 (Thu, 20 Jan 2011)
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 2011-01-19 17:24:49 UTC (rev 52163)
+++ firebird/trunk/ChangeLog 2011-01-20 03:20:31 UTC (rev 52164)
@@ -1,3 +1,35 @@
+ 2011-01-19 17:24 alexpeshkoff
+ M src/common/config/config.cpp
+ M src/common/config/config.h
+ M src/common/config/config_file.cpp
+ M src/common/config/config_file.h
+ M src/common/os/posix/fbsyslog.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/nbackup/nbackup.cpp
+ M src/utilities/ntrace/TraceConfiguration.cpp
+Front-ported fix for CORE-3297: nbackup exits without info when firebird.conf is missing. Make all utilities run without firebird.conf - only server requires it's presence.
+
+ 2011-01-19 17:22 alexpeshkoff
+ M src/include/Interface.h
+It was useless here
+
+ 2011-01-19 16:58 alexpeshkoff
+ M src/common/config/ConfigCache.cpp
+misc
+
+ 2011-01-19 07:54 dimitr
+ M src/dsql/gen.cpp
+Totally misc.
+
+ 2011-01-19 07:15 alexpeshkoff
+ M src/common/classes/ImplementHelper.h
+ M src/yvalve/PluginManager.cpp
+Misc
+
+ 2011-01-19 05:47 dimitr
+ M src/jrd/opt.cpp
+Fixed a small regression caused by myself.
+
2011-01-18 09:57 alexpeshkoff
M src/yvalve/PluginManager.cpp
Use smart pointer in ConfigParameterAccess - thanks to Dmitry Kovalenko
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-19 17:24:49 UTC (rev 52163)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-20 03:20:31 UTC (rev 52164)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28978
+ FORMAL BUILD NUMBER:28984
*/
-#define PRODUCT_VER_STRING "3.0.0.28978"
-#define FILE_VER_STRING "WI-T3.0.0.28978"
-#define LICENSE_VER_STRING "WI-T3.0.0.28978"
-#define FILE_VER_NUMBER 3, 0, 0, 28978
+#define PRODUCT_VER_STRING "3.0.0.28984"
+#define FILE_VER_STRING "WI-T3.0.0.28984"
+#define LICENSE_VER_STRING "WI-T3.0.0.28984"
+#define FILE_VER_NUMBER 3, 0, 0, 28984
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28978"
+#define FB_BUILD_NO "28984"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-19 17:24:49 UTC (rev 52163)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-20 03:20:31 UTC (rev 52164)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28978
+BuildNum=28984
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...> - 2011-01-21 03:28:22
|
Revision: 52170
http://firebird.svn.sourceforge.net/firebird/?rev=52170&view=rev
Author: firebirds
Date: 2011-01-21 03:28:15 +0000 (Fri, 21 Jan 2011)
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 2011-01-20 09:18:37 UTC (rev 52169)
+++ firebird/trunk/ChangeLog 2011-01-21 03:28:15 UTC (rev 52170)
@@ -1,3 +1,13 @@
+ 2011-01-20 09:18 alexpeshkoff
+ M src/common/config/config.cpp
+fixed bug in my previous commit
+
+ 2011-01-20 04:41 dimitr
+ M src/dsql/make.cpp
+ M src/dsql/pass1.cpp
+Fixed CORE-3311: Error "data type unknown" while preparing UPDATE/DELETE statements with the parameterized ROWS clause.
+Cleanup.
+
2011-01-19 17:24 alexpeshkoff
M src/common/config/config.cpp
M src/common/config/config.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-20 09:18:37 UTC (rev 52169)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-21 03:28:15 UTC (rev 52170)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28984
+ FORMAL BUILD NUMBER:28986
*/
-#define PRODUCT_VER_STRING "3.0.0.28984"
-#define FILE_VER_STRING "WI-T3.0.0.28984"
-#define LICENSE_VER_STRING "WI-T3.0.0.28984"
-#define FILE_VER_NUMBER 3, 0, 0, 28984
+#define PRODUCT_VER_STRING "3.0.0.28986"
+#define FILE_VER_STRING "WI-T3.0.0.28986"
+#define LICENSE_VER_STRING "WI-T3.0.0.28986"
+#define FILE_VER_NUMBER 3, 0, 0, 28986
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28984"
+#define FB_BUILD_NO "28986"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-20 09:18:37 UTC (rev 52169)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-21 03:28:15 UTC (rev 52170)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28984
+BuildNum=28986
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...> - 2011-01-22 03:26:43
|
Revision: 52182
http://firebird.svn.sourceforge.net/firebird/?rev=52182&view=rev
Author: firebirds
Date: 2011-01-22 03:26:36 +0000 (Sat, 22 Jan 2011)
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 2011-01-21 17:55:04 UTC (rev 52181)
+++ firebird/trunk/ChangeLog 2011-01-22 03:26:36 UTC (rev 52182)
@@ -1,3 +1,87 @@
+ 2011-01-21 17:55 alexpeshkoff
+ M src/jrd/Database.h
+ M src/jrd/blb.cpp
+ M src/jrd/blb_proto.h
+ M src/jrd/btr.cpp
+ M src/jrd/btr.h
+ M src/jrd/cch.cpp
+ M src/jrd/cch_proto.h
+ M src/jrd/dpm.epp
+ M src/jrd/dpm_proto.h
+ M src/jrd/exe.h
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/ExtDS.h
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/extds/IscDS.h
+ M src/jrd/idx.cpp
+ M src/jrd/jrd.h
+ M src/jrd/lls.h
+ M src/jrd/ods.h
+ M src/jrd/pag.cpp
+ M src/jrd/pag.h
+ M src/jrd/par.cpp
+ M src/jrd/recsrc/FullTableScan.cpp
+ M src/jrd/req.h
+ M src/jrd/tra.cpp
+ M src/jrd/validation.cpp
+ M src/jrd/vio.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/gstat/ppg.cpp
+ M src/utilities/gstat/ppg_proto.h
+Getting ready to use 32 (not 31) page and transaction numbers
+
+ 2011-01-21 17:18 alexpeshkoff
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+Avoid use of negative block size for small blocks
+
+ 2011-01-21 17:16 alexpeshkoff
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/Nodes.h
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/parse.y
+warnings
+
+ 2011-01-21 16:45 alexpeshkoff
+ M src/lock/print.cpp
+warnings
+
+ 2011-01-21 16:43 alexpeshkoff
+ M src/burp/burp.cpp
+ M src/burp/restore.epp
+ M src/common/pretty.cpp
+ M src/gpre/int_cxx.cpp
+ M src/gpre/par.cpp
+ M src/gpre/pat.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/nbackup/nbackup.cpp
+warnings
+
+ 2011-01-21 16:38 alexpeshkoff
+ M src/common/cvt.cpp
+Unavoidable casts when working with printf() return value
+
+ 2011-01-21 16:36 alexpeshkoff
+ M src/qli/command.cpp
+ M src/qli/gener.cpp
+ M src/qli/lex.cpp
+warnings
+
+ 2011-01-21 16:35 alexpeshkoff
+ M src/jrd/ext.cpp
+Better logic when working with flags in case of i/o error. Enhanced diagnostics.
+
+ 2011-01-21 15:06 asfernandes
+ M src/jrd/RecordSourceNodes.cpp
+Fix recursive query with ORDER BY.
+It was broken since Aug-2010 with commit "Refactor nod_rse, nod_relation,
+nod_procedure, nod_union, nod_aggregate and nod_window."
+
+ 2011-01-21 10:03 hvlad
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+Front ported fix for bug CORE-3282 : EXECUTE STATEMENT parses the SQL text using wrong charset
+
2011-01-20 09:18 alexpeshkoff
M src/common/config/config.cpp
fixed bug in my previous commit
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-21 17:55:04 UTC (rev 52181)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-22 03:26:36 UTC (rev 52182)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28986
+ FORMAL BUILD NUMBER:28996
*/
-#define PRODUCT_VER_STRING "3.0.0.28986"
-#define FILE_VER_STRING "WI-T3.0.0.28986"
-#define LICENSE_VER_STRING "WI-T3.0.0.28986"
-#define FILE_VER_NUMBER 3, 0, 0, 28986
+#define PRODUCT_VER_STRING "3.0.0.28996"
+#define FILE_VER_STRING "WI-T3.0.0.28996"
+#define LICENSE_VER_STRING "WI-T3.0.0.28996"
+#define FILE_VER_NUMBER 3, 0, 0, 28996
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28986"
+#define FB_BUILD_NO "28996"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-21 17:55:04 UTC (rev 52181)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-22 03:26:36 UTC (rev 52182)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28986
+BuildNum=28996
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hv...@us...> - 2011-01-24 12:51:41
|
Revision: 52188
http://firebird.svn.sourceforge.net/firebird/?rev=52188&view=rev
Author: hvlad
Date: 2011-01-24 12:51:32 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
Make it compiles on Windows after Alex's changes. MSVC10 build will follow later.
Modified Paths:
--------------
firebird/trunk/builds/win32/defs/firebird.def
firebird/trunk/builds/win32/defs/udr_engine.def
firebird/trunk/builds/win32/msvc8/engine.vcproj
firebird/trunk/builds/win32/msvc8/fbtrace.vcproj
firebird/trunk/builds/win32/msvc8/user_management.vcproj
firebird/trunk/builds/win32/msvc8/yvalve.vcproj
firebird/trunk/builds/win32/msvc9/engine.vcproj
firebird/trunk/builds/win32/msvc9/fbtrace.vcproj
firebird/trunk/builds/win32/msvc9/user_management.vcproj
firebird/trunk/builds/win32/msvc9/yvalve.vcproj
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/auth/trusted/AuthSspi.h
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/JrdStatement.h
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/why.cpp
Added Paths:
-----------
firebird/trunk/builds/win32/defs/plugin.def
Modified: firebird/trunk/builds/win32/defs/firebird.def
===================================================================
--- firebird/trunk/builds/win32/defs/firebird.def 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/defs/firebird.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -350,10 +350,8 @@
_isc_expand_dpb=isc_expand_dpb
_isc_event_block=isc_event_block
- fb_register_plugin
- fb_query_plugin
fb_ping
- fb_get_status_instance
+ fb_get_master_interface
gds__trace
gds__trace_raw
Added: firebird/trunk/builds/win32/defs/plugin.def
===================================================================
--- firebird/trunk/builds/win32/defs/plugin.def (rev 0)
+++ firebird/trunk/builds/win32/defs/plugin.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -0,0 +1,23 @@
+; 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 Khorsun Vladyslav
+; for the Firebird Open Source RDBMS project.
+;
+; Copyright (c) 2011 Khorsun Vladyslav <hv...@us...>
+; and all contributors signed below.
+;
+; All Rights Reserved.
+; Contributor(s): ______________________________________.
+
+EXPORTS
+ firebird_plugin
+
Property changes on: firebird/trunk/builds/win32/defs/plugin.def
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: firebird/trunk/builds/win32/defs/udr_engine.def
===================================================================
--- firebird/trunk/builds/win32/defs/udr_engine.def 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/defs/udr_engine.def 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
; Contributor(s): ______________________________________.
EXPORTS
- firebirdPlugin
+ firebird_plugin
fbUdrRegFunction
fbUdrRegProcedure
fbUdrRegTrigger
Modified: firebird/trunk/builds/win32/msvc8/engine.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/engine.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -62,6 +62,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -90,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -135,6 +136,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -163,7 +165,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -210,6 +212,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -238,7 +241,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -286,6 +289,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -488,10 +492,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\jrd\PreparedStatement.cpp"
>
</File>
@@ -1424,10 +1424,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\utilities\gstat\ppg_proto.h"
>
</File>
@@ -1852,6 +1848,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/fbtrace.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/fbtrace.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/fbtrace.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -58,6 +58,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -127,6 +128,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -199,6 +201,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -271,6 +274,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -372,6 +376,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/user_management.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/user_management.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/user_management.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -125,6 +126,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -196,6 +198,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -267,6 +270,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -330,6 +334,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc8/yvalve.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc8/yvalve.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc8/yvalve.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -377,6 +377,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\prepa_proto.h"
>
</File>
@@ -437,10 +441,18 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\MasterImplementation.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\perf.cpp"
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\preparse.cpp"
>
</File>
Modified: firebird/trunk/builds/win32/msvc9/engine.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/engine.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -19,7 +19,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -62,6 +62,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -90,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
UseOfMFC="0"
@@ -135,6 +136,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -163,7 +165,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -210,6 +212,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -238,7 +241,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\"
+ OutputDirectory="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\plugins\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
UseOfMFC="0"
@@ -286,6 +289,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories=""../../../extern/icu/$(PlatformName)/release/lib""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -488,10 +492,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\jrd\PreparedStatement.cpp"
>
</File>
@@ -1424,10 +1424,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\jrd\PluginManager.h"
- >
- </File>
- <File
RelativePath="..\..\..\src\utilities\gstat\ppg_proto.h"
>
</File>
@@ -1852,6 +1848,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/fbtrace.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/fbtrace.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/fbtrace.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -58,6 +58,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -127,6 +128,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -199,6 +201,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -271,6 +274,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mpr.lib icuuc.lib"
AdditionalLibraryDirectories="../../../extern/icu/$(PlatformName)/release/lib"
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -372,6 +376,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/user_management.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/user_management.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/user_management.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -126,6 +127,7 @@
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
TargetMachine="17"
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -196,6 +198,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
/>
<Tool
Name="VCALinkTool"
@@ -267,6 +270,7 @@
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories=""
+ ModuleDefinitionFile="..\defs\plugin.def"
TargetMachine="17"
/>
<Tool
@@ -330,6 +334,10 @@
>
</File>
</Filter>
+ <File
+ RelativePath="..\defs\plugin.def"
+ >
+ </File>
</Files>
<Globals>
</Globals>
Modified: firebird/trunk/builds/win32/msvc9/yvalve.vcproj
===================================================================
--- firebird/trunk/builds/win32/msvc9/yvalve.vcproj 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/builds/win32/msvc9/yvalve.vcproj 2011-01-24 12:51:32 UTC (rev 52188)
@@ -377,6 +377,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\prepa_proto.h"
>
</File>
@@ -437,10 +441,18 @@
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\MasterImplementation.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\perf.cpp"
>
</File>
<File
+ RelativePath="..\..\..\src\yvalve\PluginManager.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\yvalve\preparse.cpp"
>
</File>
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -42,10 +42,10 @@
{
}
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
- Result contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName, DpbInterface* dpb);
+ Result FB_CARG contAuthentication(Firebird::Status* status, const unsigned char* data, unsigned int size);
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
};
void registerLegacyClient(Firebird::IPlugin* iPlugin);
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -41,12 +41,12 @@
}
// work in progress - we must avoid both internal_user_data and callback function
- int execLine(ISC_STATUS* isc_status, const char* realUser,
+ int FB_CARG execLine(ISC_STATUS* isc_status, const char* realUser,
FB_API_HANDLE db, FB_API_HANDLE trans,
internal_user_data* io_user_data,
FPTR_SECURITY_CALLBACK display_func, void* callback_arg);
- int release();
+ int FB_CARG release();
};
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -122,13 +122,13 @@
{
}
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
- Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ Result FB_CARG contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
};
void registerLegacyServer(Firebird::IPlugin* iPlugin);
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -30,7 +30,7 @@
#ifdef TRUSTED_AUTH
#include "../common/classes/ClumpletReader.h"
-#include "../common/classes/Interface.h"
+#include "Interface.h"
#include "../common/classes/ImplementHelper.h"
using namespace Firebird;
@@ -397,7 +397,7 @@
*dataSize = sspiData.getCount();
}
-void WinSspiServer::release()
+int WinSspiServer::release()
{
if (--refCounter == 0)
{
@@ -469,13 +469,13 @@
void registerTrustedClient(Firebird::IPlugin* iPlugin)
{
- clientFactory.addRef();
+ clientFactory->addRef();
iPlugin->registerPlugin(Firebird::PluginType::AuthClient, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPlugin* iPlugin)
{
- serverFactory.addRef();
+ serverFactory->addRef();
iPlugin->registerPlugin(Firebird::PluginType::AuthServer, plugName, &serverFactory);
}
Modified: firebird/trunk/src/auth/trusted/AuthSspi.h
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/auth/trusted/AuthSspi.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -99,13 +99,13 @@
class WinSspiServer : public Firebird::StdPlugin<Server, FB_AUTH_SERVER_VERSION>
{
public:
- Result startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
- Result contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
+ Result FB_CARG contAuthentication(Firebird::Status* status, WriterInterface* writerInterface,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
WinSspiServer(Firebird::IFactoryParameter*);
@@ -117,12 +117,12 @@
class WinSspiClient : public Firebird::StdPlugin<Client, FB_AUTH_CLIENT_VERSION>
{
public:
- Result startAuthentication(Firebird::Status* status, bool isService,
+ Result FB_CARG startAuthentication(Firebird::Status* status, bool isService,
const char* dbName, DpbInterface* dpb);
- Result contAuthentication(Firebird::Status* status,
+ Result FB_CARG contAuthentication(Firebird::Status* status,
const unsigned char* data, unsigned int size);
- void getData(const unsigned char** data, unsigned short* dataSize);
- int release();
+ void FB_CARG getData(const unsigned char** data, unsigned short* dataSize);
+ int FB_CARG release();
WinSspiClient(Firebird::IFactoryParameter*);
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/common/StatusHolder.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -38,27 +38,27 @@
class BaseStatus : public Status
{
public:
- virtual void set(const ISC_STATUS* value)
+ virtual void FB_CARG set(const ISC_STATUS* value)
{
set(fb_utils::statusLength(value), value);
}
- virtual void set(unsigned int length, const ISC_STATUS* value)
+ virtual void FB_CARG set(unsigned int length, const ISC_STATUS* value)
{
fb_utils::copyStatus(vector, FB_NELEM(vector), value, length);
}
- virtual void init()
+ virtual void FB_CARG init()
{
fb_utils::init_status(vector);
}
- virtual const ISC_STATUS* get() const
+ virtual const ISC_STATUS* FB_CARG get() const
{
return vector;
}
- virtual int isSuccess() const
+ virtual int FB_CARG isSuccess() const
{
return vector[1] == 0;
}
Modified: firebird/trunk/src/dsql/dsql.h
===================================================================
--- firebird/trunk/src/dsql/dsql.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/dsql/dsql.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -579,19 +579,19 @@
friend class Firebird::MemoryPool;
public:
- virtual int release();
+ virtual int FB_CARG release();
//virtual Sqlda* describeInput(Status* status);
//virtual Sqlda* describeOutput(Status* status);
- virtual Firebird::IStatement* prepare(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::IStatement* FB_CARG prepare(Status* status, Firebird::ITransaction* tra,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect,
unsigned int item_length, const unsigned char* items,
unsigned int buffer_length, unsigned char* buffer);
- virtual void getInfo(Status* status,
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void setCursor(Status* status, const char* name, unsigned int type);
+ virtual void FB_CARG setCursor(Status* status, const char* name, unsigned int type);
// virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* tra, Sqlda* in, Sqlda* out);
- virtual Firebird::ITransaction* executeMessage(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::ITransaction* FB_CARG executeMessage(Status* status, Firebird::ITransaction* tra,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type,
unsigned int in_msg_length, const unsigned char* in_message,
@@ -599,16 +599,16 @@
unsigned int out_msg_type,
unsigned int out_msg_length, unsigned char* out_message);
// virtual int fetch(Status* status, Sqlda* out); // returns 100 if EOF, 101 if fragmented
- virtual int fetchMessage(Status* status,
+ virtual int FB_CARG fetchMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, unsigned char* message); // returns 100 if EOF, 101 if fragmented
// virtual void insert(Status* status, Sqlda* in);
- virtual void insertMessage(Status* status,
+ virtual void FB_CARG insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
- virtual void free(Status* status, unsigned int option);
+ virtual void FB_CARG free(Status* status, unsigned int option);
};
// Blob
Modified: firebird/trunk/src/jrd/Attachment.h
===================================================================
--- firebird/trunk/src/jrd/Attachment.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/Attachment.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -220,29 +220,29 @@
bool checkHandle() const;
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
// virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb);
// second form is tmp - not to rewrite external engines right now
- virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
+ virtual Firebird::ITransaction* FB_CARG startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
FB_API_HANDLE api);
- virtual Firebird::ITransaction* reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
- virtual Firebird::IStatement* allocateStatement(Status* status);
- virtual Firebird::IRequest* compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
- virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* transaction,
+ virtual Firebird::ITransaction* FB_CARG reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
+ virtual Firebird::IStatement* FB_CARG allocateStatement(Status* status);
+ virtual Firebird::IRequest* FB_CARG compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
+ virtual Firebird::ITransaction* FB_CARG execute(Status* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type, unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_blr_length, unsigned char* out_blr,
unsigned int out_msg_type, unsigned int out_msg_length, unsigned char* out_msg);
- virtual Firebird::IEvents* queEvents(Status* status, Firebird::EventCallback* callback,
+ virtual Firebird::IEvents* FB_CARG queEvents(Status* status, Firebird::EventCallback* callback,
unsigned int length, const unsigned char* events);
- virtual void cancelOperation(Status* status, int option);
- virtual void ping(Status* status);
- virtual void detach(Status* status);
- virtual void drop(Status* status);
+ virtual void FB_CARG cancelOperation(Status* status, int option);
+ virtual void FB_CARG ping(Status* status);
+ virtual void FB_CARG detach(Status* status);
+ virtual void FB_CARG drop(Status* status);
private:
Attachment(MemoryPool* pool, Database* dbb, FB_API_HANDLE publicHandle);
Modified: firebird/trunk/src/jrd/JrdStatement.h
===================================================================
--- firebird/trunk/src/jrd/JrdStatement.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/JrdStatement.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -83,19 +83,19 @@
MapItemInfo mapItemInfo; // Map item to item info
public:
- virtual int release();
- virtual void receive(Status* status, int level, unsigned int msg_type,
+ virtual int FB_CARG release();
+ virtual void FB_CARG receive(Status* status, int level, unsigned int msg_type,
unsigned int length, unsigned char* message);
- virtual void send(Status* status, int level, unsigned int msg_type,
+ virtual void FB_CARG send(Status* status, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void getInfo(Status* status, int level,
+ virtual void FB_CARG getInfo(Status* status, int level,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status, Firebird::ITransaction* tra, int level);
- virtual void startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
+ virtual void FB_CARG start(Status* status, Firebird::ITransaction* tra, int level);
+ virtual void FB_CARG startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void unwind(Status* status, int level);
- virtual void free(Status* status);
+ virtual void FB_CARG unwind(Status* status, int level);
+ virtual void FB_CARG free(Status* status);
};
Modified: firebird/trunk/src/jrd/blb.h
===================================================================
--- firebird/trunk/src/jrd/blb.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/blb.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -209,15 +209,15 @@
static void destroy(blb* blob, const bool purge_flag);
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual unsigned int getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
- virtual void putSegment(Status* status, unsigned int length, const unsigned char* buffer);
- virtual void cancel(Status* status);
- virtual void close(Status* status);
- virtual int seek(Status* status, int mode, int offset); // returns position
+ virtual unsigned int FB_CARG getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
+ virtual void FB_CARG putSegment(Status* status, unsigned int length, const unsigned char* buffer);
+ virtual void FB_CARG cancel(Status* status);
+ virtual void FB_CARG close(Status* status);
+ virtual int FB_CARG seek(Status* status, int mode, int offset); // returns position
};
const int BLB_temporary = 1; // Newly created blob
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/jrd.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -150,8 +150,8 @@
class Events : public StdIface<IEvents, FB_I_EVENTS_VERSION, pool_alloc<type_Events> >
{
public:
- virtual int release();
- virtual void cancel(Status* status);
+ virtual int FB_CARG release();
+ virtual void FB_CARG cancel(Status* status);
public:
Events(int h, Attachment* att) : id(h), attachment(att) { }
@@ -219,13 +219,13 @@
class Svc : public StdIface<IService, FB_I_SERVICE_VERSION>
{
public:
- virtual int release();
- virtual void detach(Status* status);
- virtual void query(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG detach(Status* status);
+ virtual void FB_CARG query(Status* status,
unsigned int sendLength, const unsigned char* sendItems,
unsigned int receiveLength, const unsigned char* receiveItems,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status,
+ virtual void FB_CARG start(Status* status,
unsigned int spbLength, const unsigned char* spb);
public:
@@ -249,16 +249,16 @@
explicit Provider(IFactoryParameter*)
{ }
- virtual void attachDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
+ virtual void FB_CARG attachDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
unsigned int dpbLength, const unsigned char* dpb);
- virtual void createDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
+ virtual void FB_CARG createDatabase(Status* status, Firebird::IAttachment** ptr, FB_API_HANDLE api, const char* fileName,
unsigned int dpbLength, const unsigned char* dpb);
- virtual Firebird::IService* attachServiceManager(Status* status, const char* service,
+ virtual Firebird::IService* FB_CARG attachServiceManager(Status* status, const char* service,
unsigned int spbLength, const unsigned char* spb);
//virtual Firebird::ITransaction* startTransaction(Status* status, unsigned int count, ...);
//virtual Firebird::ITransaction* startMultiple(Status* status, MultipleTransaction* multi);
- virtual void shutdown(Status* status, unsigned int timeout, const int reason);
- virtual int release();
+ virtual void FB_CARG shutdown(Status* status, unsigned int timeout, const int reason);
+ virtual int FB_CARG release();
};
int Provider::release()
@@ -687,16 +687,16 @@
public:
TraceFailedConnection(const char* filename, const DatabaseOptions* options);
- virtual int getConnectionID() { return 0; }
- virtual int getProcessID() { return m_options->dpb_remote_pid; }
- virtual const char* getDatabaseName() { return m_filename; }
- virtual const char* getUserName() { return m_id.usr_user_name.c_str(); }
- virtual const char* getRoleName() { return m_options->dpb_role_name.c_str(); }
- virtual const char* getCharSet() { return m_options->dpb_lc_ctype.c_str(); }
- virtual const char* getRemoteProtocol() { return m_options->dpb_network_protocol.c_str(); }
- virtual const char* getRemoteAddress() { return m_options->dpb_remote_address.c_str(); }
- virtual int getRemoteProcessID() { return m_options->dpb_remote_pid; }
- virtual const char* getRemoteProcessName() { return m_options->dpb_remote_process.c_str(); }
+ virtual int FB_CARG getConnectionID() { return 0; }
+ virtual int FB_CARG getProcessID() { return m_options->dpb_remote_pid; }
+ virtual const char* FB_CARG getDatabaseName() { return m_filename; }
+ virtual const char* FB_CARG getUserName() { return m_id.usr_user_name.c_str(); }
+ virtual const char* FB_CARG getRoleName() { return m_options->dpb_role_name.c_str(); }
+ virtual const char* FB_CARG getCharSet() { return m_options->dpb_lc_ctype.c_str(); }
+ virtual const char* FB_CARG getRemoteProtocol() { return m_options->dpb_network_protocol.c_str(); }
+ virtual const char* FB_CARG getRemoteAddress() { return m_options->dpb_remote_address.c_str(); }
+ virtual int FB_CARG getRemoteProcessID() { return m_options->dpb_remote_pid; }
+ virtual const char* FB_CARG getRemoteProcessName() { return m_options->dpb_remote_process.c_str(); }
private:
const char* m_filename;
Modified: firebird/trunk/src/jrd/tra.h
===================================================================
--- firebird/trunk/src/jrd/tra.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/tra.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -315,38 +315,38 @@
UserManagement* getUserManagement();
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual Firebird::IBlob* createBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG createBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual Firebird::IBlob* openBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG openBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual int getSlice(Status* status, ISC_QUAD* id,
+ virtual int FB_CARG getSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void putSlice(Status* status, ISC_QUAD* id,
+ virtual void FB_CARG putSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void FB_CARG transactRequest(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_msg_length, unsigned char* out_msg,
Firebird::IAttachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void FB_CARG prepare(Status* status,
unsigned int msg_length = 0, const unsigned char* message = 0);
- virtual void ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
- virtual void commit(Status* status);
- virtual void commitRetaining(Status* status);
- virtual void rollback(Status* status);
- virtual void rollbackRetaining(Status* status);
+ virtual void FB_CARG ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
+ virtual void FB_CARG commit(Status* status);
+ virtual void FB_CARG commitRetaining(Status* status);
+ virtual void FB_CARG rollback(Status* status);
+ virtual void FB_CARG rollbackRetaining(Status* status);
};
// System transaction is always transaction 0.
Modified: firebird/trunk/src/jrd/trace/TraceObjects.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/trace/TraceObjects.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -293,7 +293,8 @@
// Use descriptor for nulls signaling
USHORT null_flag = 0;
- if (parameter->par_null &&
+ if (parameter->par_null &&
+ parameter->par_null->par_desc.dsc_address &&
*((SSHORT*) parameter->par_null->par_desc.dsc_address))
{
null_flag = DSC_null;
@@ -450,9 +451,9 @@
m_maxSize = Config::getMaxUserTraceLogSize();
}
- virtual size_t write(const void* buf, size_t size);
+ virtual size_t FB_CARG write(const void* buf, size_t size);
- virtual int release()
+ virtual int FB_CARG release()
{
if (--refCounter == 0)
{
Modified: firebird/trunk/src/jrd/trace/TraceObjects.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.h 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/jrd/trace/TraceObjects.h 2011-01-24 12:51:32 UTC (rev 52188)
@@ -56,16 +56,16 @@
m_att(att)
{}
- virtual int getConnectionID();
- virtual int getProcessID();
- virtual const char* getDatabaseName();
- virtual const char* getUserName();
- virtual const char* getRoleName();
- virtual const char* getCharSet();
- virtual const char* getRemoteProtocol();
- virtual const char* getRemoteAddress();
- virtual int getRemoteProcessID();
- virtual const char* getRemoteProcessName();
+ virtual int FB_CARG getConnectionID();
+ virtual int FB_CARG getProcessID();
+ virtual const char* FB_CARG getDatabaseName();
+ virtual const char* FB_CARG getUserName();
+ virtual const char* FB_CARG getRoleName();
+ virtual const char* FB_CARG getCharSet();
+ virtual const char* FB_CARG getRemoteProtocol();
+ virtual const char* FB_CARG getRemoteAddress();
+ virtual int FB_CARG getRemoteProcessID();
+ virtual const char* FB_CARG getRemoteProcessName();
private:
const Attachment* const m_att;
@@ -80,11 +80,11 @@
m_perf(perf)
{}
- virtual int getTransactionID();
- virtual bool getReadOnly();
- virtual int getWait();
- virtual ntrace_tra_isolation_t getIsolation();
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual int FB_CARG getTransactionID();
+ virtual bool FB_CARG getReadOnly();
+ virtual int FB_CARG getWait();
+ virtual ntrace_tra_isolation_t FB_CARG getIsolation();
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_tra* const m_tran;
@@ -101,9 +101,9 @@
m_text(*getDefaultMemoryPool())
{}
- virtual const unsigned char* getData() { return m_blr; }
- virtual size_t getDataLength() { return m_length; }
- virtual const char* getText();
+ virtual const unsigned char* FB_CARG getData() { return m_blr; }
+ virtual size_t FB_CARG getDataLength() { return m_length; }
+ virtual const char* FB_CARG getText();
private:
static void print_blr(void* arg, SSHORT offset, const char* line);
@@ -123,8 +123,8 @@
m_perf(perf)
{}
- virtual int getStmtID() { return m_stmt->req_id; }
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual int FB_CARG getStmtID() { return m_stmt->req_id; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_req* const m_stmt;
@@ -139,8 +139,8 @@
BLRPrinter(blr, length)
{}
- virtual int getStmtID() { return 0; }
- virtual PerformanceInfo* getPerf() { return NULL; }
+ virtual int FB_CARG getStmtID() { return 0; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return NULL; }
};
@@ -157,12 +157,12 @@
~TraceSQLStatementImpl();
- virtual int getStmtID();
- virtual PerformanceInfo* getPerf();
- virtual TraceParams* getInputs();
- virtual const char* getText();
- virtual const char* getPlan();
- virtual const char* getTextUTF8();
+ virtual int FB_CARG getStmtID();
+ virtual PerformanceInfo* FB_CARG getPerf();
+ virtual TraceParams* FB_CARG getInputs();
+ virtual const char* FB_CARG getText();
+ virtual const char* FB_CARG getPlan();
+ virtual const char* FB_CARG getTextUTF8();
private:
class DSQLParamsImpl : public Firebird::StackIface<TraceParams, FB_TRACE_PARAMS_VERSION>
@@ -173,8 +173,8 @@
m_descs(pool)
{}
- virtual size_t getCount();
- virtual const dsc* getParam(size_t idx);
+ virtual size_t FB_CARG getCount();
+ virtual const dsc* FB_CARG getParam(size_t idx);
private:
void fillParams();
@@ -198,12 +198,12 @@
m_text(text)
{}
- virtual int getStmtID() { return 0; }
- virtual PerformanceInfo* getPerf() { return NULL; }
- virtual TraceParams* getInputs() { return NULL; }
- virtual const char* getText() { return m_text.c_str(); }
- virtual const char* getPlan() { return ""; }
- virtual const char* getTextUTF8();
+ virtual int FB_CARG getStmtID() { return 0; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return NULL; }
+ virtual TraceParams* FB_CARG getInputs() { return NULL; }
+ virtual const char* FB_CARG getText() { return m_text.c_str(); }
+ virtual const char* FB_CARG getPlan() { return ""; }
+ virtual const char* FB_CARG getTextUTF8();
private:
Firebird::string& m_text;
@@ -220,9 +220,9 @@
m_value(value)
{}
- virtual const char* getNameSpace() { return m_namespace; }
- virtual const char* getVarName() { return m_name; }
- virtual const char* getVarValue() { return m_value; }
+ virtual const char* FB_CARG getNameSpace() { return m_namespace; }
+ virtual const char* FB_CARG getVarName() { return m_name; }
+ virtual const char* FB_CARG getVarValue() { return m_value; }
private:
const char* const m_namespace;
@@ -239,13 +239,13 @@
m_inputs(*getDefaultMemoryPool(), request->req_proc_caller, request->req_proc_inputs)
{}
- virtual const char* getProcName()
+ virtual const char* FB_CARG getProcName()
{
return m_request->getStatement()->procedure->getName().identifier.c_str();
}
- virtual TraceParams* getInputs() { return &m_inputs; }
- virtual PerformanceInfo* getPerf() { return m_perf; };
+ virtual TraceParams* FB_CARG getInputs() { return &m_inputs; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; };
private:
class JrdParamsImpl : public Firebird::StackIface<TraceParams, FB_TRACE_PARAMS_VERSION>
@@ -257,8 +257,8 @@
m_descs(pool)
{}
- virtual size_t getCount();
- virtual const dsc* getParam(size_t idx);
+ virtual size_t FB_CARG getCount();
+ virtual const dsc* FB_CARG getParam(size_t idx);
private:
void fillParams();
@@ -283,11 +283,11 @@
m_perf(perf)
{}
- virtual const char* getTriggerName();
- virtual const char* getRelationName();
- virtual int getAction() { return m_trig->req_trigger_action; }
- virtual int getWhich() { return m_which; }
- virtual PerformanceInfo* getPerf() { return m_perf; }
+ virtual const char* FB_CARG getTriggerName();
+ virtual const char* FB_CARG getRelationName();
+ virtual int FB_CARG getAction() { return m_trig->req_trigger_action; }
+ virtual int FB_CARG getWhich() { return m_which; }
+ virtual PerformanceInfo* FB_CARG getPerf() { return m_perf; }
private:
const jrd_req* const m_trig;
@@ -303,16 +303,16 @@
m_svc(svc)
{}
- virtual ntrace_service_t getServiceID();
- virtual const char* getServiceMgr();
- virtual const char* getServiceName();
- virtual const char* getUserName();
- virtual const char* getRoleName();
- virtual int getProcessID();
- virtual const char* getRemoteProtocol();
- virtual const char* getRemoteAddress();
- virtual int getRemoteProcessID();
- virtual const char* getRemoteProcessName();
+ virtual ntrace_service_t FB_CARG getServiceID();
+ virtual const char* FB_CARG getServiceMgr();
+ virtual const char* FB_CARG getServiceName();
+ virtual const char* FB_CARG getUserName();
+ virtual const char* FB_CARG getRoleName();
+ virtual int FB_CARG getProcessID();
+ virtual const char* FB_CARG getRemoteProtocol();
+ virtual const char* FB_CARG getRemoteAddress();
+ virtual int FB_CARG getRemoteProcessID();
+ virtual const char* FB_CARG getRemoteProcessName();
private:
const Service* const m_svc;
@@ -325,7 +325,7 @@
TraceRuntimeStats(Database* dbb, RuntimeStatistics* baseline, RuntimeStatistics* stats,
SINT64 clock, SINT64 records_fetched);
- PerformanceInfo* getPerf() { return &m_info; }
+ PerformanceInfo* FB_CARG getPerf() { return &m_info; }
private:
PerformanceInfo m_info;
@@ -350,14 +350,14 @@
m_logWriter = NULL;
}
- virtual const char* getConfigText() { return m_session.ses_config.c_str(); }
- virtual int getTraceSessionID() { return m_session.ses_id; }
- virtual const char* getTraceSessionName() { return m_session.ses_name.c_str(); }
+ virtual const char* FB_CARG getConfigText() { return m_session.ses_config.c_str(); }
+ virtual int FB_CARG getTraceSessionID() { return m_session.ses_id; }
+ virtual const char* FB_CARG getTraceSessionName() { return m_session.ses_name.c_str(); }
- virtual const char* getFirebirdRootDirectory();
- virtual const char* getDatabaseName() { return m_filename; }
+ virtual const char* FB_CARG getFirebirdRootDirectory();
+ virtual const char* FB_CARG getDatabaseName() { return m_filename; }
- virtual TraceConnection* getConnection()
+ virtual TraceConnection* FB_CARG getConnection()
{
if (m_attachment)
return &m_trace_conn;
@@ -365,7 +365,7 @@
return NULL;
}
- virtual TraceLogWriter* getLogWriter();
+ virtual TraceLogWriter* FB_CARG getLogWriter();
private:
const Firebird::TraceSession& m_session;
Modified: firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
===================================================================
--- firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -119,7 +119,7 @@
}
}
- int release()
+ int FB_CARG release()
{
if (--refCounter == 0)
{
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2011-01-24 12:43:04 UTC (rev 52187)
+++ firebird/trunk/src/remote/client/interface.cpp 2011-01-24 12:51:32 UTC (rev 52188)
@@ -135,15 +135,15 @@
class Blob : public Firebird::StdIface<Firebird::IBlob, FB_I_BLOB_VERSION>
{
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual unsigned int getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
- virtual void putSegment(Status* status, unsigned int length, const unsigned char* buffer);
- virtual void cancel(Status* status);
- virtual void close(Status* status);
- virtual int seek(Status* status, int mode, int offset); // returns position
+ virtual unsigned int FB_CARG getSegment(Status* status, unsigned int length, unsigned char* buffer); // returns real length
+ virtual void FB_CARG putSegment(Status* status, unsigned int length, const unsigned char* buffer);
+ virtual void FB_CARG cancel(Status* status);
+ virtual void FB_CARG close(Status* status);
+ virtual int FB_CARG seek(Status* status, int mode, int offset); // returns position
public:
Blob(Rbl* handle) : blob(handle) { }
@@ -173,38 +173,38 @@
class Transaction : public Firebird::StdIface<Firebird::ITransaction, FB_I_TRANSACTION_VERSION>
{
public:
- virtual int release();
- virtual void getInfo(Status* status,
+ virtual int FB_CARG release();
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual Firebird::IBlob* createBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG createBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual Firebird::IBlob* openBlob(Status* status, ISC_QUAD* id,
+ virtual Firebird::IBlob* FB_CARG openBlob(Status* status, ISC_QUAD* id,
unsigned int bpbLength = 0, const unsigned char* bpb = 0,
Firebird::IAttachment* att = 0);
- virtual int getSlice(Status* status, ISC_QUAD* id,
+ virtual int FB_CARG getSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void putSlice(Status* status, ISC_QUAD* id,
+ virtual void FB_CARG putSlice(Status* status, ISC_QUAD* id,
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
Firebird::IAttachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void FB_CARG transactRequest(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int in_msg_length, const unsigned char* in_msg,
unsigned int out_msg_length, unsigned char* out_msg,
Firebird::IAttachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void FB_CARG prepare(Status* status,
unsigned int msg_length = 0, const unsigned char* message = 0);
- virtual void ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
- virtual void commit(Status* status);
- virtual void commitRetaining(Status* status);
- virtual void rollback(Status* status);
- virtual void rollbackRetaining(Status* status);
+ virtual void FB_CARG ddl(Status* status, unsigned int length, const unsigned char* ddlCommand);
+ virtual void FB_CARG commit(Status* status);
+ virtual void FB_CARG commitRetaining(Status* status);
+ virtual void FB_CARG rollback(Status* status);
+ virtual void FB_CARG rollbackRetaining(Status* status);
public:
Transaction(Rtr* handle) : transaction(handle) { }
@@ -243,19 +243,19 @@
class Statement : public Firebird::StdIface<Firebird::IStatement, FB_I_STATEMENT_VERSION>
{
public:
- virtual int release();
+ virtual int FB_CARG release();
//virtual Sqlda* describeInput(Status* status);
//virtual Sqlda* describeOutput(Status* status);
- virtual Statement* prepare(Status* status, Firebird::ITransaction* tra,
+ virtual Statement* FB_CARG prepare(Status* status, Firebird::ITransaction* tra,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect,
unsigned int item_length, const unsigned char* items,
unsigned int buffer_length, unsigned char* buffer);
- virtual void getInfo(Status* status,
+ virtual void FB_CARG getInfo(Status* status,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void setCursor(Status* status, const char* name, unsigned int type);
+ virtual void FB_CARG setCursor(Status* status, const char* name, unsigned int type);
// virtual Firebird::ITransaction* execute(Status* status, Firebird::ITransaction* tra, Sqlda* in, Sqlda* out);
- virtual Firebird::ITransaction* executeMessage(Status* status, Firebird::ITransaction* tra,
+ virtual Firebird::ITransaction* FB_CARG executeMessage(Status* status, Firebird::ITransaction* tra,
unsigned int in_blr_length, const unsigned char* in_blr,
unsigned int in_msg_type,
unsigned int in_msg_length, const unsigned char* in_message,
@@ -263,16 +263,16 @@
unsigned int out_msg_type,
unsigned int out_msg_length, unsigned char* out_message);
// virtual int fetch(Status* status, Sqlda* out); // returns 100 if EOF, 101 if fragmented
- virtual int fetchMessage(Status* status,
+ virtual int FB_CARG fetchMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, unsigned char* message); // returns 100 if EOF, 101 if fragmented
// virtual void insert(Status* status, Sqlda* in);
- virtual void insertMessage(Status* status,
+ virtual void FB_CARG insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
- virtual void free(Status* status, unsigned int option);
+ virtual void FB_CARG free(Status* status, unsigned int option);
public:
Statement(Rsr* handle) : statement(handle) { }
@@ -300,19 +300,19 @@
class Request : public Firebird::StdIface<Firebird::IRequest, FB_I_REQUEST_VERSION>
{
public:
- virtual int release();
- virtual void receive(Status* status, int level, unsigned int msg_type,
+ virtual int FB_CARG release();
+ virtual void FB_CARG receive(Status* status, int level, unsigned int msg_type,
unsigned int length, unsigned char* message);
- virtual void send(Status* status, int level, unsigned int msg_type,
+ virtual void FB_CARG send(Status* status, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void getInfo(Status* status, int level,
+ virtual void FB_CARG getInfo(Status* status, int level,
unsigned int itemsLength, const unsigned char* items,
unsigned int bufferLength, unsigned char* buffer);
- virtual void start(Status* status, Firebird::ITransaction* tra, int level);
- virtual void startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
+ virtual void FB_CARG start(Status* status, Firebird::ITransaction* tra, int level);
+ virtual void FB_CARG startAndSend(Status* status, Firebird::ITransaction* tra, int level, unsigned int msg_type,
unsigned int length, const unsigned char* message);
- virtual void unwind(Status* status, int level);
- virtual void free(Status* status);
+ virtual void FB_CARG unwind(Status* status, int level);
+ virtual void FB_CARG free(Status* status);
public:
Request(Rrq* handle) : rq(handle) { }
@@ -340,8 +340,8 @@
class Events : public Firebird::StdIface<Firebird::IEvents, FB_I_EVENTS_VERSION>
{
public:
- virtual int release();
- virtual void ...
[truncated message content] |
|
From: <fir...@us...> - 2011-01-28 03:17:15
|
Revision: 52209
http://firebird.svn.sourceforge.net/firebird/?rev=52209&view=rev
Author: firebirds
Date: 2011-01-28 03:17:09 +0000 (Fri, 28 Jan 2011)
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 2011-01-28 00:58:32 UTC (rev 52208)
+++ firebird/trunk/ChangeLog 2011-01-28 03:17:09 UTC (rev 52209)
@@ -1,3 +1,154 @@
+ 2011-01-28 00:58 asfernandes
+ M src/common/os/win32/isc_ipc.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/remote/client/interface.cpp
+Misc
+
+ 2011-01-27 10:39 dimitr
+ M builds/win32/msvc9/fbserver.vcproj
+Follow the MSVC10 changes regarding the binary name.
+
+ 2011-01-27 10:37 dimitr
+ M builds/win32/msvc8/fbserver.vcproj
+Follow the MSVC10 changes regarding the binary name.
+
+ 2011-01-27 05:13 dimitr
+ M src/remote/server/os/win32/srvr_w32.cpp
+Fixed authentication in Windows builds.
+
+ 2011-01-26 18:06 alexpeshkoff
+ M src/jrd/jrd.cpp
+Avoid to early shutdown of engine
+
+ 2011-01-26 18:04 alexpeshkoff
+ M src/yvalve/PluginManager.cpp
+Do not store pointer to array which may grow - use index instead
+
+ 2011-01-26 16:34 alexpeshkoff
+ M src/remote/client/interface.cpp
+Do not throw success status vector - if we got no user error, but bad op in packet, this is network error
+
+ 2011-01-26 11:20 dimitr
+ M src/jrd/JrdStatement.h
+Misc.
+
+ 2011-01-26 10:03 dimitr
+ M src/dsql/ExprNodes.cpp
+Misc.
+
+ 2011-01-24 22:58 hvlad
+ M builds/win32/make_all.bat
+ M builds/win32/set_build_target.bat
+Corrections for windows build
+
+ 2011-01-24 20:32 hvlad
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/engine.vcxproj.filters
+ M builds/win32/msvc10/fbtrace.vcxproj
+ M builds/win32/msvc10/fbtrace.vcxproj.filters
+ M builds/win32/msvc10/user_management.vcxproj
+ M builds/win32/msvc10/user_management.vcxproj.filters
+ M builds/win32/msvc10/yvalve.vcxproj
+ M builds/win32/msvc10/yvalve.vcxproj.filters
+Update MSVC10 build files
+
+ 2011-01-24 16:36 alexpeshkoff
+ M src/common/ThreadStart.cpp
+ M src/common/ThreadStart.h
+ M src/jrd/jrd.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/remote/client/interface.cpp
+Implement Thread::kill for posex threads. Do not support separate Thread::closeHandle - move it inside kill and waitForCompletion
+
+ 2011-01-24 16:34 alexpeshkoff
+ M src/auth/SecurityDatabase/pwd.cpp
+Letting exceptions get out of shutdown function was wrong idea
+
+ 2011-01-24 14:10 hvlad
+ M src/common/os/win32/isc_ipc.cpp
+Refactor open events cache to avoid atexit handler which could crash process on DLL unload.
+
+ 2011-01-24 13:20 hvlad
+ M src/common/ThreadStart.cpp
+ M src/common/ThreadStart.h
+ M src/jrd/jrd.cpp
+ M src/remote/client/interface.cpp
+Fixed main reason of AV at engine DLL unload time. More fixes will follow soon.
+
+ 2011-01-24 12:51 hvlad
+ M builds/win32/defs/firebird.def
+ A builds/win32/defs/plugin.def
+ M builds/win32/defs/udr_engine.def
+ M builds/win32/msvc8/engine.vcproj
+ M builds/win32/msvc8/fbtrace.vcproj
+ M builds/win32/msvc8/user_management.vcproj
+ M builds/win32/msvc8/yvalve.vcproj
+ M builds/win32/msvc9/engine.vcproj
+ M builds/win32/msvc9/fbtrace.vcproj
+ M builds/win32/msvc9/user_management.vcproj
+ M builds/win32/msvc9/yvalve.vcproj
+ M src/auth/SecurityDatabase/LegacyClient.h
+ M src/auth/SecurityDatabase/LegacyManagement.h
+ M src/auth/SecurityDatabase/jrd_pwd.h
+ M src/auth/trusted/AuthSspi.cpp
+ M src/auth/trusted/AuthSspi.h
+ M src/common/StatusHolder.h
+ M src/dsql/dsql.h
+ M src/jrd/Attachment.h
+ M src/jrd/JrdStatement.h
+ M src/jrd/blb.h
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/client/interface.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/why.cpp
+Make it compiles on Windows after Alex's changes. MSVC10 build will follow later.
+
+ 2011-01-24 12:43 hvlad
+ M src/jrd/trace/TraceManager.h
+Warning
+
+ 2011-01-23 00:32 asfernandes
+ M src/dsql/parse.y
+Misc
+
+ 2011-01-22 21:32 asfernandes
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+ M src/dsql/gen.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/dsql/pass1_proto.h
+Refactor DSQL's BREAK, LEAVE and CONTINUE.
+
+ 2011-01-22 20:40 asfernandes
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/Visitors.h
+ M src/dsql/gen.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/dsql/pass1_proto.h
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/RecordSourceNodes.h
+Refactor DSQL's nod_join and nod_union.
+
+ 2011-01-22 17:15 asfernandes
+ M src/common/config/config_file.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/Database.h
+ M src/jrd/cch.cpp
+ M src/jrd/pag.h
+ M src/utilities/nbackup/nbackup.cpp
+Misc
+
2011-01-21 17:55 alexpeshkoff
M src/jrd/Database.h
M src/jrd/blb.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-01-28 00:58:32 UTC (rev 52208)
+++ firebird/trunk/src/jrd/build_no.h 2011-01-28 03:17:09 UTC (rev 52209)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28996
+ FORMAL BUILD NUMBER:29017
*/
-#define PRODUCT_VER_STRING "3.0.0.28996"
-#define FILE_VER_STRING "WI-T3.0.0.28996"
-#define LICENSE_VER_STRING "WI-T3.0.0.28996"
-#define FILE_VER_NUMBER 3, 0, 0, 28996
+#define PRODUCT_VER_STRING "3.0.0.29017"
+#define FILE_VER_STRING "WI-T3.0.0.29017"
+#define LICENSE_VER_STRING "WI-T3.0.0.29017"
+#define FILE_VER_NUMBER 3, 0, 0, 29017
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28996"
+#define FB_BUILD_NO "29017"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-01-28 00:58:32 UTC (rev 52208)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-01-28 03:17:09 UTC (rev 52209)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28996
+BuildNum=29017
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...> - 2011-01-28 17:56:58
|
Revision: 52220
http://firebird.svn.sourceforge.net/firebird/?rev=52220&view=rev
Author: alexpeshkoff
Date: 2011-01-28 17:56:50 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
Frontported fix for CORE-3194: Number of connections to linux superclassic has limit equal 508
Modified Paths:
--------------
firebird/trunk/configure.in
firebird/trunk/src/remote/inet.cpp
Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in 2011-01-28 17:22:44 UTC (rev 52219)
+++ firebird/trunk/configure.in 2011-01-28 17:56:50 UTC (rev 52220)
@@ -667,6 +667,7 @@
AC_CHECK_HEADERS(float.h)
AC_CHECK_HEADERS(atomic.h)
AC_CHECK_HEADERS(atomic_ops.h)
+AC_CHECK_HEADERS(poll.h)
dnl check for ICU presence
AC_CHECK_HEADER(unicode/ucnv.h,,AC_MSG_ERROR(ICU support not found - please install development ICU package))
@@ -790,6 +791,7 @@
AC_CHECK_FUNCS(fegetenv)
AC_CHECK_FUNCS(strerror_r)
AC_CHECK_FUNCS(fdatasync fsync)
+AC_CHECK_FUNCS(poll)
dnl AC_CHECK_FUNCS(AO_compare_and_swap_full)
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <atomic_ops.h>]], [[AO_T x; AO_compare_and_swap_full(&x, 0, 0); return 0;]])],
Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp 2011-01-28 17:22:44 UTC (rev 52219)
+++ firebird/trunk/src/remote/inet.cpp 2011-01-28 17:56:50 UTC (rev 52220)
@@ -88,9 +88,13 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <sys/wait.h>
-#ifdef HAVE_SYS_SELECT_H
+
+#if defined(HAVE_POLL_H)
+#include <poll.h>
+#elif defined(HAVE_SYS_SELECT_H)
#include <sys/select.h>
#endif
+
#endif // !WIN_NT
const int INET_RETRY_CALL = 5;
@@ -229,12 +233,175 @@
const int SELECT_TIMEOUT = 60; // Dispatch thread select timeout (sec)
-struct slct_t
+class Select
{
+#ifdef HAVE_POLL
+private:
+ static const int SEL_INIT_EVENTS = POLLIN;
+ static const int SEL_CHECK_MASK = POLLIN;
+
+ pollfd* getPollFd(int n)
+ {
+ pollfd* const end = slct_poll.end();
+ for (pollfd* pf = slct_poll.begin(); pf < end; ++pf)
+ {
+ if (n == pf->fd)
+ {
+ return pf;
+ }
+ }
+
+ return NULL;
+ }
+
+ static int compare(const void* a, const void* b)
+ {
+ // use C-cast here to be for sure compatible with libc
+ return ((pollfd*)a)->fd - ((pollfd*)b)->fd;
+ }
+#endif
+
+public:
+#ifdef HAVE_POLL
+ Select()
+ : slct_time(0), slct_count(0), slct_poll(*getDefaultMemoryPool())
+ { }
+#else
+ Select()
+ : slct_time(0), slct_count(0), slct_width(0)
+ {
+ memset(&slct_fdset, 0, sizeof slct_fdset);
+ }
+#endif
+
+ enum HandleState {SEL_BAD, SEL_DISCONNECTED, SEL_NO_DATA, SEL_READY};
+
+ HandleState ok(const rem_port* port)
+ {
+ SOCKET n = port->port_handle;
+#if defined(WIN_NT)
+ return FD_ISSET(n, &slct_fdset) ? SEL_READY : SEL_NO_DATA;
+#elif defined(HAVE_POLL)
+ const pollfd* pf = getPollFd(n);
+ if (pf)
+ {
+ return pf->events & SEL_CHECK_MASK ? SEL_READY : SEL_NO_DATA;
+ }
+ return (n < 0) ? (port->port_flags & PORT_disconnect ? SEL_DISCONNECTED : SEL_BAD) : SEL_NO_DATA;
+#else
+ if (n < 0 || n >= FD_SETSIZE)
+ {
+ return port->port_flags & PORT_disconnect ? SEL_DISCONNECTED : SEL_BAD;
+ }
+ return (n < slct_width && FD_ISSET(n, &slct_fdset)) ? SEL_READY : SEL_NO_DATA;
+#endif
+ }
+
+ void unset(SOCKET handle)
+ {
+#if defined(HAVE_POLL)
+ pollfd* pf = getPollFd(handle);
+ if (pf)
+ {
+ pf->events = 0;
+ }
+#else
+ FD_CLR(handle, &slct_fdset);
+ --slct_count;
+#endif
+ }
+
+ void set(SOCKET handle)
+ {
+#ifdef HAVE_POLL
+ pollfd* pf = getPollFd(handle);
+ if (pf)
+ {
+ pf->events = SEL_INIT_EVENTS;
+ return;
+ }
+ pollfd f;
+ f.fd = handle;
+ f.events = SEL_INIT_EVENTS;
+ slct_poll.push(f);
+#else
+ FD_SET(handle, &slct_fdset);
+#ifdef WIN_NT
+ ++slct_width;
+#else
+ slct_width = MAX(slct_width, handle + 1);
+#endif // WIN_NT
+#endif // HAVE_POLL
+ }
+
+ void clear()
+ {
+ slct_count = 0;
+#if defined(HAVE_POLL)
+ slct_poll.clear();
+#else
+ slct_width = 0;
+ FD_ZERO(&slct_fdset);
+#endif
+ }
+
+ int select(timeval* timeout)
+ {
+ bool hasRequest = false;
+
+#ifdef HAVE_POLL
+ pollfd* const end = slct_poll.end();
+ for (pollfd* pf = slct_poll.begin(); pf < end; ++pf)
+ {
+ pf->revents = pf->events;
+ if (pf->events & SEL_CHECK_MASK)
+ {
+ hasRequest = true;
+ }
+ }
+
+ if (!hasRequest)
+ {
+ errno = NOTASOCKET;
+ return -1;
+ }
+
+ int milliseconds = timeout ? timeout->tv_sec * 1000 + timeout->tv_usec / 1000 : -1;
+ slct_count = ::poll(slct_poll.begin(), slct_poll.getCount(), milliseconds);
+
+ for (pollfd* pf = slct_poll.begin(); pf < end; ++pf)
+ {
+ pf->events = pf->revents;
+ }
+#else
+#ifdef WIN_NT
+ slct_count = ::select(FD_SETSIZE, &slct_fdset, NULL, NULL, timeout);
+#else
+
+
+ slct_count = ::select(slct_width, &slct_fdset, NULL, NULL, timeout);
+#endif // WIN_NT
+#endif // HAVE_POLL
+
+
+ return slct_count;
+ }
+
+ int getCount()
+ {
+ return slct_count;
+ }
+
+ time_t slct_time;
+
+private:
+ int slct_count;
+#ifdef HAVE_POLL
+ Firebird::HalfStaticArray<pollfd, 8> slct_poll;
+#else
int slct_width;
- int slct_count;
- time_t slct_time;
fd_set slct_fdset;
+#endif
};
static bool accept_connection(rem_port*, const P_CNCT*);
@@ -309,9 +476,9 @@
static rem_port* receive(rem_port*, PACKET *);
static rem_port* select_accept(rem_port*);
-static void select_port(rem_port*, slct_t*, RemPortPtr&);
+static void select_port(rem_port*, Select*, RemPortPtr&);
static bool select_multi(rem_port*, UCHAR* buffer, SSHORT bufsize, SSHORT* length, RemPortPtr&);
-static bool select_wait(rem_port*, slct_t*);
+static bool select_wait(rem_port*, Select*);
static int send_full(rem_port*, PACKET *);
static int send_partial(rem_port*, PACKET *);
@@ -365,7 +532,7 @@
static Firebird::GlobalPtr<Firebird::Mutex> init_mutex;
static volatile bool INET_initialized = false;
static volatile bool INET_shutting_down = false;
-static slct_t INET_select = { 0, 0, 0 };
+static Select INET_select;
static rem_port* inet_async_receive = NULL;
@@ -759,7 +926,7 @@
}
if (! setNoNagleOption(port))
- {
+ {
inet_error(true, port, "setsockopt TCP_NODELAY", isc_net_connect_listen_err, INET_ERRNO);
}
}
@@ -1168,20 +1335,15 @@
timeout.tv_sec = port->port_connect_timeout;
timeout.tv_usec = 0;
- fd_set slct_fdset;
- FD_ZERO(&slct_fdset);
- FD_SET(port->port_channel, &slct_fdset);
+ Select slct;
+ slct.set(port->port_channel);
int inetErrNo = 0;
while (true)
{
- const int count =
-#ifdef WIN_NT
- select(FD_SETSIZE, &slct_fdset, NULL, NULL, &timeout);
-#else
- select(port->port_channel + 1, &slct_fdset, NULL, NULL, &timeout);
-#endif
+ slct.select(&timeout);
+ const int count = slct.getCount();
inetErrNo = INET_ERRNO;
if (count != -1 || !INTERRUPT_ERROR(inetErrNo))
@@ -1461,10 +1623,10 @@
#ifdef DEBUG
if (INET_trace & TRACE_summary)
{
- fprintf(stdout, "INET_count_send = %lu packets\n", INET_count_send);
- fprintf(stdout, "INET_bytes_send = %lu bytes\n", INET_bytes_send);
- fprintf(stdout, "INET_count_recv = %lu packets\n", INET_count_recv);
- fprintf(stdout, "INET_bytes_recv = %lu bytes\n", INET_bytes_recv);
+ fprintf(stdout, "INET_count_send = %u packets\n", INET_count_send);
+ fprintf(stdout, "INET_bytes_send = %u bytes\n", INET_bytes_send);
+ fprintf(stdout, "INET_count_recv = %u packets\n", INET_count_recv);
+ fprintf(stdout, "INET_bytes_recv = %u bytes\n", INET_bytes_recv);
fflush(stdout);
}
#endif
@@ -1826,7 +1988,7 @@
op_rec_count++;
if (INET_trace & TRACE_operations)
{
- fprintf(stdout, "%04lu: OP Recd %5lu opcode %d\n",
+ fprintf(stdout, "%04u: OP Recd %5u opcode %d\n",
inet_debug_timer(),
op_rec_count, packet->p_operation);
fflush(stdout);
@@ -1949,7 +2111,7 @@
return 0;
}
-static void select_port(rem_port* main_port, slct_t* selct, RemPortPtr& port)
+static void select_port(rem_port* main_port, Select* selct, RemPortPtr& port)
{
/**************************************
*
@@ -1971,33 +2133,36 @@
for (port = main_port; port; port = port->port_next)
{
- const SOCKET n = port->port_handle;
-#ifdef WIN_NT
- const int ok = FD_ISSET(n, &selct->slct_fdset);
-#else
- if (n < 0 || n >= FD_SETSIZE)
+ Select::HandleState result = selct->ok(port);
+ selct->unset(port->port_handle);
+ switch (result)
{
- if (port->port_flags & PORT_disconnect)
+ case Select::SEL_BAD:
+ if (port->port_state == rem_port::BROKEN)
+ {
continue;
+ }
+ return;
+ case Select::SEL_DISCONNECTED:
+ continue;
+
+ case Select::SEL_READY:
+ port->port_dummy_timeout = port->port_dummy_packet_interval;
return;
+
+ default:
+ break;
}
- const int ok = n < selct->slct_width && FD_ISSET(n, &selct->slct_fdset);
-#endif
- if (ok)
+
+ if (port->port_dummy_timeout < 0)
{
- port->port_dummy_timeout = port->port_dummy_packet_interval;
- FD_CLR(n, &selct->slct_fdset);
- --selct->slct_count;
return;
}
- if (port->port_dummy_timeout < 0) {
- return;
- }
}
}
-static bool select_wait( rem_port* main_port, slct_t* selct)
+static bool select_wait( rem_port* main_port, Select* selct)
{
/**************************************
*
@@ -2016,8 +2181,7 @@
for (;;)
{
- selct->slct_count = selct->slct_width = 0;
- FD_ZERO(&selct->slct_fdset);
+ selct->clear();
bool found = false;
// Use the time interval between select() calls to expire
@@ -2075,16 +2239,10 @@
port->port_handle);
// this will lead to receive() which will break bad connection
- selct->slct_count = selct->slct_width = 0;
- FD_ZERO(&selct->slct_fdset);
+ selct->clear();
if (!badSocket)
{
- FD_SET(port->port_handle, &selct->slct_fdset);
-#ifdef WIN_NT
- ++selct->slct_width;
-#else
- selct->slct_width = port->port_handle + 1;
-#endif
+ selct->set(port->port_handle);
}
return true;
}
@@ -2094,12 +2252,7 @@
// if process is shuting down - don't listen on main port
if (!INET_shutting_down || port != main_port)
{
- FD_SET(port->port_handle, &selct->slct_fdset);
-#ifdef WIN_NT
- ++selct->slct_width;
-#else
- selct->slct_width = MAX(selct->slct_width, port->port_handle + 1);
-#endif
+ selct->set(port->port_handle);
found = true;
}
}
@@ -2130,30 +2283,26 @@
timeout.tv_sec = SELECT_TIMEOUT;
timeout.tv_usec = 0;
-#ifdef WIN_NT
- selct->slct_count = select(FD_SETSIZE, &selct->slct_fdset, NULL, NULL, &timeout);
-#else
- selct->slct_count = select(selct->slct_width, &selct->slct_fdset, NULL, NULL, &timeout);
-#endif
+ selct->select(&timeout);
const int inetErrNo = INET_ERRNO;
//if (INET_shutting_down) {
// return false;
//}
- if (selct->slct_count != -1)
+ if (selct->getCount() != -1)
{
// if selct->slct_count is zero it means that we timed out of
// select with nothing to read or accept, so clear the fd_set
// bit as this value is undefined on some platforms (eg. HP-UX),
// when the select call times out. Once these bits are cleared
// they can be used in select_port()
- if (selct->slct_count == 0)
+ if (selct->getCount() == 0)
{
Firebird::MutexLockGuard guard(port_mutex);
for (rem_port* port = main_port; port; port = port->port_next)
{
- FD_CLR(port->port_handle, &selct->slct_fdset);
+ selct->unset(port->port_handle);
}
}
return true;
@@ -2197,7 +2346,7 @@
op_sent_count++;
if (INET_trace & TRACE_operations)
{
- fprintf(stdout, "%05lu: OP Sent %5lu opcode %d\n", inet_debug_timer(),
+ fprintf(stdout, "%05u: OP Sent %5u opcode %d\n", inet_debug_timer(),
op_sent_count, packet->p_operation);
fflush(stdout);
}
@@ -2226,7 +2375,7 @@
op_sentp_count++;
if (INET_trace & TRACE_operations)
{
- fprintf(stdout, "%05lu: OP Sent %5lu opcode %d (partial)\n", inet_debug_timer(),
+ fprintf(stdout, "%05u: OP Sent %5u opcode %d (partial)\n", inet_debug_timer(),
op_sentp_count, packet->p_operation);
fflush(stdout);
}
@@ -2802,7 +2951,7 @@
for (int l = length; l > 0; --l)
sum += *packet++;
- fprintf(stdout, "%05lu: PKT %s\t(%lu): length = %4d, checksum = %d\n",
+ fprintf(stdout, "%05u: PKT %s\t(%u): length = %4d, checksum = %d\n",
inet_debug_timer(), string, counter, length, sum);
fflush(stdout);
}
@@ -2875,18 +3024,14 @@
if ( !(port->port_flags & PORT_async) )
{
- fd_set slct_fdset;
- FD_ZERO(&slct_fdset);
- FD_SET(ph, &slct_fdset);
+ Select slct;
+ slct.set(ph);
int slct_count;
for (;;)
{
-#if (defined WIN_NT)
- slct_count = select(FD_SETSIZE, &slct_fdset, NULL, NULL, time_ptr);
-#else
- slct_count = select(port->port_handle + 1, &slct_fdset, NULL, NULL, time_ptr);
-#endif
+ slct.select(time_ptr);
+ slct_count = slct.getCount();
inetErrNo = INET_ERRNO;
// restore original timeout value FSG 3 MAY 2001
@@ -2916,7 +3061,7 @@
#ifdef DEBUG
if (INET_trace & TRACE_operations)
{
- fprintf(stdout, "%05lu: OP Sent: op_dummy\n", inet_debug_timer());
+ fprintf(stdout, "%05u: OP Sent: op_dummy\n", inet_debug_timer());
fflush(stdout);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-02-01 03:16:48
|
Revision: 52245
http://firebird.svn.sourceforge.net/firebird/?rev=52245&view=rev
Author: firebirds
Date: 2011-02-01 03:16:41 +0000 (Tue, 01 Feb 2011)
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 2011-02-01 01:27:51 UTC (rev 52244)
+++ firebird/trunk/ChangeLog 2011-02-01 03:16:41 UTC (rev 52245)
@@ -1,3 +1,33 @@
+ 2011-02-01 01:27 asfernandes
+ M src/dsql/pass1.cpp
+Fixed the problem reported privately by Dmitry.
+
+ 2011-01-31 14:47 asfernandes
+ M src/dsql/BlrWriter.cpp
+ M src/dsql/BlrWriter.h
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/ddl.cpp
+ M src/dsql/dsql.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/make_proto.h
+ M src/dsql/pass1.cpp
+ M src/include/fb_blk.h
+Another small refactor on variables in DSQL.
+
+ 2011-01-31 14:05 alexpeshkoff
+ M src/common/classes/RefCounted.h
+Fixed order of function calls, thanks to Dmitry Kovalenko
+
+ 2011-01-31 10:40 hvlad
+ M src/jrd/dfw.epp
+Fixed bug CORE-3095 : Client receive event's with count equal to 1 despite of how many times EVENT was POSTed in same transaction
+
2011-01-31 00:13 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/DsqlCompilerScratch.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-02-01 01:27:51 UTC (rev 52244)
+++ firebird/trunk/src/jrd/build_no.h 2011-02-01 03:16:41 UTC (rev 52245)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29017
+ FORMAL BUILD NUMBER:29037
*/
-#define PRODUCT_VER_STRING "3.0.0.29017"
-#define FILE_VER_STRING "WI-T3.0.0.29017"
-#define LICENSE_VER_STRING "WI-T3.0.0.29017"
-#define FILE_VER_NUMBER 3, 0, 0, 29017
+#define PRODUCT_VER_STRING "3.0.0.29037"
+#define FILE_VER_STRING "WI-T3.0.0.29037"
+#define LICENSE_VER_STRING "WI-T3.0.0.29037"
+#define FILE_VER_NUMBER 3, 0, 0, 29037
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29017"
+#define FB_BUILD_NO "29037"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-01 01:27:51 UTC (rev 52244)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-01 03:16:41 UTC (rev 52245)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29017
+BuildNum=29037
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...> - 2011-02-02 03:16:05
|
Revision: 52255
http://firebird.svn.sourceforge.net/firebird/?rev=52255&view=rev
Author: firebirds
Date: 2011-02-02 03:15:58 +0000 (Wed, 02 Feb 2011)
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 2011-02-02 00:57:59 UTC (rev 52254)
+++ firebird/trunk/ChangeLog 2011-02-02 03:15:58 UTC (rev 52255)
@@ -1,3 +1,23 @@
+ 2011-02-02 00:57 asfernandes
+ M src/lock/lock.cpp
+Correction
+
+ 2011-02-02 00:54 asfernandes
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+Misc
+
+ 2011-02-01 15:19 hvlad
+ M src/lock/lock.cpp
+ M src/lock/lock_proto.h
+Move VALIDATE_LOCK_TABLE from lock.h into lock.cpp : at allows to rebuild just lock.cpp if some need to disable validation of lock table in DEBUG build or enable validation in RELEASE build.
+
+ 2011-02-01 13:11 alexpeshkoff
+ M src/include/Interface.h
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+MT safety and exceptions processing in upgradeInterface
+
2011-02-01 01:27 asfernandes
M src/dsql/pass1.cpp
Fixed the problem reported privately by Dmitry.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2011-02-02 00:57:59 UTC (rev 52254)
+++ firebird/trunk/src/jrd/build_no.h 2011-02-02 03:15:58 UTC (rev 52255)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:29037
+ FORMAL BUILD NUMBER:29041
*/
-#define PRODUCT_VER_STRING "3.0.0.29037"
-#define FILE_VER_STRING "WI-T3.0.0.29037"
-#define LICENSE_VER_STRING "WI-T3.0.0.29037"
-#define FILE_VER_NUMBER 3, 0, 0, 29037
+#define PRODUCT_VER_STRING "3.0.0.29041"
+#define FILE_VER_STRING "WI-T3.0.0.29041"
+#define LICENSE_VER_STRING "WI-T3.0.0.29041"
+#define FILE_VER_NUMBER 3, 0, 0, 29041
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "29037"
+#define FB_BUILD_NO "29041"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2011-02-02 00:57:59 UTC (rev 52254)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2011-02-02 03:15:58 UTC (rev 52255)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=29037
+BuildNum=29041
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