Menu
▾
▴
firebird-checkins
|
From: <pau...@us...> - 2010-10-05 12:43:30
|
Revision: 51629
http://firebird.svn.sourceforge.net/firebird/?rev=51629&view=rev
Author: paulbeach
Date: 2010-10-05 12:43:24 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Fix for UDFs on Darwin
Modified Paths:
--------------
firebird/trunk/builds/posix/darwin.defaults
firebird/trunk/src/extlib/ib_udf.cpp
Modified: firebird/trunk/builds/posix/darwin.defaults
===================================================================
--- firebird/trunk/builds/posix/darwin.defaults 2010-10-05 12:17:50 UTC (rev 51628)
+++ firebird/trunk/builds/posix/darwin.defaults 2010-10-05 12:43:24 UTC (rev 51629)
@@ -40,7 +40,7 @@
# Per-library link rules
LINK_UDF = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS) -L$(LIB)
-LINK_UDF_LIBS = -lm -lib_util $(THR_FLAGS) $(THR_LIBS)
+LINK_UDF_LIBS = -lm $(THR_FLAGS) $(THR_LIBS)
LINK_IB_UTIL = $(LIB_LINK) $(LINK_IBUTIL_SYMBOLS) $(LIB_LINK_OPTIONS)\
$(LIB_LINK_RPATH) $(LIB_LINK_SONAME)
Modified: firebird/trunk/src/extlib/ib_udf.cpp
===================================================================
--- firebird/trunk/src/extlib/ib_udf.cpp 2010-10-05 12:17:50 UTC (rev 51628)
+++ firebird/trunk/src/extlib/ib_udf.cpp 2010-10-05 12:43:24 UTC (rev 51629)
@@ -58,6 +58,8 @@
#endif // SOLARIS
#endif //__ICC
+typedef char* pChar;
+
double EXPORT IB_UDF_abs( double *a)
{
return (*a < 0.0) ? -*a : *a;
@@ -68,7 +70,7 @@
return (acos(*a));
}
-char *EXPORT IB_UDF_ascii_char( ISC_LONG *a)
+pChar EXPORT IB_UDF_ascii_char( ISC_LONG *a)
{
if (!a)
return 0;
@@ -185,7 +187,7 @@
return (log10(*a));
}
-char *EXPORT IB_UDF_lower(const char *s)
+pChar EXPORT IB_UDF_lower(const char *s)
{
if (!s)
return 0;
@@ -205,7 +207,7 @@
return buf;
}
-char *EXPORT IB_UDF_lpad( const char *s, ISC_LONG *a, const char *c)
+pChar EXPORT IB_UDF_lpad( const char *s, ISC_LONG *a, const char *c)
{
if (!s || !c)
return 0;
@@ -241,7 +243,7 @@
return NULL;
}
-char *EXPORT IB_UDF_ltrim( const char *s)
+pChar EXPORT IB_UDF_ltrim( const char *s)
{
if (!s)
return 0;
@@ -293,7 +295,7 @@
return ((float) rand() / (float) RAND_MAX);
}
-char *EXPORT IB_UDF_rpad( const char *s, ISC_LONG *a, const char *c)
+pChar EXPORT IB_UDF_rpad( const char *s, ISC_LONG *a, const char *c)
{
if (!s || !c)
return 0;
@@ -327,7 +329,7 @@
return NULL;
}
-char *EXPORT IB_UDF_rtrim( const char *s)
+pChar EXPORT IB_UDF_rtrim( const char *s)
{
if (!s)
return 0;
@@ -369,7 +371,7 @@
return (sqrt(*a));
}
-char* EXPORT IB_UDF_substr(const char* s, ISC_SHORT* m, ISC_SHORT* n)
+pChar EXPORT IB_UDF_substr(const char* s, ISC_SHORT* m, ISC_SHORT* n)
{
if (!s) {
return 0;
@@ -403,7 +405,7 @@
return buf;
}
-char* EXPORT IB_UDF_substrlen(const char* s, ISC_SHORT* m, ISC_SHORT* n)
+pChar EXPORT IB_UDF_substrlen(const char* s, ISC_SHORT* m, ISC_SHORT* n)
{
/* Created by Claudio Valderrama for the Firebird project,
2001.04.17 We don't want to return NULL when params are wrong
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-06 03:14:34
|
Revision: 51632
http://firebird.svn.sourceforge.net/firebird/?rev=51632&view=rev
Author: firebirds
Date: 2010-10-06 03:14:27 +0000 (Wed, 06 Oct 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-10-05 13:13:24 UTC (rev 51631)
+++ firebird/trunk/ChangeLog 2010-10-06 03:14:27 UTC (rev 51632)
@@ -1,3 +1,12 @@
+ 2010-10-05 13:12 alexpeshkoff
+ M doc/README.UserSql
+Make it better understandable to people - thanks to Claudio
+
+ 2010-10-05 12:43 paulbeach
+ M builds/posix/darwin.defaults
+ M src/extlib/ib_udf.cpp
+Fix for UDFs on Darwin
+
2010-10-04 13:21 paulbeach
M src/extlib/fbudf/fbudf.h
M src/extlib/ib_udf.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-05 13:13:24 UTC (rev 51631)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-06 03:14:27 UTC (rev 51632)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28748
+ FORMAL BUILD NUMBER:28750
*/
-#define PRODUCT_VER_STRING "3.0.0.28748"
-#define FILE_VER_STRING "WI-T3.0.0.28748"
-#define LICENSE_VER_STRING "WI-T3.0.0.28748"
-#define FILE_VER_NUMBER 3, 0, 0, 28748
+#define PRODUCT_VER_STRING "3.0.0.28750"
+#define FILE_VER_STRING "WI-T3.0.0.28750"
+#define LICENSE_VER_STRING "WI-T3.0.0.28750"
+#define FILE_VER_NUMBER 3, 0, 0, 28750
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28748"
+#define FB_BUILD_NO "28750"
#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-10-05 13:13:24 UTC (rev 51631)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-06 03:14:27 UTC (rev 51632)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28748
+BuildNum=28750
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-07 03:13:25
|
Revision: 51636
http://firebird.svn.sourceforge.net/firebird/?rev=51636&view=rev
Author: firebirds
Date: 2010-10-07 03:13:17 +0000 (Thu, 07 Oct 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-10-06 15:39:08 UTC (rev 51635)
+++ firebird/trunk/ChangeLog 2010-10-07 03:13:17 UTC (rev 51636)
@@ -1,3 +1,7 @@
+ 2010-10-06 15:25 asfernandes
+ M src/dsql/pass1.cpp
+Fixed CORE-3164 - Parameterized requests involving blob fields fails when connected using charset UTF8
+
2010-10-05 13:12 alexpeshkoff
M doc/README.UserSql
Make it better understandable to people - thanks to Claudio
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-06 15:39:08 UTC (rev 51635)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-07 03:13:17 UTC (rev 51636)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28750
+ FORMAL BUILD NUMBER:28751
*/
-#define PRODUCT_VER_STRING "3.0.0.28750"
-#define FILE_VER_STRING "WI-T3.0.0.28750"
-#define LICENSE_VER_STRING "WI-T3.0.0.28750"
-#define FILE_VER_NUMBER 3, 0, 0, 28750
+#define PRODUCT_VER_STRING "3.0.0.28751"
+#define FILE_VER_STRING "WI-T3.0.0.28751"
+#define LICENSE_VER_STRING "WI-T3.0.0.28751"
+#define FILE_VER_NUMBER 3, 0, 0, 28751
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28750"
+#define FB_BUILD_NO "28751"
#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-10-06 15:39:08 UTC (rev 51635)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-07 03:13:17 UTC (rev 51636)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28750
+BuildNum=28751
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-08 03:14:04
|
Revision: 51640
http://firebird.svn.sourceforge.net/firebird/?rev=51640&view=rev
Author: firebirds
Date: 2010-10-08 03:13:58 +0000 (Fri, 08 Oct 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-10-07 16:14:31 UTC (rev 51639)
+++ firebird/trunk/ChangeLog 2010-10-08 03:13:58 UTC (rev 51640)
@@ -1,3 +1,7 @@
+ 2010-10-07 16:10 hvlad
+ M src/utilities/ntrace/TracePluginImpl.cpp
+Fixed bug CORE-3168: exclude_filter doesn't work for <services></section> section of the Trace facility
+
2010-10-06 15:25 asfernandes
M src/dsql/pass1.cpp
Fixed CORE-3164 - Parameterized requests involving blob fields fails when connected using charset UTF8
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-07 16:14:31 UTC (rev 51639)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-08 03:13:58 UTC (rev 51640)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28751
+ FORMAL BUILD NUMBER:28752
*/
-#define PRODUCT_VER_STRING "3.0.0.28751"
-#define FILE_VER_STRING "WI-T3.0.0.28751"
-#define LICENSE_VER_STRING "WI-T3.0.0.28751"
-#define FILE_VER_NUMBER 3, 0, 0, 28751
+#define PRODUCT_VER_STRING "3.0.0.28752"
+#define FILE_VER_STRING "WI-T3.0.0.28752"
+#define LICENSE_VER_STRING "WI-T3.0.0.28752"
+#define FILE_VER_NUMBER 3, 0, 0, 28752
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28751"
+#define FB_BUILD_NO "28752"
#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-10-07 16:14:31 UTC (rev 51639)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-08 03:13:58 UTC (rev 51640)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28751
+BuildNum=28752
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-09 03:13:05
|
Revision: 51648
http://firebird.svn.sourceforge.net/firebird/?rev=51648&view=rev
Author: firebirds
Date: 2010-10-09 03:12:58 +0000 (Sat, 09 Oct 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-10-09 01:57:37 UTC (rev 51647)
+++ firebird/trunk/ChangeLog 2010-10-09 03:12:58 UTC (rev 51648)
@@ -1,3 +1,56 @@
+ 2010-10-09 01:57 asfernandes
+ M src/dsql/AggNodes.cpp
+ M src/dsql/AggNodes.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Parser.h
+ M src/dsql/Visitors.h
+ M src/dsql/WinNodes.cpp
+ M src/dsql/WinNodes.h
+ M src/dsql/dsql.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/Optimizer.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/cmp_proto.h
+ M src/jrd/evl.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/exe.h
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/misc/blrtable.cpp
+Refactor parameters and GEN_ID.
+
+ 2010-10-09 01:50 asfernandes
+ M src/extlib/ib_udf.h
+ M src/jrd/event.cpp
+Misc
+
+ 2010-10-08 11:57 hvlad
+ M src/jrd/dfw.epp
+ M src/jrd/event.cpp
+ M src/jrd/event_proto.h
+ M src/jrd/jrd.cpp
+Fixed bug CORE-3170 : Engine could enter infinite loop if EVENT's are posted but no subscribers exists
+
+ 2010-10-08 09:40 dimitr
+ M src/jrd/Function.epp
+ M src/jrd/Function.h
+ M src/jrd/Routine.h
+Fixed problems with recursive PSQL functions. Minor refactoring.
+
+ 2010-10-08 09:39 dimitr
+ M src/dsql/ExprNodes.cpp
+Fixed problems with recursive PSQL functions. Minor refactoring.
+
2010-10-07 16:10 hvlad
M src/utilities/ntrace/TracePluginImpl.cpp
Fixed bug CORE-3168: exclude_filter doesn't work for <services></section> section of the Trace facility
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-09 01:57:37 UTC (rev 51647)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-09 03:12:58 UTC (rev 51648)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28752
+ FORMAL BUILD NUMBER:28757
*/
-#define PRODUCT_VER_STRING "3.0.0.28752"
-#define FILE_VER_STRING "WI-T3.0.0.28752"
-#define LICENSE_VER_STRING "WI-T3.0.0.28752"
-#define FILE_VER_NUMBER 3, 0, 0, 28752
+#define PRODUCT_VER_STRING "3.0.0.28757"
+#define FILE_VER_STRING "WI-T3.0.0.28757"
+#define LICENSE_VER_STRING "WI-T3.0.0.28757"
+#define FILE_VER_NUMBER 3, 0, 0, 28757
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28752"
+#define FB_BUILD_NO "28757"
#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-10-09 01:57:37 UTC (rev 51647)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-09 03:12:58 UTC (rev 51648)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28752
+BuildNum=28757
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-10 03:13:07
|
Revision: 51651
http://firebird.svn.sourceforge.net/firebird/?rev=51651&view=rev
Author: firebirds
Date: 2010-10-10 03:13:00 +0000 (Sun, 10 Oct 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-10-09 18:39:45 UTC (rev 51650)
+++ firebird/trunk/ChangeLog 2010-10-10 03:13:00 UTC (rev 51651)
@@ -1,3 +1,24 @@
+ 2010-10-09 18:39 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/exe.h
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/misc/blrtable.cpp
+1) Refactored LOWER, UPPER and TRIM.
+2) Fixed CORE-3174 - Expression index with TRIM may lead to incorrect indexed lookup
+
2010-10-09 01:57 asfernandes
M src/dsql/AggNodes.cpp
M src/dsql/AggNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-09 18:39:45 UTC (rev 51650)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-10 03:13:00 UTC (rev 51651)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28757
+ FORMAL BUILD NUMBER:28758
*/
-#define PRODUCT_VER_STRING "3.0.0.28757"
-#define FILE_VER_STRING "WI-T3.0.0.28757"
-#define LICENSE_VER_STRING "WI-T3.0.0.28757"
-#define FILE_VER_NUMBER 3, 0, 0, 28757
+#define PRODUCT_VER_STRING "3.0.0.28758"
+#define FILE_VER_STRING "WI-T3.0.0.28758"
+#define LICENSE_VER_STRING "WI-T3.0.0.28758"
+#define FILE_VER_NUMBER 3, 0, 0, 28758
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28757"
+#define FB_BUILD_NO "28758"
#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-10-09 18:39:45 UTC (rev 51650)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-10 03:13:00 UTC (rev 51651)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28757
+BuildNum=28758
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2010-10-12 08:03:11
|
Revision: 51652
http://firebird.svn.sourceforge.net/firebird/?rev=51652&view=rev
Author: alexpeshkoff
Date: 2010-10-12 08:02:57 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
OSRI and new posix build
Modified Paths:
--------------
firebird/trunk/binreloc.m4
firebird/trunk/builds/posix/Makefile.in.examples
firebird/trunk/builds/posix/Makefile.in.plugins_examples
firebird/trunk/builds/posix/firebird.vers
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/posix/make.rules
firebird/trunk/builds/posix/make.shared.targets
firebird/trunk/builds/posix/make.shared.variables
firebird/trunk/configure.in
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/alice/alice.cpp
firebird/trunk/src/alice/alice.h
firebird/trunk/src/alice/alice_meta.epp
firebird/trunk/src/alice/alice_proto.h
firebird/trunk/src/alice/exe.cpp
firebird/trunk/src/alice/tdr.cpp
firebird/trunk/src/burp/backup.epp
firebird/trunk/src/burp/burp.cpp
firebird/trunk/src/burp/burp.h
firebird/trunk/src/burp/burp_proto.h
firebird/trunk/src/burp/canonical.cpp
firebird/trunk/src/burp/mvol.cpp
firebird/trunk/src/burp/restore.epp
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusHolder.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/classes/ClumpletReader.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/Interface.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/classes/TempFile.cpp
firebird/trunk/src/common/classes/UserBlob.cpp
firebird/trunk/src/common/classes/alloc.cpp
firebird/trunk/src/common/classes/timestamp.h
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/config/config_file.h
firebird/trunk/src/common/config/dir_list.cpp
firebird/trunk/src/common/cvt.cpp
firebird/trunk/src/common/fb_exception.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/common/utils_proto.h
firebird/trunk/src/dsql/BoolNodes.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/Parser.h
firebird/trunk/src/dsql/btyacc_fb.ske
firebird/trunk/src/dsql/ddl.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/dsql/dsql_proto.h
firebird/trunk/src/dsql/errd.cpp
firebird/trunk/src/dsql/gen.cpp
firebird/trunk/src/dsql/hsh.cpp
firebird/trunk/src/dsql/make.cpp
firebird/trunk/src/dsql/metd.epp
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/dsql/pass1.cpp
firebird/trunk/src/dsql/utld.cpp
firebird/trunk/src/dsql/utld_proto.h
firebird/trunk/src/gpre/c_cxx.cpp
firebird/trunk/src/gpre/cme.cpp
firebird/trunk/src/gpre/gpre.h
firebird/trunk/src/gpre/int_cxx.cpp
firebird/trunk/src/gpre/movg.cpp
firebird/trunk/src/gpre/msc.cpp
firebird/trunk/src/include/fb_api_proto.h
firebird/trunk/src/include/fb_blk.h
firebird/trunk/src/include/fb_exception.h
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/intl/lc_ascii.cpp
firebird/trunk/src/intl/lc_icu.cpp
firebird/trunk/src/intl/lc_iso8859_1.cpp
firebird/trunk/src/intl/lc_narrow.cpp
firebird/trunk/src/intl/ld.cpp
firebird/trunk/src/intl/ldcommon.h
firebird/trunk/src/iscguard/cntl_guard.cpp
firebird/trunk/src/iscguard/cntlg_proto.h
firebird/trunk/src/iscguard/iscguard.cpp
firebird/trunk/src/isql/InputDevices.h
firebird/trunk/src/isql/extract.epp
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/iutils.cpp
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/Collation.cpp
firebird/trunk/src/jrd/Collation.h
firebird/trunk/src/jrd/DataTypeUtil.cpp
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/Database.h
firebird/trunk/src/jrd/DatabaseSnapshot.cpp
firebird/trunk/src/jrd/DatabaseSnapshot.h
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/ExtEngineManager.h
firebird/trunk/src/jrd/Function.epp
firebird/trunk/src/jrd/Function.h
firebird/trunk/src/jrd/GlobalRWLock.cpp
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/JrdStatement.cpp
firebird/trunk/src/jrd/JrdStatement.h
firebird/trunk/src/jrd/Optimizer.cpp
firebird/trunk/src/jrd/Optimizer.h
firebird/trunk/src/jrd/PluginManager.cpp
firebird/trunk/src/jrd/PluginManager.h
firebird/trunk/src/jrd/PreparedStatement.h
firebird/trunk/src/jrd/RandomGenerator.cpp
firebird/trunk/src/jrd/Relation.h
firebird/trunk/src/jrd/ResultSet.h
firebird/trunk/src/jrd/Routine.h
firebird/trunk/src/jrd/SimilarToMatcher.h
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/SysFunction.h
firebird/trunk/src/jrd/TempSpace.cpp
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/ValueImpl.h
firebird/trunk/src/jrd/ValuesImpl.cpp
firebird/trunk/src/jrd/ValuesImpl.h
firebird/trunk/src/jrd/VirtualTable.cpp
firebird/trunk/src/jrd/align.h
firebird/trunk/src/jrd/blb.cpp
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/blob_filter.cpp
firebird/trunk/src/jrd/btr.cpp
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/jrd/builtin.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/cmp.cpp
firebird/trunk/src/jrd/cmp_proto.h
firebird/trunk/src/jrd/cvt.cpp
firebird/trunk/src/jrd/cvt2.cpp
firebird/trunk/src/jrd/dfw.epp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/dyn.epp
firebird/trunk/src/jrd/dyn.h
firebird/trunk/src/jrd/dyn_def.epp
firebird/trunk/src/jrd/dyn_del.epp
firebird/trunk/src/jrd/dyn_mod.epp
firebird/trunk/src/jrd/dyn_util.epp
firebird/trunk/src/jrd/err.cpp
firebird/trunk/src/jrd/event.cpp
firebird/trunk/src/jrd/event.h
firebird/trunk/src/jrd/event_proto.h
firebird/trunk/src/jrd/evl.cpp
firebird/trunk/src/jrd/evl_proto.h
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/exe.h
firebird/trunk/src/jrd/execute_statement.cpp
firebird/trunk/src/jrd/ext.cpp
firebird/trunk/src/jrd/extds/ExtDS.cpp
firebird/trunk/src/jrd/extds/ExtDS.h
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/extds/InternalDS.h
firebird/trunk/src/jrd/extds/IscDS.cpp
firebird/trunk/src/jrd/extds/IscDS.h
firebird/trunk/src/jrd/filters.cpp
firebird/trunk/src/jrd/flu.cpp
firebird/trunk/src/jrd/flu.h
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/gdsassert.h
firebird/trunk/src/jrd/grant.epp
firebird/trunk/src/jrd/ibase.h
firebird/trunk/src/jrd/idx.cpp
firebird/trunk/src/jrd/inf.cpp
firebird/trunk/src/jrd/ini.epp
firebird/trunk/src/jrd/ini.h
firebird/trunk/src/jrd/intl.cpp
firebird/trunk/src/jrd/intl.h
firebird/trunk/src/jrd/intl_builtin.cpp
firebird/trunk/src/jrd/intl_classes.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/jrd_proto.h
firebird/trunk/src/jrd/lck.cpp
firebird/trunk/src/jrd/lls.h
firebird/trunk/src/jrd/met.epp
firebird/trunk/src/jrd/met_proto.h
firebird/trunk/src/jrd/mov_proto.h
firebird/trunk/src/jrd/nbak.cpp
firebird/trunk/src/jrd/nod.h
firebird/trunk/src/jrd/opt.cpp
firebird/trunk/src/jrd/opt_proto.h
firebird/trunk/src/jrd/os/posix/unix.cpp
firebird/trunk/src/jrd/os/thd_priority.h
firebird/trunk/src/jrd/os/win32/thd_priority.cpp
firebird/trunk/src/jrd/os/win32/winnt.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/jrd/par.cpp
firebird/trunk/src/jrd/par_proto.h
firebird/trunk/src/jrd/pcmet.epp
firebird/trunk/src/jrd/recsrc/AggregatedStream.cpp
firebird/trunk/src/jrd/recsrc/BitmapTableScan.cpp
firebird/trunk/src/jrd/recsrc/FilteredStream.cpp
firebird/trunk/src/jrd/recsrc/HashJoin.cpp
firebird/trunk/src/jrd/recsrc/IndexTableScan.cpp
firebird/trunk/src/jrd/recsrc/MergeJoin.cpp
firebird/trunk/src/jrd/recsrc/NestedLoopJoin.cpp
firebird/trunk/src/jrd/recsrc/ProcedureScan.cpp
firebird/trunk/src/jrd/recsrc/RecordSource.cpp
firebird/trunk/src/jrd/recsrc/RecordSource.h
firebird/trunk/src/jrd/recsrc/RecursiveStream.cpp
firebird/trunk/src/jrd/recsrc/Union.cpp
firebird/trunk/src/jrd/recsrc/VirtualTableScan.cpp
firebird/trunk/src/jrd/recsrc/WindowedStream.cpp
firebird/trunk/src/jrd/rse.h
firebird/trunk/src/jrd/scl.epp
firebird/trunk/src/jrd/sdw.cpp
firebird/trunk/src/jrd/sort.cpp
firebird/trunk/src/jrd/sqz.cpp
firebird/trunk/src/jrd/status.cpp
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/svc.h
firebird/trunk/src/jrd/svc_tab.h
firebird/trunk/src/jrd/tpc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp
firebird/trunk/src/jrd/trace/TraceConfigStorage.h
firebird/trunk/src/jrd/trace/TraceLog.cpp
firebird/trunk/src/jrd/trace/TraceLog.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/jrd/trace/TraceService.cpp
firebird/trunk/src/jrd/trace/TraceService.h
firebird/trunk/src/jrd/trig.h
firebird/trunk/src/jrd/val.h
firebird/trunk/src/jrd/validation.cpp
firebird/trunk/src/jrd/vio.cpp
firebird/trunk/src/lock/lock.cpp
firebird/trunk/src/lock/lock_proto.h
firebird/trunk/src/lock/print.cpp
firebird/trunk/src/misc/headers.sed
firebird/trunk/src/misc/writeBuildNum.sh
firebird/trunk/src/msgs/build_file.epp
firebird/trunk/src/msgs/check_msgs.epp
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/all.cpp
firebird/trunk/src/qli/command.cpp
firebird/trunk/src/qli/compile.cpp
firebird/trunk/src/qli/dtr.cpp
firebird/trunk/src/qli/dtr.h
firebird/trunk/src/qli/err.cpp
firebird/trunk/src/qli/eval.cpp
firebird/trunk/src/qli/exe.cpp
firebird/trunk/src/qli/gener.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/qli/lex.cpp
firebird/trunk/src/qli/meta.epp
firebird/trunk/src/qli/mov.cpp
firebird/trunk/src/qli/picstr.cpp
firebird/trunk/src/qli/show.epp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/inet_proto.h
firebird/trunk/src/remote/merge.cpp
firebird/trunk/src/remote/parser.cpp
firebird/trunk/src/remote/protocol.cpp
firebird/trunk/src/remote/protocol.h
firebird/trunk/src/remote/remot_proto.h
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/utilities/cache.cpp
firebird/trunk/src/utilities/drop.cpp
firebird/trunk/src/utilities/gstat/dba.epp
firebird/trunk/src/utilities/gstat/ppg.cpp
firebird/trunk/src/utilities/guard/guard.cpp
firebird/trunk/src/utilities/guard/util.cpp
firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
firebird/trunk/src/utilities/nbackup/nbk_proto.h
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/TraceUnicodeUtils.h
firebird/trunk/src/utilities/print_event.cpp
firebird/trunk/src/utilities/rebuild/rebuild.cpp
firebird/trunk/src/utilities/rebuild/rmet.epp
firebird/trunk/src/utilities/rebuild/rstore.epp
firebird/trunk/src/utilities/run_service.cpp
Added Paths:
-----------
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/src/alice/main/
firebird/trunk/src/alice/main/aliceMain.cpp
firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
firebird/trunk/src/auth/SecurityDatabase/pwd.cpp
firebird/trunk/src/burp/main/
firebird/trunk/src/burp/main/burpMain.cpp
firebird/trunk/src/burp/split/
firebird/trunk/src/burp/split/spit.cpp
firebird/trunk/src/burp/split/spit.h
firebird/trunk/src/common/Auth.cpp
firebird/trunk/src/common/Auth.h
firebird/trunk/src/common/CharSet.cpp
firebird/trunk/src/common/CharSet.h
firebird/trunk/src/common/CsConvert.h
firebird/trunk/src/common/IntlUtil.cpp
firebird/trunk/src/common/IntlUtil.h
firebird/trunk/src/common/ScanDir.cpp
firebird/trunk/src/common/ScanDir.h
firebird/trunk/src/common/TextType.cpp
firebird/trunk/src/common/TextType.h
firebird/trunk/src/common/ThreadData.cpp
firebird/trunk/src/common/ThreadData.h
firebird/trunk/src/common/ThreadStart.cpp
firebird/trunk/src/common/ThreadStart.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/call_service.h
firebird/trunk/src/common/cdbtable.h
firebird/trunk/src/common/classes/misc/
firebird/trunk/src/common/classes/misc/class_perf.cpp
firebird/trunk/src/common/classes/misc/class_test.cpp
firebird/trunk/src/common/classes/misc/string_test.cmd
firebird/trunk/src/common/classes/misc/string_test.cpp
firebird/trunk/src/common/classes/misc/test.sh
firebird/trunk/src/common/config/os/
firebird/trunk/src/common/config/os/config_root.h
firebird/trunk/src/common/config/os/darwin/
firebird/trunk/src/common/config/os/darwin/config_root.cpp
firebird/trunk/src/common/config/os/posix/
firebird/trunk/src/common/config/os/posix/binreloc.c
firebird/trunk/src/common/config/os/posix/binreloc.h
firebird/trunk/src/common/config/os/posix/config_root.cpp
firebird/trunk/src/common/config/os/win32/
firebird/trunk/src/common/config/os/win32/config_root.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/db_alias.h
firebird/trunk/src/common/dsc.cpp
firebird/trunk/src/common/dsc.h
firebird/trunk/src/common/dsc_proto.h
firebird/trunk/src/common/dsc_pub.h
firebird/trunk/src/common/dyntable.h
firebird/trunk/src/common/enc.cpp
firebird/trunk/src/common/enc_proto.h
firebird/trunk/src/common/intlobj_new.h
firebird/trunk/src/common/isc.cpp
firebird/trunk/src/common/isc_f_proto.h
firebird/trunk/src/common/isc_file.cpp
firebird/trunk/src/common/isc_proto.h
firebird/trunk/src/common/isc_s_proto.h
firebird/trunk/src/common/isc_sync.cpp
firebird/trunk/src/common/os/
firebird/trunk/src/common/os/darwin/
firebird/trunk/src/common/os/darwin/mod_loader.cpp
firebird/trunk/src/common/os/divorce.h
firebird/trunk/src/common/os/fbsyslog.h
firebird/trunk/src/common/os/guid.h
firebird/trunk/src/common/os/isc_i_proto.h
firebird/trunk/src/common/os/mod_loader.h
firebird/trunk/src/common/os/os_utils.h
firebird/trunk/src/common/os/path_utils.h
firebird/trunk/src/common/os/posix/
firebird/trunk/src/common/os/posix/divorce.cpp
firebird/trunk/src/common/os/posix/fbsyslog.cpp
firebird/trunk/src/common/os/posix/guid.cpp
firebird/trunk/src/common/os/posix/isc_ipc.cpp
firebird/trunk/src/common/os/posix/mod_loader.cpp
firebird/trunk/src/common/os/posix/os_utils.cpp
firebird/trunk/src/common/os/posix/path_utils.cpp
firebird/trunk/src/common/os/win32/
firebird/trunk/src/common/os/win32/fbsyslog.cpp
firebird/trunk/src/common/os/win32/guid.cpp
firebird/trunk/src/common/os/win32/isc_ipc.cpp
firebird/trunk/src/common/os/win32/mod_loader.cpp
firebird/trunk/src/common/os/win32/os_utils.cpp
firebird/trunk/src/common/os/win32/path_utils.cpp
firebird/trunk/src/common/prett_proto.h
firebird/trunk/src/common/pretty.cpp
firebird/trunk/src/common/quad.cpp
firebird/trunk/src/common/quad.h
firebird/trunk/src/common/quad_proto.h
firebird/trunk/src/common/sdl.cpp
firebird/trunk/src/common/sdl.h
firebird/trunk/src/common/sdl_proto.h
firebird/trunk/src/common/sdltable.h
firebird/trunk/src/common/sha.cpp
firebird/trunk/src/common/sha.h
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/unicode_util.h
firebird/trunk/src/common/xdr.cpp
firebird/trunk/src/common/xdr.h
firebird/trunk/src/common/xdr_proto.h
firebird/trunk/src/gpre/boot/
firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp
firebird/trunk/src/gpre/languages/
firebird/trunk/src/gpre/languages/ada.cpp
firebird/trunk/src/gpre/languages/cob.cpp
firebird/trunk/src/gpre/languages/fbrmclib.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/languages/pas.cpp
firebird/trunk/src/gpre/languages/rmc.cpp
firebird/trunk/src/gpre/std/
firebird/trunk/src/gpre/std/gpre_meta.epp
firebird/trunk/src/include/ProviderInterface.h
firebird/trunk/src/jrd/misc/
firebird/trunk/src/jrd/misc/evl_string_test.cpp
firebird/trunk/src/remote/client/
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/server/
firebird/trunk/src/remote/server/os/
firebird/trunk/src/remote/server/os/posix/
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/serve_proto.h
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/fbsvcmgr/
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp
firebird/trunk/src/utilities/gsec/main/
firebird/trunk/src/utilities/gsec/main/gsecMain.cpp
firebird/trunk/src/utilities/gstat/main/
firebird/trunk/src/utilities/gstat/main/gstatMain.cpp
firebird/trunk/src/utilities/nbackup/main/
firebird/trunk/src/utilities/nbackup/main/nbkMain.cpp
firebird/trunk/src/utilities/nbackup/nbackup.cpp
firebird/trunk/src/utilities/ntrace/os/posix/misc/
firebird/trunk/src/utilities/ntrace/os/posix/misc/FileObject.cpp
firebird/trunk/src/yvalve/
firebird/trunk/src/yvalve/alt.cpp
firebird/trunk/src/yvalve/alt_proto.h
firebird/trunk/src/yvalve/array.epp
firebird/trunk/src/yvalve/array_proto.h
firebird/trunk/src/yvalve/blob.epp
firebird/trunk/src/yvalve/blob_proto.h
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/gds_proto.h
firebird/trunk/src/yvalve/keywords.cpp
firebird/trunk/src/yvalve/keywords.h
firebird/trunk/src/yvalve/perf.cpp
firebird/trunk/src/yvalve/perf.h
firebird/trunk/src/yvalve/perf_proto.h
firebird/trunk/src/yvalve/prepa_proto.h
firebird/trunk/src/yvalve/preparse.cpp
firebird/trunk/src/yvalve/user__proto.h
firebird/trunk/src/yvalve/user_dsql.cpp
firebird/trunk/src/yvalve/utl.cpp
firebird/trunk/src/yvalve/utl_proto.h
firebird/trunk/src/yvalve/utly.cpp
firebird/trunk/src/yvalve/utly_proto.h
firebird/trunk/src/yvalve/why.cpp
firebird/trunk/src/yvalve/why_proto.h
Removed Paths:
-------------
firebird/trunk/builds/posix/Makefile.in.boot.gpre
firebird/trunk/builds/posix/Makefile.in.client.fbudf
firebird/trunk/builds/posix/Makefile.in.client.gbak
firebird/trunk/builds/posix/Makefile.in.client.gfix
firebird/trunk/builds/posix/Makefile.in.client.gpre
firebird/trunk/builds/posix/Makefile.in.client.gsec
firebird/trunk/builds/posix/Makefile.in.client.isql
firebird/trunk/builds/posix/Makefile.in.client.qli
firebird/trunk/builds/posix/Makefile.in.client.util
firebird/trunk/builds/posix/Makefile.in.codes
firebird/trunk/builds/posix/Makefile.in.embed.fbudf
firebird/trunk/builds/posix/Makefile.in.embed.gbak
firebird/trunk/builds/posix/Makefile.in.embed.gfix
firebird/trunk/builds/posix/Makefile.in.embed.gpre
firebird/trunk/builds/posix/Makefile.in.embed.isql
firebird/trunk/builds/posix/Makefile.in.embed.qli
firebird/trunk/builds/posix/Makefile.in.embed.util
firebird/trunk/builds/posix/Makefile.in.extern.icu
firebird/trunk/builds/posix/Makefile.in.extlib
firebird/trunk/builds/posix/Makefile.in.fbserver
firebird/trunk/builds/posix/Makefile.in.fbtrace
firebird/trunk/builds/posix/Makefile.in.firebird
firebird/trunk/builds/posix/Makefile.in.intl
firebird/trunk/builds/posix/Makefile.in.libfbclient
firebird/trunk/builds/posix/Makefile.in.libfbembed
firebird/trunk/builds/posix/Makefile.in.libfbstatic
firebird/trunk/builds/posix/Makefile.in.msgs
firebird/trunk/builds/posix/Makefile.in.plugins
firebird/trunk/builds/posix/Makefile.in.refDatabases
firebird/trunk/builds/posix/Makefile.in.smp_server
firebird/trunk/builds/posix/Makefile.in.static.gbak
firebird/trunk/builds/posix/Makefile.in.static.gpre
firebird/trunk/builds/posix/Makefile.in.static.isql
firebird/trunk/builds/posix/Makefile.in.user.management
firebird/trunk/extern/binreloc/
firebird/trunk/src/alice/aliceMain.cpp
firebird/trunk/src/auth/Auth.cpp
firebird/trunk/src/auth/Auth.h
firebird/trunk/src/burp/burpMain.cpp
firebird/trunk/src/burp/spit.cpp
firebird/trunk/src/burp/spit.h
firebird/trunk/src/common/classes/class_perf.cpp
firebird/trunk/src/common/classes/class_test.cpp
firebird/trunk/src/common/classes/string_test.cmd
firebird/trunk/src/common/classes/string_test.cpp
firebird/trunk/src/common/classes/test.sh
firebird/trunk/src/config/ScanDir.cpp
firebird/trunk/src/config/ScanDir.h
firebird/trunk/src/dsql/array.epp
firebird/trunk/src/dsql/array_proto.h
firebird/trunk/src/dsql/blob.epp
firebird/trunk/src/dsql/blob_proto.h
firebird/trunk/src/dsql/keywords.cpp
firebird/trunk/src/dsql/keywords.h
firebird/trunk/src/dsql/prepa_proto.h
firebird/trunk/src/dsql/preparse.cpp
firebird/trunk/src/dsql/user__proto.h
firebird/trunk/src/dsql/user_dsql.cpp
firebird/trunk/src/gpre/ada.cpp
firebird/trunk/src/gpre/cdbtable.h
firebird/trunk/src/gpre/cob.cpp
firebird/trunk/src/gpre/dyntable.cpp
firebird/trunk/src/gpre/dyntable.h
firebird/trunk/src/gpre/fbrmclib.cpp
firebird/trunk/src/gpre/ftn.cpp
firebird/trunk/src/gpre/gpre_meta.epp
firebird/trunk/src/gpre/gpre_meta_boot.cpp
firebird/trunk/src/gpre/pas.cpp
firebird/trunk/src/gpre/prett_proto.h
firebird/trunk/src/gpre/pretty.cpp
firebird/trunk/src/gpre/rmc.cpp
firebird/trunk/src/gpre/sdltable.h
firebird/trunk/src/isql/isql_win.cpp
firebird/trunk/src/isql/isql_win.h
firebird/trunk/src/isql/isqlw_proto.h
firebird/trunk/src/jrd/CharSet.cpp
firebird/trunk/src/jrd/CharSet.h
firebird/trunk/src/jrd/CsConvert.h
firebird/trunk/src/jrd/IntlUtil.cpp
firebird/trunk/src/jrd/IntlUtil.h
firebird/trunk/src/jrd/RecordSourceNodes.cpp
firebird/trunk/src/jrd/RecordSourceNodes.h
firebird/trunk/src/jrd/TextType.cpp
firebird/trunk/src/jrd/TextType.h
firebird/trunk/src/jrd/ThreadData.cpp
firebird/trunk/src/jrd/ThreadData.h
firebird/trunk/src/jrd/ThreadStart.cpp
firebird/trunk/src/jrd/ThreadStart.h
firebird/trunk/src/jrd/alt.cpp
firebird/trunk/src/jrd/alt_proto.h
firebird/trunk/src/jrd/db_alias.cpp
firebird/trunk/src/jrd/db_alias.h
firebird/trunk/src/jrd/dbg.cpp
firebird/trunk/src/jrd/dbg.h
firebird/trunk/src/jrd/dbg_proto.h
firebird/trunk/src/jrd/dbt.cpp
firebird/trunk/src/jrd/divorce.cpp
firebird/trunk/src/jrd/divorce.h
firebird/trunk/src/jrd/dmp.cpp
firebird/trunk/src/jrd/dmp_proto.h
firebird/trunk/src/jrd/dsc.cpp
firebird/trunk/src/jrd/dsc.h
firebird/trunk/src/jrd/dsc_proto.h
firebird/trunk/src/jrd/dsc_pub.h
firebird/trunk/src/jrd/enc.cpp
firebird/trunk/src/jrd/enc_proto.h
firebird/trunk/src/jrd/entry.h
firebird/trunk/src/jrd/evl_string_test.cpp
firebird/trunk/src/jrd/gds.cpp
firebird/trunk/src/jrd/gds_proto.h
firebird/trunk/src/jrd/intlobj_new.h
firebird/trunk/src/jrd/isc.cpp
firebird/trunk/src/jrd/isc_f_proto.h
firebird/trunk/src/jrd/isc_file.cpp
firebird/trunk/src/jrd/isc_proto.h
firebird/trunk/src/jrd/isc_s_proto.h
firebird/trunk/src/jrd/isc_sync.cpp
firebird/trunk/src/jrd/jrd_pwd.h
firebird/trunk/src/jrd/os/config_root.h
firebird/trunk/src/jrd/os/darwin/config_root.cpp
firebird/trunk/src/jrd/os/darwin/mod_loader.cpp
firebird/trunk/src/jrd/os/fbsyslog.h
firebird/trunk/src/jrd/os/guid.h
firebird/trunk/src/jrd/os/isc_i_proto.h
firebird/trunk/src/jrd/os/mod_loader.h
firebird/trunk/src/jrd/os/os_utils.h
firebird/trunk/src/jrd/os/path_utils.h
firebird/trunk/src/jrd/os/posix/config_root.cpp
firebird/trunk/src/jrd/os/posix/fbsyslog.cpp
firebird/trunk/src/jrd/os/posix/guid.cpp
firebird/trunk/src/jrd/os/posix/isc_ipc.cpp
firebird/trunk/src/jrd/os/posix/mod_loader.cpp
firebird/trunk/src/jrd/os/posix/os_utils.cpp
firebird/trunk/src/jrd/os/posix/path_utils.cpp
firebird/trunk/src/jrd/os/win32/config_root.cpp
firebird/trunk/src/jrd/os/win32/fbsyslog.cpp
firebird/trunk/src/jrd/os/win32/guid.cpp
firebird/trunk/src/jrd/os/win32/isc_ipc.cpp
firebird/trunk/src/jrd/os/win32/mod_loader.cpp
firebird/trunk/src/jrd/os/win32/os_utils.cpp
firebird/trunk/src/jrd/os/win32/path_utils.cpp
firebird/trunk/src/jrd/perf.cpp
firebird/trunk/src/jrd/perf.h
firebird/trunk/src/jrd/perf_proto.h
firebird/trunk/src/jrd/pwd.cpp
firebird/trunk/src/jrd/qatest.cpp
firebird/trunk/src/jrd/quad.cpp
firebird/trunk/src/jrd/quad.h
firebird/trunk/src/jrd/quad_proto.h
firebird/trunk/src/jrd/sdl.cpp
firebird/trunk/src/jrd/sdl.h
firebird/trunk/src/jrd/sdl_proto.h
firebird/trunk/src/jrd/sha.cpp
firebird/trunk/src/jrd/sha.h
firebird/trunk/src/jrd/svc_stub.cpp
firebird/trunk/src/jrd/unicode_util.cpp
firebird/trunk/src/jrd/unicode_util.h
firebird/trunk/src/jrd/utl.cpp
firebird/trunk/src/jrd/utl_proto.h
firebird/trunk/src/jrd/why.cpp
firebird/trunk/src/jrd/why_proto.h
firebird/trunk/src/remote/inet_server.cpp
firebird/trunk/src/remote/inter_proto.h
firebird/trunk/src/remote/interface.cpp
firebird/trunk/src/remote/os/
firebird/trunk/src/remote/serve_proto.h
firebird/trunk/src/remote/server/os/win32/
firebird/trunk/src/remote/server.cpp
firebird/trunk/src/remote/xdr.cpp
firebird/trunk/src/remote/xdr.h
firebird/trunk/src/remote/xdr_proto.h
firebird/trunk/src/remote/xnet.cpp
firebird/trunk/src/remote/xnet.h
firebird/trunk/src/remote/xnet_proto.h
firebird/trunk/src/utilities/fbsvcmgr.cpp
firebird/trunk/src/utilities/gsec/call_service.cpp
firebird/trunk/src/utilities/gsec/call_service.h
firebird/trunk/src/utilities/gsec/gsecMain.cpp
firebird/trunk/src/utilities/gstat/gstatMain.cpp
firebird/trunk/src/utilities/nbackup/nbkMain.cpp
firebird/trunk/src/utilities/nbackup.cpp
firebird/trunk/src/utilities/ntrace/os/posix/FileObject.cpp
Modified: firebird/trunk/binreloc.m4
===================================================================
--- firebird/trunk/binreloc.m4 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/binreloc.m4 2010-10-12 08:02:57 UTC (rev 51652)
@@ -48,30 +48,8 @@
if test "x$br_cv_binreloc" = "xyes"; then
BINRELOC_CFLAGS="-DENABLE_BINRELOC"
AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
- if test "x$enable_binreloc_threads" = "xyes"; then
- AC_CHECK_LIB([pthread], [pthread_getspecific])
- fi
-
- AC_CACHE_CHECK([whether binary relocation should use threads],
- [br_cv_binreloc_threads],
- [if test "x$enable_binreloc_threads" = "xyes"; then
- if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
- br_cv_binreloc_threads=yes
- else
- br_cv_binreloc_threads=no
- fi
- else
- br_cv_binreloc_threads=no
- fi])
-
- if test "x$br_cv_binreloc_threads" = "xyes"; then
- BINRELOC_LIBS="-lpthread"
- AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
- else
- BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0"
- AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
- fi
fi
+
AC_SUBST(BINRELOC_CFLAGS)
AC_SUBST(BINRELOC_LIBS)
])
Added: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in (rev 0)
+++ firebird/trunk/builds/posix/Makefile.in 2010-10-12 08:02:57 UTC (rev 51652)
@@ -0,0 +1,516 @@
+#
+# PROGRAM: Firebird single makefile
+# MODULE: Makefile.in
+# DESCRIPTION: Posix build main file
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+#
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been
+# released under an Open Source Initiative certificed licence.
+# More information about OSI certification can be found at:
+# http://www.opensource.org
+#
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public Licence for more details.
+#
+# This module was created by members of the firebird development
+# team. All individual contributions remain the Copyright (C) of
+# those individuals and all rights are reserved. Contributors to
+# this file are either listed below or can be obtained from a CVS
+# history command.
+#
+# Created by: Mark O'Donohue <mar...@lu...>
+#
+# Contributor(s):
+# Alex Peshkoff - created single makefile based on Mark's files
+#
+
+ROOT=..
+
+include make.defaults
+include make.platform
+include make.rules
+include make.shared.variables
+
+@SET_MAKE@
+
+ifeq ($(IsDeveloper), Y)
+ DefaultTarget := Debug
+else
+ DefaultTarget := Release
+endif
+
+.PHONY: master_process firebird Debug Release extern
+
+all: firebird
+
+firebird:
+ $(MAKE) TARGET=$(DefaultTarget) master_process
+
+Release:
+ $(MAKE) TARGET=Release master_process
+
+Debug:
+ $(MAKE) TARGET=Debug master_process
+
+
+#----------------------------------------------------------------------------
+# jrd/build_no.h contains the version and build# fields used throughout the
+# program and quoted in the tools. This routine will update the build_no.h
+# file with the auto update build# script file, writeBuildNum.sh. The
+# writeBuildNum.sh script is autoupdated by CVS checkins.
+#
+
+.PHONY: updateBuildNum
+
+updateBuildNum : $(SRC_ROOT)/jrd/build_no.h $(GEN_ROOT)/Make.Version
+
+$(SRC_ROOT)/jrd/build_no.h : $(SRC_ROOT)/misc/writeBuildNum.sh
+ (cd ..; ./src/misc/writeBuildNum.sh rebuildHeader)
+
+$(GEN_ROOT)/Make.Version : $(SRC_ROOT)/misc/writeBuildNum.sh
+ $(SRC_ROOT)/misc/writeBuildNum.sh createMakeVersion $@
+
+
+#___________________________________________________________________________
+# build external software
+#
+
+extern:
+ $(MAKE) -C $(ROOT)/extern/btyacc
+
+
+#___________________________________________________________________________
+# create platform-specific export lists (version scripts) in gen
+#
+
+%.vers: ../builds/posix/%.vers
+ sh vers.sh $(firstword $@)
+
+export_lists: $(ALLVERS)
+
+
+#___________________________________________________________________________
+# main build target for both debug abd release builds
+#
+
+.PHONY: boot yvalve engine fbintl gpre utilities plugins rest codes
+
+master_process:
+ $(MAKE) updateBuildNum
+ $(MAKE) export_lists
+ $(MAKE) extern
+ $(MAKE) boot
+ $(MAKE) yvalve
+ $(MAKE) engine
+ $(MAKE) fbintl
+ $(MAKE) utilities
+# Now having ready such useful tool as gbak, we may restore required databases
+# and switch to full-featured gpre
+ $(MAKE) gpre
+# Pay attention - after build force gpre_current to point to gpre
+# even if gpre itself was not rebuilt
+ -$(RM) $(GPRE_CURRENT)
+ (cd $(BIN); $(LN) $(notdir $(GPRE)) $(notdir $(GPRE_CURRENT)))
+ifeq ($(IsDeveloper), Y)
+# In developer mode we must regenerate verious files in include/gen
+ $(MAKE) codes
+endif
+ $(MAKE) plugins
+ $(MAKE) rest
+
+#___________________________________________________________________________
+# static library - various common code, used in different FB projects
+#
+
+$(COMMON_LIB): $(Common_Objects)
+ -$(RM) $@
+ $(STATICLIB_LINK) $@ $^
+
+
+#___________________________________________________________________________
+# gpre_boot
+#
+
+boot: $(GPRE_BOOT)
+
+$(GPRE_BOOT): $(GPRE_Boot_Objects) $(COMMON_LIB)
+ $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
+ -$(RM) $(GPRE_CURRENT)
+ (cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
+
+
+#___________________________________________________________________________
+# yValve
+#
+
+yvalve: $(LIBFIREBIRD_BASENAME)
+
+ifneq ($(LibraryBaseName),$(LibrarySoName))
+$(LIBFIREBIRD_BASENAME): $(LIBFIREBIRD_SONAME)
+ (cd $(LIB) && $(LN) -f $(LibrarySoName) $(LibraryBaseName) )
+endif
+
+ifneq ($(LibrarySoName),$(LibraryFullName))
+$(LIBFIREBIRD_SONAME): $(LIBFIREBIRD_FULLNAME)
+ (cd $(LIB) && $(LN) -f $(LibraryFullName) $(LibrarySoName) )
+endif
+
+# remote redirector is statically linked in main FB library
+$(LIBFIREBIRD_FULLNAME): $(YValve_Objects) $(Remote_Client_Objects) $(COMMON_LIB)
+ $(LINK_FIREBIRD) -o $@ $^ $(LINK_FIREBIRD_LIBS)
+
+
+#___________________________________________________________________________
+# core part - jrd's engine
+#
+
+engine: $(ENGINE_SONAME)
+
+$(ENGINE_SONAME): $(Engine_Objects) $(SVC_Objects) $(COMMON_LIB)
+ $(LINK_ENGINE) -o $@ $^ $(LINK_ENGINE_LIBS)
+
+
+#___________________________________________________________________________
+# intl support
+#
+
+fbintl: $(LIBFBINTL_SO)
+
+$(LIBFBINTL_SO): $(INTL_Objects) $(COMMON_LIB)
+ $(LINK_INTL) -o $@ $^ $(LINK_INTL_LIBS)
+
+
+#___________________________________________________________________________
+# full gpre
+# when switching to it we also build databases needed later
+# and libib_util needed to start engine smart
+#
+
+.PHONY: databases udfsupport
+
+gpre: $(GPRE) databases udfsupport
+
+$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+
+databases: yachts.lnk help.fdb security.fdb msg.timestamp
+
+yachts.lnk: metadata.fdb
+ -$(RM) $@
+ $(LN) $^ $@
+
+metadata.fdb: $(BLD_ROOT)/misc/metadata.gbak
+ $(GBAK) -MODE read_only -R $< $@
+ $(TOUCH) $@
+ $(CHMOD) 0444 $@
+
+help.fdb: $(FIREBIRD)/help/help.fdb
+ -$(RM) $@
+ $(LN) $^ $@
+
+$(FIREBIRD)/help/help.fdb: $(BLD_ROOT)/misc/help.gbak
+ $(GBAK) -MODE read_only -R $< $@
+ $(TOUCH) $@
+ $(CHMOD) 0444 $@
+
+security.fdb: $(SECURITY_FDB)
+ -$(RM) $@
+ $(LN) $(SECDB) $@
+
+SECDB = security.tmp
+$(SECURITY_FDB): $(SRC_ROOT)/dbs/security.sql
+ -$(RM) $@
+ -$(RM) $(SECDB)
+ echo create database \'$(SECDB)\'\; | $(ISQL)
+ $(ISQL) -i $^ $(SECDB)
+ $(CHMOD) a=rw $(SECDB)
+ $(CP) $(SECDB) $@
+
+msg.timestamp: $(MSG_FILES)
+ -$(RM) msg.fdb
+ echo create database \'msg.fdb\'\; | $(ISQL)
+ for sql in $(MSG_FILES); do (echo $$sql; $(ISQL) -i $$sql msg.fdb) || exit; done
+ $(TOUCH) $@
+
+
+.PHONY: udfs ibutil ibudf fbudf
+
+udfsupport:
+ $(MAKE) ibutil
+ $(MAKE) udfs
+
+udfs: ibudf fbudf
+
+UDF = $(FIREBIRD)/UDF
+IBUDF_SO = $(UDF)/ib_udf.$(SHRLIB_EXT)
+FBUDF_SO = $(UDF)/fbudf.$(SHRLIB_EXT)
+
+ibudf: $(IBUDF_SO)
+
+$(IBUDF_SO): $(IBUDF_Objects)
+ $(call LINK_UDF,ib_udf) -o $@ $^ $(LINK_UDF_LIBS)
+
+fbudf: $(FBUDF_SO)
+
+$(FBUDF_SO): $(FBUDF_Objects) $(COMMON_LIB)
+ $(call LINK_UDF,fbudf) -o $@ $^ $(LINK_UDF_LIBS) $(FIREBIRD_LIBRARY_LINK)
+
+ibutil: $(LIBIBUTIL_SO)
+
+$(LIBIBUTIL_SO): $(UTIL_Objects)
+ $(LINK_IB_UTIL) -o $@ $^ $(LINK_IB_UTIL_LIBS)
+
+
+#___________________________________________________________________________
+# most of utilities, including network server
+# 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
+
+firebird_server: $(FB_DAEMON)
+
+$(FB_DAEMON): $(Remote_Server_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+fb_lock_print: $(LOCKPRINT)
+
+$(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+fbguard: $(FBGUARD)
+
+$(FBGUARD): $(FBGUARD_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+fbsvcmgr: $(FBSVCMGR)
+
+$(FBSVCMGR): $(FBSVCMGR_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+fbtracemgr: $(FBTRACEMGR)
+
+$(FBTRACEMGR): $(FBTRACEMGR_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+gbak: $(GBAK)
+
+$(GBAK): $(GBAK_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+gsplit: $(GSPLIT)
+
+$(GSPLIT): $(GSPLIT_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+gfix: $(GFIX)
+
+$(GFIX): $(GFIX_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+gsec: $(GSEC)
+
+$(GSEC): $(GSEC_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+gstat: $(GSTAT)
+
+$(GSTAT): $(GSTAT_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+isql: $(ISQL)
+
+$(ISQL): $(ISQL_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(LIBEDITLINE)
+
+nbackup: $(NBACKUP)
+
+$(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+
+#___________________________________________________________________________
+# 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)
+
+plugins: udr legacy_user_management trace
+
+udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
+
+$(PLUGINS)/udr_engine.conf: $(ROOT)/src/plugins/udr_engine/udr_engine.conf
+ cp $^ $@
+
+$(UDR_PLUGIN): $(UDRENG_Objects) $(COMMON_LIB)
+ $(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+
+legacy_user_management: $(LEGACY_USER_MANAGER)
+
+$(LEGACY_USER_MANAGER): $(LEGACY_USERS_MANAGE_Objects) $(COMMON_LIB)
+ $(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+
+trace: $(FBTRACE)
+
+$(FBTRACE): $(FBTRACE_UTIL_Objects) $(COMMON_LIB)
+ $(LINK_TRACE) -o $@ $^ $(FIREBIRD_LIBRARY_LINK) $(LINK_TRACE_LIBS)
+
+
+#___________________________________________________________________________
+# codes - developers change them sometimes
+#
+
+.PHONY: gen_codes
+CODES = $(BIN)/codes$(EXEC_EXT)
+IDS = $(SRC_ROOT)/include/gen/ids.h
+
+codes: gen_codes $(IDS)
+
+gen_codes: $(CODES) msg.timestamp
+ $(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
+
+$(CODES): $(CODES_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+$(IDS): $(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h
+ m4 $< > $@
+
+
+#___________________________________________________________________________
+# all the rest we need to build
+#
+
+.PHONY: qli examples message_file
+
+rest: qli examples message_file
+
+qli: $(QLI)
+
+$(QLI): $(QLI_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+examples:
+ $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
+ $(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/
+
+message_file: $(FIREBIRD_MSG)
+
+$(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp
+ $(BUILD_FILE) -d msg.fdb -f $@
+ $(CHMOD_6) $@
+
+$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
+ $(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+
+#___________________________________________________________________________
+# track dependencies
+#
+
+include $(ROOT)/gen/make.shared.targets
+
+Dependencies = $(AllObjects:.o=.d)
+-include $(Dependencies)
+
+#___________________________________________________________________________
+# various cleaning
+#
+.PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
+ clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
+ clean_editline clean_all
+
+
+clean: clean_objects clean_dependancies clean_extern_objects clean_build \
+ clean_yacc_gen clean_gpre_gen clean_dbs clean_examples
+
+ifeq ($(EDITLINE_FLG),Y)
+ifeq ($(STD_EDITLINE),false)
+clean: clean_editline
+endif
+endif
+
+clean_config clean_all: clean clean_makefiles
+ $(RM) $(ROOT)/configure
+ $(RM) $(ROOT)/aclocal.m4
+ $(RM) $(ROOT)/config.log
+ $(RM) $(ROOT)/config.status
+ $(RM) $(ROOT)/libtool
+ $(RM_R) $(ROOT)/autom4te.cache
+ -$(MAKE) -C $(ROOT)/extern/editline distclean
+# -$(MAKE) -C $(ROOT)/extern/icu/source distclean
+ -$(MAKE) -C $(ROOT)/extern/btyacc distclean
+
+clean_dbs:
+ $(RM) *.fdb *.FDB msg.timestamp
+ $(RM) yachts.lnk
+
+
+# The examples are a bit different, since the makefile is included in the directory
+# and not in the gen directory, deleting it means, make clean; make doesnt work correctly
+# so the code below deletes all the other stuff but not the Makefile.examples MOD Nov-2007
+
+clean_examples:
+ $(RM) `find $(GEN_ROOT)/examples/ -type f ! -name 'Make*'`
+
+clean_editline:
+ -$(MAKE) -C $(ROOT)/extern/editline clean
+
+#clean_icu:
+# -$(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`
+
+clean_extern_objects:
+ $(RM) `find $(ROOT)/extern/ -type f -name '*.o' -print`
+
+# Clear out dependancies files created by the gcc compiler
+# since when .o and other files are deleted the dependant
+# targets need to be recalculated
+# MOD 10-July-2002
+
+clean_dependancies:
+ $(RM) -f `find $(TMP_ROOT)/ -type f -name '*.d' -print`
+
+# delete only all of the files of type regular file in $FIREBIRD
+# leave the directories to make dependacies work still
+# MOD 11-July-2002
+
+clean_build:
+ $(RM) `find $(GEN_ROOT)/*/firebird \( -type f -o -type l \) -print`
+# $(RM) $(GDSLIB_OBJECTS) $(GDSLIB_PHASE3_OBJECTS)
+
+#
+clean_makefiles:
+ $(RM) $(GEN_ROOT)/Make*
+ $(RM) $(GEN_ROOT)/make*
+ $(RM) `find $(GEN_ROOT)/install \( -type f -o -type l \) -print`
+ -$(RM) $(GEN_ROOT)/examples/Make*
+ $(RM) $(ROOT)/Makefile
+ $(RM) $(SRC_ROOT)/include/gen/autoconfig.h
+ $(RM) $(SRC_ROOT)/include/gen/blrtable.h
+
+clean_gpre_gen:
+ -$(RM) -f `find $(TMP_ROOT)/ -type f -name '*.cpp' -print`
+
+clean_yacc_gen:
+ $(RM) $(ROOT)/src/dsql/parse.cpp $(ROOT)/src/dsql/dsql.tab.h
+
+#___________________________________________________________________________
+# Extra platform specific targets
+@POSTFIX_INCLUDE@
Property changes on: firebird/trunk/builds/posix/Makefile.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: firebird/trunk/builds/posix/Makefile.in.boot.gpre
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.boot.gpre 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.boot.gpre 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,88 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-#
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been
-# released under an Open Source Initiative certificed licence.
-# More information about OSI certification can be found at:
-# http://www.opensource.org
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public Licence for more details.
-#
-# This module was created by members of the firebird development
-# team. All individual contributions remain the Copyright (C) of
-# those individuals and all rights are reserved. Contributors to
-# this file are either listed below or can be obtained from a CVS
-# history command.
-#
-# Created by: Mark O'Donohue <mar...@lu...>
-#
-# Contributor(s):
-#
-#
-#
-ROOT=..
-ObjModuleType=std
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-
-JRDBOOT_Files = dsc.cpp gds.cpp isc.cpp $(JRDBOOT_Extra_Files)
-JRDBOOT_Sources = $(addprefix jrd/, $(JRDBOOT_Files))
-JRDBOOT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRDBOOT_Sources))))
-
-
-COMMONBOOT_Files = cvt.cpp dllinst.cpp
-COMMONBOOT_Sources = $(addprefix common/, $(COMMONBOOT_Files))
-COMMONBOOT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(COMMONBOOT_Sources))))
-
-
-GPRECOMMON_Files += cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp \
- gpre.cpp hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp \
- msc.cpp par.cpp pat.cpp sqe.cpp sql.cpp \
- @GPRE_LANGUAGE_MODULES@
-
-GPRE_Files = $(GPRECOMMON_Files) pretty.cpp gpre_meta_boot.cpp
-GPRE_Sources = $(addprefix gpre/, $(GPRE_Files))
-GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources))))
-
-
-
-GPREBOOT_Objects = $(JRDBOOT_Objects) $(GPRE_Objects) $(OS_SPECIFIC_Objects) \
- $(FBCOMMON_Objects) $(FBCONFIG_Objects) $(FBCLASSES_ClientObjects) \
- $(FBCLASSES_MsgObjects) $(COMMONBOOT_Objects)
-
-AllObjects = $(GPREBOOT_Objects)
-
-Dependencies = $(AllObjects:.o=.d)
-
-
-
-.PHONY: gpre_boot
-
-
-gpre_boot : $(GPRE_BOOT)
-
-$(GPRE_BOOT): $(GPREBOOT_Objects)
- $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
- -$(RM) $(GPRE_CURRENT)
- (cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
-
-
-
-include $(ROOT)/gen/make.shared.targets
-
-
--include $(Dependencies)
Deleted: firebird/trunk/builds/posix/Makefile.in.client.fbudf
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.client.fbudf 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.client.fbudf 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,87 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-#
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been
-# released under an Open Source Initiative certificed licence.
-# More information about OSI certification can be found at:
-# http://www.opensource.org
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public Licence for more details.
-#
-# This module was created by members of the firebird development
-# team. All individual contributions remain the Copyright (C) of
-# those individuals and all rights are reserved. Contributors to
-# this file are either listed below or can be obtained from a CVS
-# history command.
-#
-# Created by: Blas Rodriguez Somoza
-#
-# Contributor(s):
-#
-#
-#
-ROOT=..
-ObjModuleType=superclient
-CXXFLAGS+= -DSUPERCLIENT
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-UDF= $(FIREBIRD)/UDF
-
-FBUDF_Other_Sources = common/classes/timestamp.cpp
-FBUDF_Files = fbudf.cpp
-FBUDF_Sources = $(addprefix extlib/fbudf/, $(FBUDF_Files)) $(FBUDF_Other_Sources)
-FBUDF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBUDF_Sources))))
-
-UTIL_Files = ib_util.cpp
-UTIL_Sources = $(addprefix extlib/, $(UTIL_Files))
-UTIL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(UTIL_Sources))))
-
-CLASSES_Files = timestamp.cpp
-CLASSES_Sources = $(addprefix common/classes/, $(CLASSES_Files))
-CLASSES_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CLASSES_Sources))))
-
-AllObjects = $(FBUDF_Objects) $(FBUTILSVC_Objects) $(CLASSES_Objects)
-Dependencies = $(AllObjects:.o=.d)
-
-
-.PHONY: all lib_fbudf
-
-all: lib_fbudf
-
-
-# The libraries in this directory could do with a bit more work, since they
-# the previous code (presumably by John) that does the ar crv stuff, might
-# work still, even if the .o files have directory prefixes on them.
-# And the udf stuff doesn't want to do .$(SHRLIB_EXT).X.X.X extensions in UDF directory
-# or the loader gets confused with loading the links.
-# MOD 29-July-2002
-
-
-
-#
-# User defined functions. (I've put the .$(SHRLIB_EXT) extension back onto the library)
-#
-
-lib_fbudf: $(LIBIBUTIL_SO) $(UDF)/fbudf.$(SHRLIB_EXT)
-
-$(UDF)/fbudf.$(SHRLIB_EXT): $(AllObjects)
- $(call LINK_UDF,fbudf) -o $@ $^ $(LINK_UDF_LIBS)
-
-
-include $(ROOT)/gen/make.shared.targets
-
--include $(Dependencies)
Deleted: firebird/trunk/builds/posix/Makefile.in.client.gbak
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.client.gbak 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.client.gbak 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,81 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-#
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been
-# released under an Open Source Initiative certificed licence.
-# More information about OSI certification can be found at:
-# http://www.opensource.org
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public Licence for more details.
-#
-# This module was created by members of the firebird development
-# team. All individual contributions remain the Copyright (C) of
-# those individuals and all rights are reserved. Contributors to
-# this file are either listed below or can be obtained from a CVS
-# history command.
-#
-# Created by: Mark O'Donohue <mar...@lu...>
-#
-# Contributor(s):
-#
-#
-#
-
-ROOT=..
-ObjModuleType=std
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-
-GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp \
- common/classes/MetaName.cpp jrd/path_utils.cpp jrd/ThreadData.cpp
-GBAK_Files = backup.epp restore.epp OdsDetection.epp burpMain.cpp \
- burp.cpp canonical.cpp misc.cpp mvol.cpp
-GBAK_Sources = $(addprefix burp/, $(GBAK_Files)) $(GBAK_Other_Sources)
-GBAK_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GBAK_Sources)))) \
- $(FBUTILSVC_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
-
-GSPLIT_Other_Sources = jrd/path_utils.cpp
-GSPLIT_Files= spit.cpp
-GSPLIT_Sources = $(addprefix burp/, $(GSPLIT_Files)) $(GSPLIT_Other_Sources)
-GSPLIT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSPLIT_Sources)))) \
- $(FBUTIL_Objects) $(FBCLASSES_Objects) $(FBCOMMON_Objects)
-
-
-AllObjects = $(GBAK_Objects) $(GSPLIT_Objects)
-Dependencies = $(AllObjects:.o=.d)
-
-
-.PHONY: all gbak gsplit
-
-all: gbak gsplit
-
-gbak : $(LIBFBCLIENT_SO) $(GBAK)
-
-$(GBAK): $(GBAK_Objects)
- $(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
-gsplit : $(LIBFBCLIENT_SO) $(GSPLIT)
-
-$(GSPLIT): $(GSPLIT_Objects)
- $(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
-
-include $(ROOT)/gen/make.shared.targets
-
--include $(Dependencies)
Deleted: firebird/trunk/builds/posix/Makefile.in.client.gfix
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.client.gfix 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.client.gfix 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,65 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-#
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been
-# released under an Open Source Initiative certificed licence.
-# More information about OSI certification can be found at:
-# http://www.opensource.org
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public Licence for more details.
-#
-# This module was created by members of the firebird development
-# team. All individual contributions remain the Copyright (C) of
-# those individuals and all rights are reserved. Contributors to
-# this file are either listed below or can be obtained from a CVS
-# history command.
-#
-# Created by: Mark O'Donohue <mar...@lu...>
-#
-# Contributor(s):
-#
-#
-#
-ROOT=..
-ObjModuleType=std
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-
-GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp
-
-GFIX_Files = alice_meta.epp alice.cpp exe.cpp tdr.cpp aliceMain.cpp
-GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
-GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources))))
-
-AllObjects = $(GFIX_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) \
- $(FBCLASSES_ClientObjects) $(FBCLASSES_MsgObjects) $(FBUTILSVC_Objects)
-
-Dependencies = $(AllObjects:.o=.d)
-
-
-.PHONY: gfix
-
-
-gfix : $(LIBFBCLIENT_SO) $(GFIX)
-
-$(GFIX): $(AllObjects)
- $(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
-include $(ROOT)/gen/make.shared.targets
-
--include $(Dependencies)
Deleted: firebird/trunk/builds/posix/Makefile.in.client.gpre
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.client.gpre 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.client.gpre 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,67 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-#
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been
-# released under an Open Source Initiative certificed licence.
-# More information about OSI certification can be found at:
-# http://www.opensource.org
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public Licence for more details.
-#
-# This module was created by members of the firebird development
-# team. All individual contributions remain the Copyright (C) of
-# those individuals and all rights are reserved. Contributors to
-# this file are either listed below or can be obtained from a CVS
-# history command.
-#
-# Created by: Mark O'Donohue <mar...@lu...>
-#
-# Contributor(s):
-#
-#
-#
-ROOT=..
-ObjModuleType=std
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-GPRE_Other_Sources = jrd/dsc.cpp jrd/path_utils.cpp common/cvt.cpp
-GPRE_Files = gpre_meta.epp \
- cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \
- hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \
- pat.cpp pretty.cpp sqe.cpp sql.cpp \
- @GPRE_LANGUAGE_MODULES@
-
-GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources)
-GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources))))
-
-AllObjects = $(GPRE_Objects) $(CLUMPLETS_Objects)
-
-Dependencies = $(AllObjects:.o=.d)
-
-
-.PHONY: gpre
-
-
-gpre : $(LIBFBCLIENT_SO) $(GPRE)
-
-$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
- $(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
-include $(ROOT)/gen/make.shared.targets
-
--include $(Dependencies)
Deleted: firebird/trunk/builds/posix/Makefile.in.client.gsec
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.client.gsec 2010-10-10 03:13:00 UTC (rev 51651)
+++ firebird/trunk/builds/posix/Makefile.in.client.gsec 2010-10-12 08:02:57 UTC (rev 51652)
@@ -1,54 +0,0 @@
-# The contents of this file are subject to the Initial
-# Developer's Public License Version 1.0 (the "License");
-# you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-#
-# Software distributed under the License is distributed AS IS,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# See the License for the specific language governing rights
-# and limitations under the License.
-#
-# The Original Code was created by Alexander Peshkoff
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) 2004 Alexander Peshkoff <pes...@ma...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-#
-#
-ROOT=..
-ObjModuleType=std
-
-include $(ROOT)/gen/make.defaults
-include $(ROOT)/gen/make.platform
-include $(ROOT)/gen/make.rules
-include $(ROOT)/gen/make.shared.variables
-
-@SET_MAKE@
-
-GSEC_Other_Sources = jrd/isc_file.cpp jrd/ThreadData.cpp
-GSEC_Files = gsec.cpp call_service.cpp gsecMain.cpp security.cpp
-GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files)) $(GSEC_Other_Sources)
-GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))))
-
-AllObjects = $(GSEC_Objects) $(FBCONFIG_Objects) $(COMMON_Objects) \
- $(CLUMPLETS_Objects) $(OS_SPECIFIC_Objects) $(FBUTILSVC_Objects)
-
-Dependencies = $(AllObjects:.o=.d)
-
-
-.PHONY: all gsec...
[truncated message content] |
|
From: <asf...@us...> - 2010-10-12 17:40:35
|
Revision: 51662
http://firebird.svn.sourceforge.net/firebird/?rev=51662&view=rev
Author: asfernandes
Date: 2010-10-12 17:40:27 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
Misc
Modified Paths:
--------------
firebird/trunk/builds/posix/make.defaults
firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
firebird/trunk/src/auth/SecurityDatabase/pwd.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/classes/alloc.cpp
firebird/trunk/src/common/os/posix/isc_ipc.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/dsql.h
firebird/trunk/src/dsql/node.h
firebird/trunk/src/dsql/utld_proto.h
firebird/trunk/src/include/ProviderInterface.h
firebird/trunk/src/include/fb_exception.h
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/evl.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/flu.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd_proto.h
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/protocol.h
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/yvalve/prepa_proto.h
firebird/trunk/src/yvalve/why.cpp
firebird/trunk/src/yvalve/why_proto.h
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/builds/posix/make.defaults 2010-10-12 17:40:27 UTC (rev 51662)
@@ -91,9 +91,8 @@
#____________________________________________________________________________
+# If this is defined then we use special rules useful for developers only
IsDeveloper = @DEVEL_FLG@
- # If this is defined then we use special rules
- # useful for developers only
CpuType=@CPU_TYPE@
Modified: firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/auth/SecurityDatabase/jrd_pwd.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -117,7 +117,6 @@
class SecurityDatabaseServerInstance : public ServerInstance
{
public:
-
Result startAuthentication(bool isService, const char* dbName,
const unsigned char* dpb, unsigned int dpbSize,
WriterInterface* writerInterface);
Modified: firebird/trunk/src/auth/SecurityDatabase/pwd.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/pwd.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/auth/SecurityDatabase/pwd.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -75,6 +75,7 @@
}
break;
}
+
return 0;
}
@@ -113,6 +114,7 @@
Thread::start(threadTimer, 0, 0);
fb_shutdown_callback(0, stopTimer, fb_shut_preproviders | fb_shut_finish, 0);
}
+
return 1;
}
@@ -125,6 +127,7 @@
{
cnt = 1;
}
+
toRun = function;
}
@@ -213,11 +216,13 @@
void SecurityDatabase::fini()
{
MutexLockGuard guard(mutex);
+
if (lookup_req)
{
isc_release_request(status, &lookup_req);
checkStatus("isc_release_request");
}
+
if (lookup_db)
{
isc_detach_database(status, &lookup_db);
@@ -271,7 +276,9 @@
if (!user.flag || status[1])
break;
+
found = true;
+
if (pwd)
{
strncpy(pwd, user.password, MAX_PASSWORD_LENGTH);
@@ -321,6 +328,7 @@
// ignore status returned in order to keep first error
isc_detach_database(localStatus, &lookup_db);
}
+
checkStatus("isc_compile_request", isc_psw_attach);
}
@@ -333,6 +341,7 @@
ClumpletReader& originalDpb)
{
static AmCache useNative = AM_UNKNOWN;
+
if (useNative == AM_UNKNOWN)
{
// We use PathName for string comparison using platform filename comparison
@@ -340,12 +349,14 @@
const PathName authMethod(Config::getAuthMethod());
useNative = (authMethod == AmNative || authMethod == AmMixed) ? AM_ENABLED : AM_DISABLED;
}
+
if (useNative == AM_DISABLED)
{
return AUTH_CONTINUE;
}
string login, password, passwordEnc;
+
for (originalDpb.rewind(); !originalDpb.isEof(); originalDpb.moveNext())
{
switch (originalDpb.getClumpTag())
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/common/StatusHolder.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -72,7 +72,7 @@
ISC_STATUS vector[40]; // FixMe - may be a kind of dynamic storage will be better?
};
-class LocalStatus : public Firebird::BaseStatus
+class LocalStatus : public BaseStatus
{
public:
virtual void release()
Modified: firebird/trunk/src/common/classes/alloc.cpp
===================================================================
--- firebird/trunk/src/common/classes/alloc.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/common/classes/alloc.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -149,11 +149,13 @@
defaultMemoryManager->~MemoryPool();
defaultMemoryManager = NULL;
}
+
if (default_stats_group)
{
default_stats_group->~MemoryStats();
default_stats_group = NULL;
}
+
if (cache_mutex)
{
cache_mutex->~Mutex();
Modified: firebird/trunk/src/common/os/posix/isc_ipc.cpp
===================================================================
--- firebird/trunk/src/common/os/posix/isc_ipc.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/common/os/posix/isc_ipc.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -119,7 +119,7 @@
public:
Firebird::Mutex mutex;
- explicit SignalMutex(Firebird::MemoryPool&)
+ explicit SignalMutex(Firebird::MemoryPool&)
{
sigActive = true;
}
@@ -128,7 +128,7 @@
Firebird::MutexLockGuard guard(mutex);
sigActive = false;
- for (SIG sig = signals; sig;)
+ for (SIG sig = signals; sig;)
{
SIG sig2 = sig;
sig = sig->sig_next;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/dsql/dsql.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -1292,7 +1292,7 @@
if (node->nod_type == nod_constant)
return (SSHORT) node->getSlong();
- const dsql_par* parameter = (dsql_par*) ExprNode::as<ParameterNode>(node)->dsqlParameter;
+ const dsql_par* parameter = ExprNode::as<ParameterNode>(node)->dsqlParameter;
const dsql_par* null = parameter->par_null;
dsc desc;
Modified: firebird/trunk/src/dsql/dsql.h
===================================================================
--- firebird/trunk/src/dsql/dsql.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/dsql/dsql.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -602,7 +602,7 @@
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 insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
Modified: firebird/trunk/src/dsql/node.h
===================================================================
--- firebird/trunk/src/dsql/node.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/dsql/node.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -255,8 +255,7 @@
* e_<nodename>_count == count of arguments in nod_arg
* This is often used as the count of sub-nodes, but there
* are cases when non-DSQL_NOD arguments are stuffed into nod_arg
- * entries. These include nod_udf, nod_cast,
- * & nod_collate.
+ * entries. These include nod_udf, nod_cast and nod_collate.
*/
enum node_args {
e_select_expr = 0, // nod_select
Modified: firebird/trunk/src/dsql/utld_proto.h
===================================================================
--- firebird/trunk/src/dsql/utld_proto.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/dsql/utld_proto.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -30,5 +30,4 @@
USHORT UTLD_char_length_to_byte_length(USHORT lengthInChars, USHORT maxBytesPerChar);
ISC_STATUS UTLD_copy_status(const ISC_STATUS*, ISC_STATUS*);
-
#endif // DSQL_UTLD_PROTO_H
Modified: firebird/trunk/src/include/ProviderInterface.h
===================================================================
--- firebird/trunk/src/include/ProviderInterface.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/include/ProviderInterface.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -152,7 +152,7 @@
unsigned int msg_type,
unsigned int msg_length, unsigned char* message) = 0; // returns 100 if EOF, 101 if fragmented
// virtual void insert(Status* status, Sqlda* in) = 0;
- virtual void insertMessage(Status* status,
+ virtual void insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message) = 0;
@@ -190,7 +190,7 @@
unsigned int bufferLength, unsigned char* buffer) = 0;
// virtual Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb) = 0;
// second form is tmp - not to rewrite external engines right now
- virtual Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
+ virtual Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
FB_API_HANDLE api) = 0;
virtual Transaction* reconnectTransaction(Status* status, unsigned int length, const unsigned char* id) = 0;
virtual Statement* allocateStatement(Status* status) = 0;
Modified: firebird/trunk/src/include/fb_exception.h
===================================================================
--- firebird/trunk/src/include/fb_exception.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/include/fb_exception.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -148,8 +148,8 @@
// Serialize exception into status_vector
-ISC_STATUS stuff_exception(ISC_STATUS *status_vector, const Firebird::Exception& ex) throw();
-ISC_STATUS stuff_exception(FbApi::Status *status, const Firebird::Exception& ex) throw();
+ISC_STATUS stuff_exception(ISC_STATUS* status_vector, const Firebird::Exception& ex) throw();
+ISC_STATUS stuff_exception(FbApi::Status* status, const Firebird::Exception& ex) throw();
// Put status vector strings into strings buffer
void makePermanentVector(ISC_STATUS* perm, const ISC_STATUS* trans, FB_THREAD_ID thr = getThreadId()) throw();
Modified: firebird/trunk/src/jrd/Attachment.h
===================================================================
--- firebird/trunk/src/jrd/Attachment.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/Attachment.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -226,12 +226,12 @@
unsigned int bufferLength, unsigned char* buffer);
// virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb);
// second form is tmp - not to rewrite external engines right now
- virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
+ virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
FB_API_HANDLE api);
virtual FbApi::Transaction* reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
virtual FbApi::Statement* allocateStatement(Status* status);
virtual FbApi::Request* compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
- virtual FbApi::Transaction* execute(Status* status, FbApi::Transaction* transaction,
+ virtual FbApi::Transaction* execute(Status* status, FbApi::Transaction* 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,
Modified: firebird/trunk/src/jrd/evl.cpp
===================================================================
--- firebird/trunk/src/jrd/evl.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/evl.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -220,6 +220,7 @@
default:
BUGCHECK(229); // msg 229 EVL_assign_to: invalid operation
}
+
return NULL;
}
Modified: firebird/trunk/src/jrd/extds/InternalDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/InternalDS.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/extds/InternalDS.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -117,7 +117,9 @@
{
public:
IntStatus(ISC_STATUS *p)
- : LocalStatus(), v(p) { }
+ : LocalStatus(), v(p)
+ {}
+
~IntStatus()
{
if (v)
@@ -126,6 +128,7 @@
fb_utils::copyStatus(v, ISC_STATUS_LENGTH, s, fb_utils::statusLength(s));
}
}
+
private:
ISC_STATUS *v;
};
@@ -163,9 +166,10 @@
currentProvider()->attachDatabase(&a, &status, 0, m_dbName.c_str(),
m_dpb.getBufferLength(), m_dpb.getBuffer());
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
raise(status, tdbb, "attach");
- }
+
m_attachment = reinterpret_cast<Jrd::Attachment*>(a);
}
@@ -196,6 +200,7 @@
{
status.init();
}
+
if (!status.isSuccess())
{
m_attachment = att;
@@ -359,6 +364,7 @@
jrd_tra* tran = getIntTransaction()->getJrdTran();
LocalStatus status;
+
if (!m_request)
{
fb_assert(!m_allocated);
@@ -366,9 +372,9 @@
m_request = reinterpret_cast<Jrd::dsql_req*>(att->allocateStatement(&status));
m_allocated = (m_request != 0);
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
raise(status, tdbb, "jrd8_allocate_statement", &sql);
- }
{
EngineCallbackGuard guard(tdbb, *this);
@@ -403,14 +409,14 @@
}
m_request = reinterpret_cast<Jrd::dsql_req*>(m_request->
- prepare(&status, tran, sql.length(), sql.c_str(),
+ prepare(&status, tran, sql.length(), sql.c_str(),
m_connection.getSqlDialect(), 0, NULL, 0, NULL));
tran->tra_caller_name = save_caller_name;
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
raise(status, tdbb, "jrd8_prepare", &sql);
- }
const DsqlCompiledStatement* statement = m_request->getStatement();
@@ -495,9 +501,8 @@
0, m_out_buffer.getCount(), m_out_buffer.begin());
}
- if (!status.isSuccess()) {
+ if (!status.isSuccess())
raise(status, tdbb, "jrd8_execute");
- }
}
@@ -514,9 +519,8 @@
0, NULL, 0, 0, NULL);
}
- if (!status.isSuccess()) {
+ if (!status.isSuccess())
raise(status, tdbb, "jrd8_execute");
- }
}
@@ -530,9 +534,9 @@
m_outBlr.getCount(), m_outBlr.begin(), 0,
m_out_buffer.getCount(), m_out_buffer.begin());
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
raise(status, tdbb, "jrd8_fetch");
- }
return (res != 100);
}
@@ -550,6 +554,7 @@
m_request = NULL;
}
}
+
if (!status.isSuccess())
{
m_allocated = m_request = 0;
@@ -609,12 +614,13 @@
USHORT bpb_len = bpb ? bpb->getCount() : 0;
const UCHAR* bpb_buff = bpb ? bpb->begin() : NULL;
- m_blob = reinterpret_cast<Jrd::blb*>(transaction->
- openBlob(&status, &m_blob_id, bpb_len, bpb_buff, att));
+ m_blob = reinterpret_cast<Jrd::blb*>(
+ transaction->openBlob(&status, &m_blob_id, bpb_len, bpb_buff, att));
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
m_connection.raise(status, tdbb, "jrd8_open_blob2");
- }
+
fb_assert(m_blob);
}
@@ -638,9 +644,10 @@
bpb_len, bpb_buff, att));
memcpy(desc.dsc_address, &m_blob_id, sizeof(m_blob_id));
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
m_connection.raise(status, tdbb, "jrd8_create_blob2");
- }
+
fb_assert(m_blob);
}
@@ -654,6 +661,7 @@
EngineCallbackGuard guard(tdbb, m_connection);
result = m_blob->getSegment(&status, len, buff);
}
+
switch (status.get()[1])
{
case isc_segstr_eof:
@@ -678,9 +686,9 @@
EngineCallbackGuard guard(tdbb, m_connection);
m_blob->putSegment(&status, len, buff);
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
m_connection.raise(status, tdbb, "jrd8_put_segment");
- }
}
void InternalBlob::close(thread_db* tdbb)
@@ -691,9 +699,10 @@
EngineCallbackGuard guard(tdbb, m_connection);
m_blob->close(&status);
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
m_connection.raise(status, tdbb, "jrd8_close_blob");
- }
+
fb_assert(!m_blob);
}
@@ -708,9 +717,10 @@
EngineCallbackGuard guard(tdbb, m_connection);
m_blob->cancel(&status);
}
- if (!status.isSuccess()) {
+
+ if (!status.isSuccess())
m_connection.raise(status, tdbb, "jrd8_cancel_blob");
- }
+
fb_assert(!m_blob);
}
Modified: firebird/trunk/src/jrd/flu.cpp
===================================================================
--- firebird/trunk/src/jrd/flu.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/flu.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -139,6 +139,7 @@
{
initialize();
}
+
~UdfDirectoryList()
{
printf("Destroyed directory list\n");
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/jrd.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -419,6 +419,7 @@
{
currentProvider()->shutdown(5000, fb_shutrsn_exit_called);
}
+
UnloadHandler()
{
InstanceControl::registerShutdown(atExitShutdown);
@@ -803,7 +804,7 @@
// Clear the status vector if it doesn't contain a warning
if (status[0] != isc_arg_gds || status[1] != FB_SUCCESS || status[2] != isc_arg_warning)
{
-/* if (return_code != FB_SUCCESS)
+ /*if (return_code != FB_SUCCESS)
{
s->set(Arg::Gds(return_code).value());
}
@@ -831,8 +832,10 @@
return vector->get()[1];
}
- ISC_STATUS* const vectorStart = const_cast<ISC_STATUS*>(vector->get()); // OK as long as we do not change vectors length
- // for current way of keeping strings in vector!
+ // OK as long as we do not change vectors length
+ // for current way of keeping strings in vector!
+
+ ISC_STATUS* const vectorStart = const_cast<ISC_STATUS*>(vector->get());
ISC_STATUS* status = vectorStart;
Array<UCHAR*> buffers;
@@ -999,9 +1002,9 @@
bool invalid_client_SQL_dialect = false;
PathName file_name, expanded_name;
bool is_alias = false;
+
try
{
-
// Process database parameter block
options.get(dpb, dpb_length, invalid_client_SQL_dialect);
@@ -1082,8 +1085,8 @@
bool initing_security = false;
- try {
-
+ try
+ {
// If database to be opened is security database, then only
// gsec or SecurityDatabase may open it. This protects from use
// of old gsec to write wrong password hashes into it.
@@ -1915,7 +1918,7 @@
FbApi::Request* Attachment::compileRequest(Status* user_status,
- unsigned int blr_length, const unsigned char* blr)
+ unsigned int blr_length, const unsigned char* blr)
{
/**************************************
*
@@ -1927,6 +1930,7 @@
*
**************************************/
JrdStatement* stmt = NULL;
+
try
{
ThreadContextHolder tdbb(user_status);
@@ -1968,13 +1972,13 @@
}
successful_completion(user_status);
+
return stmt;
}
FbApi::Blob* jrd_tra::createBlob(Status* user_status, ISC_QUAD* blob_id,
- unsigned int bpb_length, const unsigned char* bpb,
- FbApi::Attachment* apiAtt)
+ unsigned int bpb_length, const unsigned char* bpb, FbApi::Attachment* apiAtt)
{
/**************************************
*
@@ -1987,6 +1991,7 @@
*
**************************************/
blb* blob = NULL;
+
try
{
ThreadContextHolder tdbb(user_status);
@@ -2018,12 +2023,14 @@
}
successful_completion(user_status);
+
return blob;
}
-void Provider::createDatabase(FbApi::Attachment** handle, Status* user_status, FB_API_HANDLE public_handle,
- const char* filename, unsigned int dpb_length, const unsigned char* dpb)
+void Provider::createDatabase(FbApi::Attachment** handle, Status* user_status,
+ FB_API_HANDLE public_handle, const char* filename, unsigned int dpb_length,
+ const unsigned char* dpb)
{
/**************************************
*
@@ -2382,13 +2389,13 @@
{
ex.stuffException(user_status);
}
+
*handle = NULL;
}
-void Attachment::getInfo(Status* user_status,
- unsigned int item_length, const unsigned char* items,
- unsigned int buffer_length, unsigned char* buffer)
+void Attachment::getInfo(Status* user_status, unsigned int item_length, const unsigned char* items,
+ unsigned int buffer_length, unsigned char* buffer)
{
/**************************************
*
@@ -2656,7 +2663,7 @@
* Abort a partially completed blob.
*
**************************************/
- unsigned int l = 0;
+ unsigned int len = 0;
try
{
@@ -2668,36 +2675,34 @@
try
{
- l = BLB_get_segment(tdbb, this, buffer, buffer_length);
+ len = BLB_get_segment(tdbb, this, buffer, buffer_length);
- if (blb_flags & BLB_eof) {
+ if (blb_flags & BLB_eof)
status_exception::raise(Arg::Gds(isc_segstr_eof));
- }
- else if (blb_fragment_size) {
+ else if (blb_fragment_size)
status_exception::raise(Arg::Gds(isc_segment));
- }
}
catch (const Exception& ex)
{
transliterateException(tdbb, ex, user_status);
- return l;
+ return len;
}
}
catch (const Exception& ex)
{
ex.stuffException(user_status);
- return l;
+ return len;
}
successful_completion(user_status);
- return l;
+
+ return len;
}
-int jrd_tra::getSlice(Status* user_status, ISC_QUAD* array_id,
- unsigned int /*sdl_length*/, const unsigned char* sdl,
- unsigned int param_length, const unsigned char* param,
- int slice_length, unsigned char* slice, FbApi::Attachment* apiAtt)
+int jrd_tra::getSlice(Status* user_status, ISC_QUAD* array_id, unsigned int /*sdl_length*/,
+ const unsigned char* sdl, unsigned int param_length, const unsigned char* param,
+ int slice_length, unsigned char* slice, FbApi::Attachment* apiAtt)
{
/**************************************
*
@@ -2729,9 +2734,7 @@
jrd_tra* const transaction = find_transaction(tdbb, isc_segstr_wrong_db);
if (!array_id->gds_quad_low && !array_id->gds_quad_high)
- {
MOVE_CLEAR(slice, slice_length);
- }
else
{
return_length = BLB_get_slice(tdbb, transaction, reinterpret_cast<bid*>(array_id),
@@ -2751,13 +2754,13 @@
}
successful_completion(user_status);
+
return return_length;
}
-FbApi::Blob* jrd_tra::openBlob(Status* user_status, ISC_QUAD* blob_id,
- unsigned int bpb_length, const unsigned char* bpb,
- FbApi::Attachment* apiAtt)
+FbApi::Blob* jrd_tra::openBlob(Status* user_status, ISC_QUAD* blob_id, unsigned int bpb_length,
+ const unsigned char* bpb, FbApi::Attachment* apiAtt)
{
/**************************************
*
@@ -2769,7 +2772,7 @@
* Open an existing blob.
*
**************************************/
- blb *blob = NULL;
+ blb* blob = NULL;
try
{
@@ -2803,12 +2806,12 @@
}
successful_completion(user_status);
+
return blob;
}
-void jrd_tra::prepare(Status* user_status,
- unsigned int msg_length, const unsigned char* msg)
+void jrd_tra::prepare(Status* user_status, unsigned int msg_length, const unsigned char* msg)
{
/**************************************
*
@@ -2846,7 +2849,6 @@
}
successful_completion(user_status);
- return;
}
@@ -2890,11 +2892,9 @@
}
-void jrd_tra::putSlice(Status* user_status, ISC_QUAD* array_id,
- unsigned int /*sdlLength*/, const unsigned char* sdl,
- unsigned int paramLength, const unsigned char* param,
- int sliceLength, unsigned char* slice,
- FbApi::Attachment* apiAtt)
+void jrd_tra::putSlice(Status* user_status, ISC_QUAD* array_id, unsigned int /*sdlLength*/,
+ const unsigned char* sdl, unsigned int paramLength, const unsigned char* param,
+ int sliceLength, unsigned char* slice, FbApi::Attachment* apiAtt)
{
/**************************************
*
@@ -2943,7 +2943,7 @@
FbApi::Events* Attachment::queEvents(Status* user_status, FbApi::EventCallback* callback,
- unsigned int length, const unsigned char* events)
+ unsigned int length, const unsigned char* events)
{
/**************************************
*
@@ -2990,6 +2990,7 @@
}
successful_completion(user_status);
+
return ev;
}
@@ -3038,9 +3039,8 @@
}
-FbApi::Transaction* Attachment::reconnectTransaction(Status* user_status,
- unsigned int length,
- const unsigned char* id)
+FbApi::Transaction* Attachment::reconnectTransaction(Status* user_status, unsigned int length,
+ const unsigned char* id)
{
/**************************************
*
@@ -3079,6 +3079,7 @@
}
successful_completion(user_status);
+
return tra;
}
@@ -3123,9 +3124,8 @@
}
-void JrdStatement::getInfo(Status* user_status, int level,
- unsigned int itemsLength, const unsigned char* items,
- unsigned int bufferLength, unsigned char* buffer)
+void JrdStatement::getInfo(Status* user_status, int level, unsigned int itemsLength,
+ const unsigned char* items, unsigned int bufferLength, unsigned char* buffer)
{
/**************************************
*
@@ -3286,12 +3286,13 @@
}
successful_completion(user_status);
+
return result;
}
void JrdStatement::send(Status* user_status, int level, unsigned int msg_type,
- unsigned int msg_length, const unsigned char* msg)
+ unsigned int msg_length, const unsigned char* msg)
{
/**************************************
*
@@ -3348,11 +3349,12 @@
*
**************************************/
Svc* svc = NULL;
+
try
{
ThreadContextHolder tdbb(user_status);
- svc = new Svc (new Service(service_name, spbLength, spb));
+ svc = new Svc(new Service(service_name, spbLength, spb));
}
catch (const Exception& ex)
{
@@ -3361,6 +3363,7 @@
}
successful_completion(user_status);
+
return svc;
}
@@ -3440,6 +3443,7 @@
// If there is a status vector from a service thread, copy it into the thread status
size_t len, warning;
PARSE_STATUS(svc->getStatus(), len, warning);
+
if (len)
{
user_status->set(len, svc->getStatus());
@@ -3501,7 +3505,7 @@
void JrdStatement::startAndSend(Status* user_status, FbApi::Transaction* tra, int level,
- unsigned int msg_type, unsigned int msg_length, const unsigned char* msg)
+ unsigned int msg_type, unsigned int msg_length, const unsigned char* msg)
{
/**************************************
*
@@ -3780,8 +3784,7 @@
*/
FbApi::Transaction* Attachment::startTransaction(Status* user_status,
- unsigned int tpbLength, const unsigned char* tpb,
- FB_API_HANDLE public_handle)
+ unsigned int tpbLength, const unsigned char* tpb, FB_API_HANDLE public_handle)
{
/**************************************
*
@@ -3813,15 +3816,16 @@
}
successful_completion(user_status);
+
return tra;
}
void jrd_tra::transactRequest(Status* user_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,
- FbApi::Attachment* apiAtt)
+ 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,
+ FbApi::Attachment* apiAtt)
{
/**************************************
*
@@ -3959,8 +3963,8 @@
void jrd_tra::getInfo(Status* user_status,
- unsigned int itemsLength, const unsigned char* items,
- unsigned int bufferLength, unsigned char* buffer)
+ unsigned int itemsLength, const unsigned char* items,
+ unsigned int bufferLength, unsigned char* buffer)
{
/**************************************
*
@@ -4072,17 +4076,19 @@
}
successful_completion(user_status);
+
return stmt;
}
FbApi::Transaction* dsql_req::executeMessage(Status* user_status, FbApi::Transaction* apiTra,
- 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, const unsigned char* out_blr,
- unsigned int /*out_msg_type*/, unsigned int out_msg_length, unsigned char* out_msg)
+ 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, const unsigned char* out_blr,
+ unsigned int /*out_msg_type*/, unsigned int out_msg_length, unsigned char* out_msg)
{
jrd_tra* tra = reinterpret_cast<jrd_tra*>(apiTra);
+
try
{
ThreadContextHolder tdbb(user_status);
@@ -4117,18 +4123,20 @@
}
successful_completion(user_status);
+
return tra;
}
FbApi::Transaction* Attachment::execute(Status* user_status, FbApi::Transaction* apiTra,
- 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)
+ 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)
{
jrd_tra* tra = reinterpret_cast<jrd_tra*>(apiTra);
+
try
{
ThreadContextHolder tdbb(user_status);
@@ -4163,13 +4171,14 @@
}
successful_completion(user_status);
+
return tra;
}
int dsql_req::fetchMessage(Status* user_status,
- unsigned int blr_length, const unsigned char* blr,
- unsigned int /*msg_type*/, unsigned int msg_length, unsigned char* msg)
+ unsigned int blr_length, const unsigned char* blr,
+ unsigned int /*msg_type*/, unsigned int msg_length, unsigned char* msg)
{
int return_code = 0;
@@ -4199,6 +4208,7 @@
}
successful_completion(user_status, return_code);
+
return return_code;
}
@@ -4234,7 +4244,7 @@
void dsql_req::insertMessage(Status* user_status, unsigned int blr_length, const unsigned char* blr,
- unsigned int /*msg_type*/, unsigned int msg_length, const unsigned char* msg)
+ unsigned int /*msg_type*/, unsigned int msg_length, const unsigned char* msg)
{
try
{
@@ -4246,8 +4256,7 @@
try
{
- DSQL_insert(tdbb, this, blr_length, blr,
- /*msg_type,*/ msg_length, msg);
+ DSQL_insert(tdbb, this, blr_length, blr, /*msg_type,*/ msg_length, msg);
}
catch (const Exception& ex)
{
@@ -4338,8 +4347,8 @@
void dsql_req::getInfo(Status* user_status,
- unsigned int item_length, const unsigned char* items,
- unsigned int buffer_length, unsigned char* buffer)
+ unsigned int item_length, const unsigned char* items,
+ unsigned int buffer_length, unsigned char* buffer)
{
try
{
Modified: firebird/trunk/src/jrd/jrd_proto.h
===================================================================
--- firebird/trunk/src/jrd/jrd_proto.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/jrd_proto.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -43,7 +43,7 @@
void jrd_vtof(const char*, char*, SSHORT);
-namespace FbApi
+namespace FbApi
{
class Provider;
}
Modified: firebird/trunk/src/jrd/tra.h
===================================================================
--- firebird/trunk/src/jrd/tra.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/tra.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -335,12 +335,12 @@
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
FbApi::Attachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void 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,
FbApi::Attachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void 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);
Modified: firebird/trunk/src/jrd/trace/TraceManager.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/jrd/trace/TraceManager.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -32,7 +32,7 @@
#include "../../jrd/trace/TraceManager.h"
#include "../../jrd/trace/TraceObjects.h"
#include "../../common/os/path_utils.h"
-#include "../common/ScanDir.h"
+#include "../../common/ScanDir.h"
#ifdef WIN_NT
#include <process.h>
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/remote/client/interface.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -191,12 +191,12 @@
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice,
FbApi::Attachment* att = 0);
- virtual void transactRequest(Status* status,
+ virtual void 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,
FbApi::Attachment* att = 0);
- virtual void prepare(Status* status,
+ virtual void 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);
@@ -261,7 +261,7 @@
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 insertMessage(Status* status,
unsigned int blr_length, const unsigned char* blr,
unsigned int msg_type,
unsigned int msg_length, const unsigned char* message);
@@ -359,12 +359,12 @@
unsigned int bufferLength, unsigned char* buffer);
// virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb);
// second form is tmp - not to rewrite external engines right now
- virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
+ virtual FbApi::Transaction* startTransaction(Status* status, unsigned int tpbLength, const unsigned char* tpb,
FB_API_HANDLE api);
virtual FbApi::Transaction* reconnectTransaction(Status* status, unsigned int length, const unsigned char* id);
virtual FbApi::Statement* allocateStatement(Status* status);
virtual FbApi::Request* compileRequest(Status* status, unsigned int blr_length, const unsigned char* blr);
- virtual FbApi::Transaction* execute(Status* status, FbApi::Transaction* transaction,
+ virtual FbApi::Transaction* execute(Status* status, FbApi::Transaction* 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,
@@ -740,7 +740,7 @@
// Make sure protocol supports action
- if (port->port_protocol < PROTOCOL_VERSION6)
+ if (port->port_protocol < PROTOCOL_VERSION6)
{
unsupported();
}
@@ -2493,7 +2493,7 @@
// make sure the protocol supports it
- if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION7)
+ if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION7)
{
unsupported();
}
@@ -2903,8 +2903,7 @@
}
-void Transaction::prepare(Status* status,
- unsigned int msg_length, const unsigned char* msg)
+void Transaction::prepare(Status* status, unsigned int msg_length, const unsigned char* msg)
{
/**************************************
*
@@ -2932,7 +2931,7 @@
if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION4)
{
- if (msg_length)
+ if (msg_length)
{
unsupported();
}
@@ -3387,8 +3386,7 @@
FbApi::Transaction* Attachment::reconnectTransaction(Status* status,
- unsigned int length,
- const unsigned char* id)
+ unsigned int length, const unsigned char* id)
{
/**************************************
*
@@ -3946,7 +3944,7 @@
// make sure the protocol supports it
- if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION8)
+ if (rdb->rdb_port->port_protocol < PROTOCOL_VERSION8)
{
unsupported();
}
@@ -4899,7 +4897,7 @@
// always clear the complete queue for XNET, as we might
// have incomplete packets
- if (id != request->rrq_id || port->port_type == rem_port::XNET)
+ if (id != request->rrq_id || port->port_type == rem_port::XNET)
{
clear_queue = true;
}
@@ -4925,7 +4923,7 @@
// Walk the que until we find the predecessor of message
- while (message->msg_next != new_msg->msg_next)
+ while (message->msg_next != new_msg->msg_next)
{
message = message->msg_next;
}
@@ -5458,7 +5456,7 @@
-static void init(Status* status,
+static void init(Status* status,
rem_port* port,
P_OP op,
PathName& file_name,
Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/remote/inet.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -504,7 +504,7 @@
rem_port* INET_connect(const TEXT* name,
PACKET* packet,
- USHORT flag,
+ USHORT flag,
Firebird::ClumpletReader* dpb)
{
/**************************************
Modified: firebird/trunk/src/remote/protocol.h
===================================================================
--- firebird/trunk/src/remote/protocol.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/remote/protocol.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -397,7 +397,7 @@
ULONG bid_quad_high;
ULONG bid_quad_low;
- bid& operator=(const ISC_QUAD& v)
+ bid& operator =(const ISC_QUAD& v)
{
bid_quad_high = v.gds_quad_high;
bid_quad_low = v.gds_quad_low;
Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/remote/remote.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -799,6 +799,7 @@
--portCounter;
#endif
}
+
/*
void Rdb::set_async_vector(ISC_STATUS* userStatus) throw()
{
@@ -817,6 +818,7 @@
return rdb_async_thread_id == getThreadId() ? rdb_async_status_vector : rdb_status_vector;
}
*/
+
Rrq::~Rrq()
{
}
Modified: firebird/trunk/src/remote/server/os/posix/inet_server.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -424,7 +424,7 @@
} // extern "C"
-static void set_signal( int signal_number, void (*handler) (int))
+static void set_signal(int signal_number, void (*handler) (int))
{
/**************************************
*
Modified: firebird/trunk/src/yvalve/prepa_proto.h
===================================================================
--- firebird/trunk/src/yvalve/prepa_proto.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/yvalve/prepa_proto.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -28,4 +28,3 @@
bool*, USHORT);
#endif // DSQL_PREPA_PROTO_H
-
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/yvalve/why.cpp 2010-10-12 17:40:27 UTC (rev 51662)
@@ -1107,7 +1107,7 @@
class ProviderPtr // this class may be treated as plain data
{
public:
- ProviderPtr(FbApi::Provider* v, ModuleLoader::Module* m)
+ ProviderPtr(FbApi::Provider* v, ModuleLoader::Module* m)
: p(v), mod(m) { }
FbApi::Provider* get() const
@@ -1682,8 +1682,7 @@
}
-ISC_STATUS API_ROUTINE isc_commit_transaction(ISC_STATUS * user_status,
- FB_API_HANDLE * tra_handle)
+ISC_STATUS API_ROUTINE isc_commit_transaction(ISC_STATUS* user_status, FB_API_HANDLE* tra_handle)
{
/**************************************
*
@@ -1750,8 +1749,7 @@
}
-ISC_STATUS API_ROUTINE isc_commit_retaining(ISC_STATUS * user_status,
- FB_API_HANDLE * tra_handle)
+ISC_STATUS API_ROUTINE isc_commit_retaining(ISC_STATUS* user_status, FB_API_HANDLE* tra_handle)
{
/**************************************
*
@@ -1822,7 +1820,7 @@
YEntry entryGuard(attachment);
nullCheck(req_handle, isc_bad_req_handle);
- rq = attachment->handle->compileRequest(&status, blr_length,
+ rq = attachment->handle->compileRequest(&status, blr_length,
reinterpret_cast<const unsigned char*>(blr));
if (!status.isSuccess())
{
@@ -4243,7 +4241,7 @@
if (sub->handle)
{
sub->handle->rollback(&status);
- if ((!status.isSuccess()) &&
+ if ((!status.isSuccess()) &&
( !is_network_error(status) ||
(transaction->flags & HANDLE_TRANSACTION_limbo) ) )
{
@@ -4332,7 +4330,7 @@
Request request = translate<CRequest>(req_handle);
YEntry entryGuard(request);
- request->handle->send(&status, level, msg_type, msg_length,
+ request->handle->send(&status, level, msg_type, msg_length,
reinterpret_cast<const unsigned char*>(msg));
}
catch (const Exception& e)
@@ -4508,7 +4506,7 @@
Service service = translate<CService>(handle);
service->handle->query(&status, send_item_length, reinterpret_cast<const unsigned char*>(send_items),
- recv_item_length, reinterpret_cast<const unsigned char*>(recv_items),
+ recv_item_length, reinterpret_cast<const unsigned char*>(recv_items),
buffer_length, reinterpret_cast<unsigned char*>(buffer));
}
catch (const Exception& e)
@@ -4687,7 +4685,7 @@
Transaction sub(new CTransaction(tra_handle, ~0));
sub->next = transaction;
}
- else
+ else
{
*tra_handle = transaction->public_handle;
}
@@ -4792,7 +4790,7 @@
transaction->handle->transactRequest(&status, blr_length, reinterpret_cast<unsigned char*>(blr),
in_msg_length, reinterpret_cast<unsigned char*>(in_msg),
- out_msg_length, reinterpret_cast<unsigned char*>(out_msg),
+ out_msg_length, reinterpret_cast<unsigned char*>(out_msg),
attachment->handle);
}
catch (const Exception& e)
@@ -4860,7 +4858,7 @@
Transaction transaction = translate<CTransaction>(tra_handle);
YEntry entryGuard(transaction);
- if (transaction->handle)
+ if (transaction->handle)
{
transaction->handle->getInfo(&status, item_length, items, buffer_length, buffer);
}
@@ -5330,7 +5328,7 @@
transaction->handle->createBlob(&status, blob_id, bpb_length, bpb, attachment->handle) :
transaction->handle->openBlob(&status, blob_id, bpb_length, bpb, attachment->handle);
- if (!status.isSuccess())
+ if (!status.isSuccess())
{
return status[1];
}
Modified: firebird/trunk/src/yvalve/why_proto.h
===================================================================
--- firebird/trunk/src/yvalve/why_proto.h 2010-10-12 13:00:47 UTC (rev 51661)
+++ firebird/trunk/src/yvalve/why_proto.h 2010-10-12 17:40:27 UTC (rev 51662)
@@ -41,9 +41,9 @@
const SCHAR*, USHORT, USHORT, SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_execute2(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, USHORT,
const XSQLDA*, const XSQLDA*);
-ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*,
+ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*,
USHORT, const SCHAR*,
- USHORT, USHORT, const SCHAR*,
+ USHORT, USHORT, const SCHAR*,
USHORT, SCHAR*,
USHORT, USHORT, SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_execute_immediate(ISC_STATUS*, FB_API_HANDLE*,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-13 03:17:26
|
Revision: 51663
http://firebird.svn.sourceforge.net/firebird/?rev=51663&view=rev
Author: firebirds
Date: 2010-10-13 03:17:18 +0000 (Wed, 13 Oct 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-10-12 17:40:27 UTC (rev 51662)
+++ firebird/trunk/ChangeLog 2010-10-13 03:17:18 UTC (rev 51663)
@@ -1,3 +1,787 @@
+ 2010-10-12 17:40 asfernandes
+ M builds/posix/make.defaults
+ M src/auth/SecurityDatabase/jrd_pwd.h
+ M src/auth/SecurityDatabase/pwd.cpp
+ M src/common/StatusHolder.h
+ M src/common/classes/alloc.cpp
+ M src/common/os/posix/isc_ipc.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/dsql/node.h
+ M src/dsql/utld_proto.h
+ M src/include/ProviderInterface.h
+ M src/include/fb_exception.h
+ M src/jrd/Attachment.h
+ M src/jrd/evl.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/flu.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/protocol.h
+ M src/remote/remote.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/yvalve/prepa_proto.h
+ M src/yvalve/why.cpp
+ M src/yvalve/why_proto.h
+Misc
+
+ 2010-10-12 11:38 alexpeshkoff
+ M src/yvalve/keywords.cpp
+Avoid a lot of unneeded dependencies with single #define. This makes us yacc-version dependent, but provided we use own version of btyacc that is not big trouble.
+
+ 2010-10-12 11:36 alexpeshkoff
+ M src/jrd/Attachment.h
+ M src/jrd/Collation.cpp
+ M src/jrd/Collation.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/ExtEngineManager.h
+ M src/jrd/Function.epp
+ M src/jrd/Function.h
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+ M src/jrd/Relation.h
+ M src/jrd/Routine.h
+ M src/jrd/SimilarToMatcher.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/ValuesImpl.cpp
+ M src/jrd/ValuesImpl.h
+ M src/jrd/blb.cpp
+ M src/jrd/blob_filter.cpp
+ M src/jrd/build_no.h
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/cmp_proto.h
+ M src/jrd/dfw.epp
+ M src/jrd/dyn.epp
+ M src/jrd/event.cpp
+ M src/jrd/event_proto.h
+ M src/jrd/evl.cpp
+ M src/jrd/evl_proto.h
+ M src/jrd/exe.cpp
+ M src/jrd/exe.h
+ M src/jrd/execute_statement.cpp
+ M src/jrd/ext.cpp
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/intl_classes.h
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/lls.h
+ M src/jrd/met.epp
+ M src/jrd/met_proto.h
+ M src/jrd/nbak.cpp
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/opt_proto.h
+ M src/jrd/par.cpp
+ M src/jrd/par_proto.h
+ M src/jrd/pcmet.epp
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/recsrc/BitmapTableScan.cpp
+ M src/jrd/recsrc/FilteredStream.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/recsrc/MergeJoin.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/recsrc/RecordSource.cpp
+ M src/jrd/recsrc/RecordSource.h
+ M src/jrd/recsrc/RecursiveStream.cpp
+ M src/jrd/recsrc/Union.cpp
+ M src/jrd/recsrc/VirtualTableScan.cpp
+ M src/jrd/recsrc/WindowedStream.cpp
+ M src/jrd/rse.h
+ M src/jrd/scl.epp
+ M src/jrd/svc.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trig.h
+ M src/jrd/vio.cpp
+Restored a lot of changes, rolled back by me unintentionally
+
+ 2010-10-12 11:34 alexpeshkoff
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+Some more forgotten files
+
+ 2010-10-12 11:33 alexpeshkoff
+ M builds/posix/Makefile.in
+We have to many dependencies on blrtable - build it explicitly at boot phase
+
+ 2010-10-12 09:35 alexpeshkoff
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gsec/gsec.h
+ M src/utilities/gsec/gsec_proto.h
+ M src/utilities/gsec/security.cpp
+Forgotten changes
+
+ 2010-10-12 09:35 alexpeshkoff
+ M builds/posix/make.shared.targets
+Forgotten changes
+
+ 2010-10-12 08:15 alexpeshkoff
+ A src/remote/os
+ A src/remote/os/win32
+ A src/remote/os/win32/wnet.cpp
+ A src/remote/os/win32/wnet_proto.h
+ A src/remote/os/win32/xnet.cpp
+ A src/remote/os/win32/xnet.h
+ A src/remote/os/win32/xnet_proto.h
+ A src/remote/server/os/win32
+ A src/remote/server/os/win32/caution.ico
+ A src/remote/server/os/win32/chop.cpp
+ A src/remote/server/os/win32/chop_proto.h
+ A src/remote/server/os/win32/cntl.cpp
+ A src/remote/server/os/win32/cntl_proto.h
+ A src/remote/server/os/win32/property.cpp
+ A src/remote/server/os/win32/property.rc
+ A src/remote/server/os/win32/property.rh
+ A src/remote/server/os/win32/propty_proto.h
+ A src/remote/server/os/win32/server.ico
+ A src/remote/server/os/win32/srvr_w32.cpp
+ A src/remote/server/os/win32/window.cpp
+ A src/remote/server/os/win32/window.h
+ A src/remote/server/os/win32/window.rc
+ A src/remote/server/os/win32/window.rh
+ A src/remote/server/os/win32/window_proto.h
+Missed in previous commit files
+
+ 2010-10-12 08:02 alexpeshkoff
+ M binreloc.m4
+ A builds/posix/Makefile.in
+ D builds/posix/Makefile.in.boot.gpre
+ D builds/posix/Makefile.in.client.fbudf
+ D builds/posix/Makefile.in.client.gbak
+ D builds/posix/Makefile.in.client.gfix
+ D builds/posix/Makefile.in.client.gpre
+ D builds/posix/Makefile.in.client.gsec
+ D builds/posix/Makefile.in.client.isql
+ D builds/posix/Makefile.in.client.qli
+ D builds/posix/Makefile.in.client.util
+ D builds/posix/Makefile.in.codes
+ D builds/posix/Makefile.in.embed.fbudf
+ D builds/posix/Makefile.in.embed.gbak
+ D builds/posix/Makefile.in.embed.gfix
+ D builds/posix/Makefile.in.embed.gpre
+ D builds/posix/Makefile.in.embed.isql
+ D builds/posix/Makefile.in.embed.qli
+ D builds/posix/Makefile.in.embed.util
+ M builds/posix/Makefile.in.examples
+ D builds/posix/Makefile.in.extern.icu
+ D builds/posix/Makefile.in.extlib
+ D builds/posix/Makefile.in.fbserver
+ D builds/posix/Makefile.in.fbtrace
+ D builds/posix/Makefile.in.firebird
+ D builds/posix/Makefile.in.intl
+ D builds/posix/Makefile.in.libfbclient
+ D builds/posix/Makefile.in.libfbembed
+ D builds/posix/Makefile.in.libfbstatic
+ D builds/posix/Makefile.in.msgs
+ D builds/posix/Makefile.in.plugins
+ M builds/posix/Makefile.in.plugins_examples
+ D builds/posix/Makefile.in.refDatabases
+ D builds/posix/Makefile.in.smp_server
+ D builds/posix/Makefile.in.static.gbak
+ D builds/posix/Makefile.in.static.gpre
+ D builds/posix/Makefile.in.static.isql
+ D builds/posix/Makefile.in.user.management
+ M builds/posix/firebird.vers
+ M builds/posix/make.defaults
+ M builds/posix/make.rules
+ M builds/posix/make.shared.targets
+ M builds/posix/make.shared.variables
+ M configure.in
+ D extern/binreloc
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/alice/alice.cpp
+ M src/alice/alice.h
+ D src/alice/aliceMain.cpp
+ M src/alice/alice_meta.epp
+ M src/alice/alice_proto.h
+ M src/alice/exe.cpp
+ A src/alice/main
+ A src/alice/main/aliceMain.cpp (from /firebird/trunk/src/alice/aliceMain.cpp:51439)
+ M src/alice/tdr.cpp
+ D src/auth/Auth.cpp
+ D src/auth/Auth.h
+ A src/auth/SecurityDatabase/jrd_pwd.h
+ A src/auth/SecurityDatabase/pwd.cpp
+ M src/burp/backup.epp
+ M src/burp/burp.cpp
+ M src/burp/burp.h
+ D src/burp/burpMain.cpp
+ M src/burp/burp_proto.h
+ M src/burp/canonical.cpp
+ A src/burp/main
+ A src/burp/main/burpMain.cpp (from /firebird/trunk/src/burp/burpMain.cpp:51439)
+ M src/burp/mvol.cpp
+ M src/burp/restore.epp
+ D src/burp/spit.cpp
+ D src/burp/spit.h
+ A src/burp/split
+ A src/burp/split/spit.cpp (from /firebird/trunk/src/burp/spit.cpp:51439)
+ A src/burp/split/spit.h (from /firebird/trunk/src/burp/spit.h:51439)
+ A src/common/Auth.cpp (from /firebird/trunk/src/auth/Auth.cpp:51439)
+ A src/common/Auth.h (from /firebird/trunk/src/auth/Auth.h:51439)
+ A src/common/CharSet.cpp (from /firebird/trunk/src/jrd/CharSet.cpp:51439)
+ A src/common/CharSet.h (from /firebird/trunk/src/jrd/CharSet.h:51439)
+ A src/common/CsConvert.h (from /firebird/trunk/src/jrd/CsConvert.h:51439)
+ A src/common/IntlUtil.cpp (from /firebird/trunk/src/jrd/IntlUtil.cpp:51439)
+ A src/common/IntlUtil.h (from /firebird/trunk/src/jrd/IntlUtil.h:51439)
+ A src/common/ScanDir.cpp (from /firebird/trunk/src/config/ScanDir.cpp:51439)
+ A src/common/ScanDir.h (from /firebird/trunk/src/config/ScanDir.h:51439)
+ M src/common/StatusArg.cpp
+ M src/common/StatusHolder.cpp
+ M src/common/StatusHolder.h
+ A src/common/TextType.cpp (from /firebird/trunk/src/jrd/TextType.cpp:51439)
+ A src/common/TextType.h (from /firebird/trunk/src/jrd/TextType.h:51439)
+ A src/common/ThreadData.cpp (from /firebird/trunk/src/jrd/ThreadData.cpp:51439)
+ A src/common/ThreadData.h (from /firebird/trunk/src/jrd/ThreadData.h:51439)
+ A src/common/ThreadStart.cpp (from /firebird/trunk/src/jrd/ThreadStart.cpp:51439)
+ A src/common/ThreadStart.h (from /firebird/trunk/src/jrd/ThreadStart.h:51439)
+ A src/common/call_service.cpp (from /firebird/trunk/src/utilities/gsec/call_service.cpp:51439)
+ A src/common/call_service.h (from /firebird/trunk/src/utilities/gsec/call_service.h:51439)
+ A src/common/cdbtable.h (from /firebird/trunk/src/gpre/cdbtable.h:51439)
+ M src/common/classes/ClumpletReader.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/Interface.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/classes/TempFile.cpp
+ M src/common/classes/UserBlob.cpp
+ M src/common/classes/alloc.cpp
+ D src/common/classes/class_perf.cpp
+ D src/common/classes/class_test.cpp
+ A src/common/classes/misc
+ A src/common/classes/misc/class_perf.cpp (from /firebird/trunk/src/common/classes/class_perf.cpp:51427)
+ A src/common/classes/misc/class_test.cpp (from /firebird/trunk/src/common/classes/class_test.cpp:51427)
+ A src/common/classes/misc/string_test.cmd (from /firebird/trunk/src/common/classes/string_test.cmd:51427)
+ A src/common/classes/misc/string_test.cpp (from /firebird/trunk/src/common/classes/string_test.cpp:51427)
+ A src/common/classes/misc/test.sh (from /firebird/trunk/src/common/classes/test.sh:51427)
+ D src/common/classes/string_test.cmd
+ D src/common/classes/string_test.cpp
+ D src/common/classes/test.sh
+ M src/common/classes/timestamp.h
+ M src/common/config/config.cpp
+ M src/common/config/config_file.cpp
+ M src/common/config/config_file.h
+ M src/common/config/dir_list.cpp
+ A src/common/config/os
+ A src/common/config/os/config_root.h (from /firebird/trunk/src/jrd/os/config_root.h:51427)
+ A src/common/config/os/darwin
+ A src/common/config/os/darwin/config_root.cpp (from /firebird/trunk/src/jrd/os/darwin/config_root.cpp:51427)
+ A src/common/config/os/posix
+ A src/common/config/os/posix/binreloc.c (from /firebird/trunk/extern/binreloc/binreloc.c:51427)
+ A src/common/config/os/posix/binreloc.h (from /firebird/trunk/extern/binreloc/binreloc.h:51427)
+ A src/common/config/os/posix/config_root.cpp (from /firebird/trunk/src/jrd/os/posix/config_root.cpp:51427)
+ A src/common/config/os/win32
+ A src/common/config/os/win32/config_root.cpp (from /firebird/trunk/src/jrd/os/win32/config_root.cpp:51427)
+ M src/common/cvt.cpp
+ A src/common/db_alias.cpp (from /firebird/trunk/src/jrd/db_alias.cpp:51439)
+ A src/common/db_alias.h (from /firebird/trunk/src/jrd/db_alias.h:51439)
+ A src/common/dsc.cpp (from /firebird/trunk/src/jrd/dsc.cpp:51427)
+ A src/common/dsc.h (from /firebird/trunk/src/jrd/dsc.h:51427)
+ A src/common/dsc_proto.h (from /firebird/trunk/src/jrd/dsc_proto.h:51427)
+ A src/common/dsc_pub.h (from /firebird/trunk/src/jrd/dsc_pub.h:51427)
+ A src/common/dyntable.h (from /firebird/trunk/src/gpre/dyntable.h:51439)
+ A src/common/enc.cpp (from /firebird/trunk/src/jrd/enc.cpp:51439)
+ A src/common/enc_proto.h (from /firebird/trunk/src/jrd/enc_proto.h:51439)
+ M src/common/fb_exception.cpp
+ A src/common/intlobj_new.h (from /firebird/trunk/src/jrd/intlobj_new.h:51439)
+ A src/common/isc.cpp (from /firebird/trunk/src/jrd/isc.cpp:51427)
+ A src/common/isc_f_proto.h (from /firebird/trunk/src/jrd/isc_f_proto.h:51439)
+ A src/common/isc_file.cpp (from /firebird/trunk/src/jrd/isc_file.cpp:51439)
+ A src/common/isc_proto.h (from /firebird/trunk/src/jrd/isc_proto.h:51427)
+ A src/common/isc_s_proto.h (from /firebird/trunk/src/jrd/isc_s_proto.h:51439)
+ A src/common/isc_sync.cpp (from /firebird/trunk/src/jrd/isc_sync.cpp:51439)
+ A src/common/os
+ A src/common/os/darwin
+ A src/common/os/darwin/mod_loader.cpp (from /firebird/trunk/src/jrd/os/darwin/mod_loader.cpp:51427)
+ A src/common/os/divorce.h (from /firebird/trunk/src/jrd/divorce.h:51439)
+ A src/common/os/fbsyslog.h (from /firebird/trunk/src/jrd/os/fbsyslog.h:51427)
+ A src/common/os/guid.h (from /firebird/trunk/src/jrd/os/guid.h:51439)
+ A src/common/os/isc_i_proto.h (from /firebird/trunk/src/jrd/os/isc_i_proto.h:51439)
+ A src/common/os/mod_loader.h (from /firebird/trunk/src/jrd/os/mod_loader.h:51427)
+ A src/common/os/os_utils.h (from /firebird/trunk/src/jrd/os/os_utils.h:51427)
+ A src/common/os/path_utils.h (from /firebird/trunk/src/jrd/os/path_utils.h:51427)
+ A src/common/os/posix
+ A src/common/os/posix/divorce.cpp (from /firebird/trunk/src/jrd/divorce.cpp:51439)
+ A src/common/os/posix/fbsyslog.cpp (from /firebird/trunk/src/jrd/os/posix/fbsyslog.cpp:51427)
+ A src/common/os/posix/guid.cpp (from /firebird/trunk/src/jrd/os/posix/guid.cpp:51439)
+ A src/common/os/posix/isc_ipc.cpp (from /firebird/trunk/src/jrd/os/posix/isc_ipc.cpp:51439)
+ A src/common/os/posix/mod_loader.cpp (from /firebird/trunk/src/jrd/os/posix/mod_loader.cpp:51427)
+ A src/common/os/posix/os_utils.cpp (from /firebird/trunk/src/jrd/os/posix/os_utils.cpp:51427)
+ A src/common/os/posix/path_utils.cpp (from /firebird/trunk/src/jrd/os/posix/path_utils.cpp:51427)
+ A src/common/os/win32
+ A src/common/os/win32/fbsyslog.cpp (from /firebird/trunk/src/jrd/os/win32/fbsyslog.cpp:51427)
+ A src/common/os/win32/guid.cpp (from /firebird/trunk/src/jrd/os/win32/guid.cpp:51439)
+ A src/common/os/win32/isc_ipc.cpp (from /firebird/trunk/src/jrd/os/win32/isc_ipc.cpp:51439)
+ A src/common/os/win32/mod_loader.cpp (from /firebird/trunk/src/jrd/os/win32/mod_loader.cpp:51427)
+ A src/common/os/win32/os_utils.cpp (from /firebird/trunk/src/jrd/os/win32/os_utils.cpp:51427)
+ A src/common/os/win32/path_utils.cpp (from /firebird/trunk/src/jrd/os/win32/path_utils.cpp:51427)
+ A src/common/prett_proto.h (from /firebird/trunk/src/gpre/prett_proto.h:51439)
+ A src/common/pretty.cpp (from /firebird/trunk/src/gpre/pretty.cpp:51439)
+ A src/common/quad.cpp (from /firebird/trunk/src/jrd/quad.cpp:51439)
+ A src/common/quad.h (from /firebird/trunk/src/jrd/quad.h:51439)
+ A src/common/quad_proto.h (from /firebird/trunk/src/jrd/quad_proto.h:51439)
+ A src/common/sdl.cpp (from /firebird/trunk/src/jrd/sdl.cpp:51439)
+ A src/common/sdl.h (from /firebird/trunk/src/jrd/sdl.h:51439)
+ A src/common/sdl_proto.h (from /firebird/trunk/src/jrd/sdl_proto.h:51439)
+ A src/common/sdltable.h (from /firebird/trunk/src/gpre/sdltable.h:51439)
+ A src/common/sha.cpp (from /firebird/trunk/src/jrd/sha.cpp:51439)
+ A src/common/sha.h (from /firebird/trunk/src/jrd/sha.h:51439)
+ A src/common/unicode_util.cpp (from /firebird/trunk/src/jrd/unicode_util.cpp:51439)
+ A src/common/unicode_util.h (from /firebird/trunk/src/jrd/unicode_util.h:51439)
+ M src/common/utils.cpp
+ M src/common/utils_proto.h
+ A src/common/xdr.cpp (from /firebird/trunk/src/remote/xdr.cpp:51439)
+ A src/common/xdr.h (from /firebird/trunk/src/remote/xdr.h:51439)
+ A src/common/xdr_proto.h (from /firebird/trunk/src/remote/xdr_proto.h:51439)
+ D src/config/ScanDir.cpp
+ D src/config/ScanDir.h
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/Parser.h
+ D src/dsql/array.epp
+ D src/dsql/array_proto.h
+ D src/dsql/blob.epp
+ D src/dsql/blob_proto.h
+ M src/dsql/btyacc_fb.ske
+ M src/dsql/ddl.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/dsql/dsql_proto.h
+ M src/dsql/errd.cpp
+ M src/dsql/gen.cpp
+ M src/dsql/hsh.cpp
+ D src/dsql/keywords.cpp
+ D src/dsql/keywords.h
+ M src/dsql/make.cpp
+ M src/dsql/metd.epp
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ D src/dsql/prepa_proto.h
+ D src/dsql/preparse.cpp
+ D src/dsql/user__proto.h
+ D src/dsql/user_dsql.cpp
+ M src/dsql/utld.cpp
+ M src/dsql/utld_proto.h
+ D src/gpre/ada.cpp
+ A src/gpre/boot
+ A src/gpre/boot/gpre_meta_boot.cpp (from /firebird/trunk/src/gpre/gpre_meta_boot.cpp:51427)
+ M src/gpre/c_cxx.cpp
+ D src/gpre/cdbtable.h
+ M src/gpre/cme.cpp
+ D src/gpre/cob.cpp
+ D src/gpre/dyntable.cpp
+ D src/gpre/dyntable.h
+ D src/gpre/fbrmclib.cpp
+ D src/gpre/ftn.cpp
+ M src/gpre/gpre.h
+ D src/gpre/gpre_meta.epp
+ D src/gpre/gpre_meta_boot.cpp
+ M src/gpre/int_cxx.cpp
+ A src/gpre/languages
+ A src/gpre/languages/ada.cpp (from /firebird/trunk/src/gpre/ada.cpp:51427)
+ A src/gpre/languages/cob.cpp (from /firebird/trunk/src/gpre/cob.cpp:51427)
+ A src/gpre/languages/fbrmclib.cpp (from /firebird/trunk/src/gpre/fbrmclib.cpp:51427)
+ A src/gpre/languages/ftn.cpp (from /firebird/trunk/src/gpre/ftn.cpp:51427)
+ A src/gpre/languages/pas.cpp (from /firebird/trunk/src/gpre/pas.cpp:51427)
+ A src/gpre/languages/rmc.cpp (from /firebird/trunk/src/gpre/rmc.cpp:51427)
+ M src/gpre/movg.cpp
+ M src/gpre/msc.cpp
+ D src/gpre/pas.cpp
+ D src/gpre/prett_proto.h
+ D src/gpre/pretty.cpp
+ D src/gpre/rmc.cpp
+ D src/gpre/sdltable.h
+ A src/gpre/std
+ A src/gpre/std/gpre_meta.epp (from /firebird/trunk/src/gpre/gpre_meta.epp:51427)
+ A src/include/ProviderInterface.h
+ M src/include/fb_api_proto.h
+ M src/include/fb_blk.h
+ M src/include/fb_exception.h
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/intl/lc_ascii.cpp
+ M src/intl/lc_icu.cpp
+ M src/intl/lc_iso8859_1.cpp
+ M src/intl/lc_narrow.cpp
+ M src/intl/ld.cpp
+ M src/intl/ldcommon.h
+ M src/iscguard/cntl_guard.cpp
+ M src/iscguard/cntlg_proto.h
+ M src/iscguard/iscguard.cpp
+ M src/isql/InputDevices.h
+ M src/isql/extract.epp
+ M src/isql/isql.epp
+ D src/isql/isql_win.cpp
+ D src/isql/isql_win.h
+ D src/isql/isqlw_proto.h
+ M src/isql/iutils.cpp
+ M src/isql/show.epp
+ M src/jrd/Attachment.h
+ D src/jrd/CharSet.cpp
+ D src/jrd/CharSet.h
+ M src/jrd/Collation.cpp
+ M src/jrd/Collation.h
+ D src/jrd/CsConvert.h
+ M src/jrd/DataTypeUtil.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/DatabaseSnapshot.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/ExtEngineManager.h
+ M src/jrd/Function.epp
+ M src/jrd/Function.h
+ M src/jrd/GlobalRWLock.cpp
+ M src/jrd/IntlManager.cpp
+ D src/jrd/IntlUtil.cpp
+ D src/jrd/IntlUtil.h
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+ M src/jrd/PluginManager.cpp
+ M src/jrd/PluginManager.h
+ M src/jrd/PreparedStatement.h
+ M src/jrd/RandomGenerator.cpp
+ D src/jrd/RecordSourceNodes.cpp
+ D src/jrd/RecordSourceNodes.h
+ M src/jrd/Relation.h
+ M src/jrd/ResultSet.h
+ M src/jrd/Routine.h
+ M src/jrd/SimilarToMatcher.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/SysFunction.h
+ M src/jrd/TempSpace.cpp
+ D src/jrd/TextType.cpp
+ D src/jrd/TextType.h
+ D src/jrd/ThreadData.cpp
+ D src/jrd/ThreadData.h
+ D src/jrd/ThreadStart.cpp
+ D src/jrd/ThreadStart.h
+ M src/jrd/UserManagement.cpp
+ M src/jrd/ValueImpl.h
+ M src/jrd/ValuesImpl.cpp
+ M src/jrd/ValuesImpl.h
+ M src/jrd/VirtualTable.cpp
+ M src/jrd/align.h
+ D src/jrd/alt.cpp
+ D src/jrd/alt_proto.h
+ M src/jrd/blb.cpp
+ M src/jrd/blb.h
+ M src/jrd/blob_filter.cpp
+ M src/jrd/btr.cpp
+ M src/jrd/build_no.h
+ M src/jrd/builtin.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/cmp_proto.h
+ M src/jrd/cvt.cpp
+ M src/jrd/cvt2.cpp
+ D src/jrd/db_alias.cpp
+ D src/jrd/db_alias.h
+ D src/jrd/dbg.cpp
+ D src/jrd/dbg.h
+ D src/jrd/dbg_proto.h
+ D src/jrd/dbt.cpp
+ M src/jrd/dfw.epp
+ D src/jrd/divorce.cpp
+ D src/jrd/divorce.h
+ D src/jrd/dmp.cpp
+ D src/jrd/dmp_proto.h
+ M src/jrd/dpm.epp
+ D src/jrd/dsc.cpp
+ D src/jrd/dsc.h
+ D src/jrd/dsc_proto.h
+ D src/jrd/dsc_pub.h
+ M src/jrd/dyn.epp
+ M src/jrd/dyn.h
+ M src/jrd/dyn_def.epp
+ M src/jrd/dyn_del.epp
+ M src/jrd/dyn_mod.epp
+ M src/jrd/dyn_util.epp
+ D src/jrd/enc.cpp
+ D src/jrd/enc_proto.h
+ D src/jrd/entry.h
+ M src/jrd/err.cpp
+ M src/jrd/event.cpp
+ M src/jrd/event.h
+ M src/jrd/event_proto.h
+ M src/jrd/evl.cpp
+ M src/jrd/evl_proto.h
+ D src/jrd/evl_string_test.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/exe.h
+ M src/jrd/execute_statement.cpp
+ M src/jrd/ext.cpp
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/ExtDS.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/InternalDS.h
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/extds/IscDS.h
+ M src/jrd/filters.cpp
+ M src/jrd/flu.cpp
+ M src/jrd/flu.h
+ M src/jrd/fun.epp
+ D src/jrd/gds.cpp
+ D src/jrd/gds_proto.h
+ M src/jrd/gdsassert.h
+ M src/jrd/grant.epp
+ M src/jrd/ibase.h
+ M src/jrd/idx.cpp
+ M src/jrd/inf.cpp
+ M src/jrd/ini.epp
+ M src/jrd/ini.h
+ M src/jrd/intl.cpp
+ M src/jrd/intl.h
+ M src/jrd/intl_builtin.cpp
+ M src/jrd/intl_classes.h
+ D src/jrd/intlobj_new.h
+ D src/jrd/isc.cpp
+ D src/jrd/isc_f_proto.h
+ D src/jrd/isc_file.cpp
+ D src/jrd/isc_proto.h
+ D src/jrd/isc_s_proto.h
+ D src/jrd/isc_sync.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/jrd_proto.h
+ D src/jrd/jrd_pwd.h
+ M src/jrd/lck.cpp
+ M src/jrd/lls.h
+ M src/jrd/met.epp
+ M src/jrd/met_proto.h
+ A src/jrd/misc
+ A src/jrd/misc/evl_string_test.cpp (from /firebird/trunk/src/jrd/evl_string_test.cpp:51651)
+ M src/jrd/mov_proto.h
+ M src/jrd/nbak.cpp
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/opt_proto.h
+ D src/jrd/os/config_root.h
+ D src/jrd/os/darwin/config_root.cpp
+ D src/jrd/os/darwin/mod_loader.cpp
+ D src/jrd/os/fbsyslog.h
+ D src/jrd/os/guid.h
+ D src/jrd/os/isc_i_proto.h
+ D src/jrd/os/mod_loader.h
+ D src/jrd/os/os_utils.h
+ D src/jrd/os/path_utils.h
+ D src/jrd/os/posix/config_root.cpp
+ D src/jrd/os/posix/fbsyslog.cpp
+ D src/jrd/os/posix/guid.cpp
+ D src/jrd/os/posix/isc_ipc.cpp
+ D src/jrd/os/posix/mod_loader.cpp
+ D src/jrd/os/posix/os_utils.cpp
+ D src/jrd/os/posix/path_utils.cpp
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/os/thd_priority.h
+ D src/jrd/os/win32/config_root.cpp
+ D src/jrd/os/win32/fbsyslog.cpp
+ D src/jrd/os/win32/guid.cpp
+ D src/jrd/os/win32/isc_ipc.cpp
+ D src/jrd/os/win32/mod_loader.cpp
+ D src/jrd/os/win32/os_utils.cpp
+ D src/jrd/os/win32/path_utils.cpp
+ M src/jrd/os/win32/thd_priority.cpp
+ M src/jrd/os/win32/winnt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/par.cpp
+ M src/jrd/par_proto.h
+ M src/jrd/pcmet.epp
+ D src/jrd/perf.cpp
+ D src/jrd/perf.h
+ D src/jrd/perf_proto.h
+ D src/jrd/pwd.cpp
+ D src/jrd/qatest.cpp
+ D src/jrd/quad.cpp
+ D src/jrd/quad.h
+ D src/jrd/quad_proto.h
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/recsrc/BitmapTableScan.cpp
+ M src/jrd/recsrc/FilteredStream.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/recsrc/MergeJoin.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/recsrc/RecordSource.cpp
+ M src/jrd/recsrc/RecordSource.h
+ M src/jrd/recsrc/RecursiveStream.cpp
+ M src/jrd/recsrc/Union.cpp
+ M src/jrd/recsrc/VirtualTableScan.cpp
+ M src/jrd/recsrc/WindowedStream.cpp
+ M src/jrd/rse.h
+ M src/jrd/scl.epp
+ D src/jrd/sdl.cpp
+ D src/jrd/sdl.h
+ D src/jrd/sdl_proto.h
+ M src/jrd/sdw.cpp
+ D src/jrd/sha.cpp
+ D src/jrd/sha.h
+ M src/jrd/sort.cpp
+ M src/jrd/sqz.cpp
+ M src/jrd/status.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/svc.h
+ D src/jrd/svc_stub.cpp
+ M src/jrd/svc_tab.h
+ M src/jrd/tpc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceConfigStorage.h
+ M src/jrd/trace/TraceLog.cpp
+ M src/jrd/trace/TraceLog.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/jrd/trace/TraceService.cpp
+ M src/jrd/trace/TraceService.h
+ M src/jrd/trig.h
+ D src/jrd/unicode_util.cpp
+ D src/jrd/unicode_util.h
+ D src/jrd/utl.cpp
+ D src/jrd/utl_proto.h
+ M src/jrd/val.h
+ M src/jrd/validation.cpp
+ M src/jrd/vio.cpp
+ D src/jrd/why.cpp
+ D src/jrd/why_proto.h
+ M src/lock/lock.cpp
+ M src/lock/lock_proto.h
+ M src/lock/print.cpp
+ M src/misc/headers.sed
+ M src/misc/writeBuildNum.sh
+ M src/msgs/build_file.epp
+ M src/msgs/check_msgs.epp
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/all.cpp
+ M src/qli/command.cpp
+ M src/qli/compile.cpp
+ M src/qli/dtr.cpp
+ M src/qli/dtr.h
+ M src/qli/err.cpp
+ M src/qli/eval.cpp
+ M src/qli/exe.cpp
+ M src/qli/gener.cpp
+ M src/qli/help.epp
+ M src/qli/lex.cpp
+ M src/qli/meta.epp
+ M src/qli/mov.cpp
+ M src/qli/picstr.cpp
+ M src/qli/show.epp
+ A src/remote/client
+ A src/remote/client/interface.cpp (from /firebird/trunk/src/remote/interface.cpp:51439)
+ M src/remote/inet.cpp
+ M src/remote/inet_proto.h
+ D src/remote/inet_server.cpp
+ D src/remote/inter_proto.h
+ D src/remote/interface.cpp
+ M src/remote/merge.cpp
+ D src/remote/os
+ M src/remote/parser.cpp
+ M src/remote/protocol.cpp
+ M src/remote/protocol.h
+ M src/remote/remot_proto.h
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ D src/remote/serve_proto.h
+ A src/remote/server
+ A src/remote/server/os (from /firebird/trunk/src/remote/os:51439)
+ A src/remote/server/os/posix
+ A src/remote/server/os/posix/inet_server.cpp (from /firebird/trunk/src/remote/inet_server.cpp:51439)
+ D src/remote/server/os/win32
+ A src/remote/server/serve_proto.h (from /firebird/trunk/src/remote/serve_proto.h:51439)
+ A src/remote/server/server.cpp (from /firebird/trunk/src/remote/server.cpp:51439)
+ D src/remote/server.cpp
+ D src/remote/xdr.cpp
+ D src/remote/xdr.h
+ D src/remote/xdr_proto.h
+ D src/remote/xnet.cpp
+ D src/remote/xnet.h
+ D src/remote/xnet_proto.h
+ M src/utilities/cache.cpp
+ M src/utilities/drop.cpp
+ A src/utilities/fbsvcmgr
+ A src/utilities/fbsvcmgr/fbsvcmgr.cpp (from /firebird/trunk/src/utilities/fbsvcmgr.cpp:51439)
+ D src/utilities/fbsvcmgr.cpp
+ D src/utilities/gsec/call_service.cpp
+ D src/utilities/gsec/call_service.h
+ D src/utilities/gsec/gsecMain.cpp
+ A src/utilities/gsec/main
+ A src/utilities/gsec/main/gsecMain.cpp
+ M src/utilities/gstat/dba.epp
+ D src/utilities/gstat/gstatMain.cpp
+ A src/utilities/gstat/main
+ A src/utilities/gstat/main/gstatMain.cpp (from /firebird/trunk/src/utilities/gstat/gstatMain.cpp:51439)
+ M src/utilities/gstat/ppg.cpp
+ M src/utilities/guard/guard.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/srvrmgr.cpp
+ A src/utilities/nbackup/main
+ A src/utilities/nbackup/main/nbkMain.cpp (from /firebird/trunk/src/utilities/nbackup/nbkMain.cpp:51439)
+ A src/utilities/nbackup/nbackup.cpp (from /firebird/trunk/src/utilities/nbackup.cpp:51439)
+ D src/utilities/nbackup/nbkMain.cpp
+ M src/utilities/nbackup/nbk_proto.h
+ D src/utilities/nbackup.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/TraceUnicodeUtils.h
+ D src/utilities/ntrace/os/posix/FileObject.cpp
+ A src/utilities/ntrace/os/posix/misc
+ A src/utilities/ntrace/os/posix/misc/FileObject.cpp (from /firebird/trunk/src/utilities/ntrace/os/posix/FileObject.cpp:51439)
+ M src/utilities/print_event.cpp
+ M src/utilities/rebuild/rebuild.cpp
+ M src/utilities/rebuild/rmet.epp
+ M src/utilities/rebuild/rstore.epp
+ M src/utilities/run_service.cpp
+ A src/yvalve
+ A src/yvalve/alt.cpp (from /firebird/trunk/src/jrd/alt.cpp:51439)
+ A src/yvalve/alt_proto.h (from /firebird/trunk/src/jrd/alt_proto.h:51439)
+ A src/yvalve/array.epp (from /firebird/trunk/src/dsql/array.epp:51439)
+ A src/yvalve/array_proto.h (from /firebird/trunk/src/dsql/array_proto.h:51439)
+ A src/yvalve/blob.epp (from /firebird/trunk/src/dsql/blob.epp:51439)
+ A src/yvalve/blob_proto.h (from /firebird/trunk/src/dsql/blob_proto.h:51439)
+ A src/yvalve/gds.cpp (from /firebird/trunk/src/jrd/gds.cpp:51439)
+ A src/yvalve/gds_proto.h (from /firebird/trunk/src/jrd/gds_proto.h:51439)
+ A src/yvalve/keywords.cpp (from /firebird/trunk/src/dsql/keywords.cpp:51439)
+ A src/yvalve/keywords.h (from /firebird/trunk/src/dsql/keywords.h:51439)
+ A src/yvalve/perf.cpp (from /firebird/trunk/src/jrd/perf.cpp:51439)
+ A src/yvalve/perf.h (from /firebird/trunk/src/jrd/perf.h:51439)
+ A src/yvalve/perf_proto.h (from /firebird/trunk/src/jrd/perf_proto.h:51439)
+ A src/yvalve/prepa_proto.h (from /firebird/trunk/src/dsql/prepa_proto.h:51439)
+ A src/yvalve/preparse.cpp (from /firebird/trunk/src/dsql/preparse.cpp:51439)
+ A src/yvalve/user__proto.h (from /firebird/trunk/src/dsql/user__proto.h:51439)
+ A src/yvalve/user_dsql.cpp (from /firebird/trunk/src/dsql/user_dsql.cpp:51439)
+ A src/yvalve/utl.cpp (from /firebird/trunk/src/jrd/utl.cpp:51439)
+ A src/yvalve/utl_proto.h (from /firebird/trunk/src/jrd/utl_proto.h:51439)
+ A src/yvalve/utly.cpp (from /firebird/trunk/src/dsql/utld.cpp:51439)
+ A src/yvalve/utly_proto.h (from /firebird/trunk/src/dsql/utld_proto.h:51439)
+ A src/yvalve/why.cpp (from /firebird/trunk/src/jrd/why.cpp:51439)
+ A src/yvalve/why_proto.h (from /firebird/trunk/src/jrd/why_proto.h:51439)
+OSRI and new posix build
+
2010-10-09 18:39 asfernandes
M src/dsql/ExprNodes.cpp
M src/dsql/ExprNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-12 17:40:27 UTC (rev 51662)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-13 03:17:18 UTC (rev 51663)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28758
+ FORMAL BUILD NUMBER:28767
*/
-#define PRODUCT_VER_STRING "3.0.0.28758"
-#define FILE_VER_STRING "WI-T3.0.0.28758"
-#define LICENSE_VER_STRING "WI-T3.0.0.28758"
-#define FILE_VER_NUMBER 3, 0, 0, 28758
+#define PRODUCT_VER_STRING "3.0.0.28767"
+#define FILE_VER_STRING "WI-T3.0.0.28767"
+#define LICENSE_VER_STRING "WI-T3.0.0.28767"
+#define FILE_VER_NUMBER 3, 0, 0, 28767
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28758"
+#define FB_BUILD_NO "28767"
#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-10-12 17:40:27 UTC (rev 51662)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-13 03:17:18 UTC (rev 51663)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28758
+BuildNum=28767
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...> - 2010-10-13 09:15:55
|
Revision: 51666
http://firebird.svn.sourceforge.net/firebird/?rev=51666&view=rev
Author: alexpeshkoff
Date: 2010-10-13 09:15:48 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Full fix for CORE-3024
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/jrd/evl.cpp
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2010-10-13 09:15:48 UTC (rev 51666)
@@ -1450,8 +1450,10 @@
PARAMETER (GDS__private_function = 335545018)
INTEGER*4 GDS__private_procedure
PARAMETER (GDS__private_procedure = 335545019)
+ INTEGER*4 GDS__request_outdated
+ PARAMETER (GDS__request_outdated = 335545020)
INTEGER*4 GDS__bad_events_handle
- PARAMETER (GDS__bad_events_handle = 335545020)
+ PARAMETER (GDS__bad_events_handle = 335545021)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2010-10-13 09:15:48 UTC (rev 51666)
@@ -732,7 +732,8 @@
gds_async_active = 335545017;
gds_private_function = 335545018;
gds_private_procedure = 335545019;
- gds_bad_events_handle = 335545020;
+ gds_request_outdated = 335545020;
+ gds_bad_events_handle = 335545021;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/include/gen/codetext.h 2010-10-13 09:15:48 UTC (rev 51666)
@@ -721,7 +721,8 @@
{"async_active", 335545017},
{"private_function", 335545018},
{"private_procedure", 335545019},
- {"bad_events_handle", 335545020},
+ {"request_outdated", 335545020},
+ {"bad_events_handle", 335545021},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/include/gen/iberror.h 2010-10-13 09:15:48 UTC (rev 51666)
@@ -755,7 +755,8 @@
const ISC_STATUS isc_async_active = 335545017L;
const ISC_STATUS isc_private_function = 335545018L;
const ISC_STATUS isc_private_procedure = 335545019L;
-const ISC_STATUS isc_bad_events_handle = 335545020L;
+const ISC_STATUS isc_request_outdated = 335545020L;
+const ISC_STATUS isc_bad_events_handle = 335545021L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1174,7 +1175,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1118;
+const ISC_STATUS isc_err_max = 1119;
#else /* c definitions */
@@ -1899,7 +1900,8 @@
#define isc_async_active 335545017L
#define isc_private_function 335545018L
#define isc_private_procedure 335545019L
-#define isc_bad_events_handle 335545020L
+#define isc_request_outdated 335545020L
+#define isc_bad_events_handle 335545021L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2318,7 +2320,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1118
+#define isc_err_max 1119
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/include/gen/msgs.h 2010-10-13 09:15:48 UTC (rev 51666)
@@ -724,7 +724,8 @@
{335545017, "Asynchronous call is already running for this attachment"}, /* async_active */
{335545018, "Function @1 is private to package @2"}, /* private_function */
{335545019, "Procedure @1 is private to package @2"}, /* private_procedure */
- {335545020, "invalid events id (handle)"}, /* bad_events_handle */
+ {335545020, "Request can't access new records in relation @1 and should be recompiled"}, /* request_outdated */
+ {335545021, "invalid events id (handle)"}, /* bad_events_handle */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/include/gen/sql_code.h 2010-10-13 09:15:48 UTC (rev 51666)
@@ -720,7 +720,8 @@
{335545017, -532}, /* 697 async_active */
{335545018, -901}, /* 698 private_function */
{335545019, -901}, /* 699 private_procedure */
- {335545020, -901}, /* 700 bad_events_handle */
+ {335545020, -904}, /* 700 request_outdated */
+ {335545021, -901}, /* 701 bad_events_handle */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/include/gen/sql_state.h 2010-10-13 09:15:48 UTC (rev 51666)
@@ -720,7 +720,8 @@
{335545017, "HY018"}, // 697 async_active
{335545018, "42000"}, // 698 private_function
{335545019, "42000"}, // 699 private_procedure
- {335545020, "08003"}, // 700 bad_events_handle
+ {335545020, "24000"}, // 700 request_outdated
+ {335545021, "08003"}, // 701 bad_events_handle
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/evl.cpp
===================================================================
--- firebird/trunk/src/jrd/evl.cpp 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/jrd/evl.cpp 2010-10-13 09:15:48 UTC (rev 51666)
@@ -410,37 +410,42 @@
// ASF: CORE-1432 - If the the record is not on the latest format, upgrade it.
// AP: for fields that are missing in original format use record's one.
- if (compileFormat &&
- record->rec_format->fmt_version != compileFormat->fmt_version &&
- id < compileFormat->fmt_desc.getCount() &&
- !DSC_EQUIV(&impure->vlu_desc, &compileFormat->fmt_desc[id], true))
+ if (compileFormat && record->rec_format->fmt_version != compileFormat->fmt_version)
{
- dsc desc = impure->vlu_desc;
- impure->vlu_desc = compileFormat->fmt_desc[id];
+ if (record->rec_format->fmt_version > compileFormat->fmt_version)
+ {
+ ERR_post(Arg::Gds(isc_request_outdated) << rpb.rpb_relation->rel_name);
+ }
- if (impure->vlu_desc.isText())
+ if (!DSC_EQUIV(&impure->vlu_desc, &compileFormat->fmt_desc[id], true))
{
- // Allocate a string block of sufficient size.
- VaryingString* string = impure->vlu_string;
- if (string && string->str_length < impure->vlu_desc.dsc_length)
+ dsc desc = impure->vlu_desc;
+ impure->vlu_desc = compileFormat->fmt_desc[id];
+
+ if (impure->vlu_desc.isText())
{
- delete string;
- string = NULL;
- }
+ // Allocate a string block of sufficient size.
+ VaryingString* string = impure->vlu_string;
+ if (string && string->str_length < impure->vlu_desc.dsc_length)
+ {
+ delete string;
+ string = NULL;
+ }
- if (!string)
- {
- string = impure->vlu_string = FB_NEW_RPT(*tdbb->getDefaultPool(),
- impure->vlu_desc.dsc_length) VaryingString();
- string->str_length = impure->vlu_desc.dsc_length;
+ if (!string)
+ {
+ string = impure->vlu_string = FB_NEW_RPT(*tdbb->getDefaultPool(),
+ impure->vlu_desc.dsc_length) VaryingString();
+ string->str_length = impure->vlu_desc.dsc_length;
+ }
+
+ impure->vlu_desc.dsc_address = string->str_data;
}
+ else
+ impure->vlu_desc.dsc_address = (UCHAR*) &impure->vlu_misc;
- impure->vlu_desc.dsc_address = string->str_data;
+ MOV_move(tdbb, &desc, &impure->vlu_desc);
}
- else
- impure->vlu_desc.dsc_address = (UCHAR*) &impure->vlu_misc;
-
- MOV_move(tdbb, &desc, &impure->vlu_desc);
}
}
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/msgs/facilities2.sql 2010-10-13 09:15:48 UTC (rev 51666)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2010-10-11 19:51:12', 'JRD', 0, 701)
+('2010-10-13 12:38:13', 'JRD', 0, 702)
('2010-03-15 06:59:09', 'QLI', 1, 531)
--
--('2008-11-28 20:27:04', 'GDEF', 2, 346)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/msgs/messages2.sql 2010-10-13 09:15:48 UTC (rev 51666)
@@ -807,7 +807,8 @@
('async_active', 'REM_cancel_operation', 'interface.cpp', NULL, 0, 697, NULL, 'Asynchronous call is already running for this attachment', NULL, NULL)
('private_function', 'METD_get_function', 'metd.epp', NULL, 0, 698, NULL, 'Function @1 is private to package @2', NULL, NULL)
('private_procedure', 'METD_get_procedure', 'metd.epp', NULL, 0, 699, NULL, 'Procedure @1 is private to package @2', NULL, NULL)
-('bad_events_handle', NULL, NULL, NULL, 0, 700, NULL, 'invalid events id (handle)', NULL, NULL);
+('request_outdated', 'EVL_expr', 'evl.cpp', NULL, 0, 700, NULL, 'Request can''t access new records in relation @1 and should be recompiled', NULL, NULL)
+('bad_events_handle', NULL, NULL, NULL, 0, 701, NULL, 'invalid events id (handle)', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2010-10-13 07:42:07 UTC (rev 51665)
+++ firebird/trunk/src/msgs/system_errors2.sql 2010-10-13 09:15:48 UTC (rev 51666)
@@ -705,7 +705,8 @@
(-532, 'HY', '018', 0, 697, 'async_active', NULL, NULL)
(-901, '42', '000', 0, 698, 'private_function', NULL, NULL)
(-901, '42', '000', 0, 699, 'private_procedure', NULL, NULL)
-(-901, '08', '003', 0, 700, 'bad_events_handle', NULL, 'ERROR')
+(-904, '24', '000', 0, 700, 'request_outdated', NULL, NULL)
+(-901, '08', '003', 0, 701, 'bad_events_handle', NULL, 'ERROR')
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2010-10-13 09:37:26
|
Revision: 51669
http://firebird.svn.sourceforge.net/firebird/?rev=51669&view=rev
Author: alexpeshkoff
Date: 2010-10-13 09:37:18 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
cleanup
Added Paths:
-----------
firebird/trunk/builds/install/arch-specific/solx86gcc/
Removed Paths:
-------------
firebird/trunk/src/install/arch-specific/solx86gcc/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-14 03:15:24
|
Revision: 51680
http://firebird.svn.sourceforge.net/firebird/?rev=51680&view=rev
Author: firebirds
Date: 2010-10-14 03:15:15 +0000 (Thu, 14 Oct 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-10-13 23:11:40 UTC (rev 51679)
+++ firebird/trunk/ChangeLog 2010-10-14 03:15:15 UTC (rev 51680)
@@ -1,3 +1,366 @@
+ 2010-10-13 17:48 hvlad
+ M src/yvalve/gds.cpp
+ M src/yvalve/why.cpp
+Corrections for new build system. Work in progress...
+
+ 2010-10-13 13:35 alexpeshkoff
+ M src/jrd/evl.cpp
+Temporary disable suggested by me solution for request format check - needs better checks, as is breaks CREATE DATABASE
+
+ 2010-10-13 10:39 alexpeshkoff
+ M src/alice/alice.cpp
+ M src/alice/alice_meta.epp
+ M src/alice/aliceswi.h
+ M src/alice/exe.cpp
+ M src/alice/tdr.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/pwd.cpp
+ M src/burp/backup.epp
+ M src/burp/burp.cpp
+ M src/burp/burp.h
+ M src/burp/burpswi.h
+ M src/burp/canonical.cpp
+ M src/burp/mvol.cpp
+ M src/burp/restore.epp
+ M src/burp/split/spit.cpp
+ M src/burp/split/spit.h
+ M src/common/ScanDir.cpp
+ M src/common/ThreadData.cpp
+ M src/common/ThreadStart.cpp
+ M src/common/call_service.cpp
+ M src/common/classes/DbImplementation.cpp
+ M src/common/classes/MsgPrint.cpp
+ M src/common/classes/PublicHandle.cpp
+ M src/common/classes/RefCounted.h
+ M src/common/classes/SafeArg.cpp
+ M src/common/classes/TempFile.cpp
+ M src/common/classes/UserBlob.cpp
+ M src/common/classes/alloc.cpp
+ M src/common/classes/array.h
+ M src/common/classes/condition.h
+ M src/common/classes/locks.cpp
+ M src/common/classes/locks.h
+ M src/common/classes/semaphore.h
+ M src/common/classes/timestamp.cpp
+ M src/common/classes/tree.h
+ M src/common/classes/vector.h
+ A src/common/common.h (from /firebird/trunk/src/jrd/common.h:51669)
+ M src/common/config/os/darwin/config_root.cpp
+ M src/common/cvt.cpp
+ M src/common/dsc.cpp
+ M src/common/enc.cpp
+ A src/common/file_params.h (from /firebird/trunk/src/jrd/file_params.h:51669)
+ A src/common/gdsassert.h (from /firebird/trunk/src/jrd/gdsassert.h:51669)
+ M src/common/isc.cpp
+ M src/common/isc_file.cpp
+ M src/common/isc_sync.cpp
+ M src/common/os/posix/divorce.cpp
+ M src/common/os/posix/isc_ipc.cpp
+ M src/common/os/posix/mod_loader.cpp
+ M src/common/os/posix/os_utils.cpp
+ M src/common/os/win32/isc_ipc.cpp
+ M src/common/os/win32/os_utils.cpp
+ M src/common/pretty.cpp
+ M src/common/sdl.cpp
+ M src/common/thd.cpp
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/common/xdr.cpp
+ M src/common/xdr.h
+ M src/dsql/AggNodes.cpp
+ M src/dsql/AggNodes.h
+ M src/dsql/BlrWriter.cpp
+ M src/dsql/BlrWriter.h
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/BoolNodes.h
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/PackageNodes.epp
+ M src/dsql/PackageNodes.h
+ M src/dsql/Parser.h
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/WinNodes.cpp
+ M src/dsql/WinNodes.h
+ M src/dsql/dsql.h
+ M src/dsql/errd.cpp
+ M src/dsql/movd.cpp
+ M src/dsql/parse.y
+ M src/dsql/sym.h
+ M src/extlib/fbudf/stdafx.h
+ M src/extlib/ib_udf.h
+ M src/extlib/ib_util.cpp
+ M src/gpre/c_cxx.cpp
+ M src/gpre/exp.cpp
+ M src/gpre/gpre.h
+ M src/gpre/gpreswi.h
+ M src/gpre/int_cxx.cpp
+ M src/gpre/jrdmet.cpp
+ M src/gpre/languages/ada.cpp
+ M src/gpre/languages/cob.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/languages/pas.cpp
+ M src/gpre/languages/rmc.cpp
+ M src/gpre/movg.cpp
+ M src/include/old_fb_blk.h
+ M src/intl/kanji.cpp
+ M src/intl/ldcommon.h
+ M src/intl/utils/mapdump.c
+ M src/intl/utils/mapgen4.c
+ M src/intl/utils/maptest.cpp
+ M src/iscguard/cntl_guard.cpp
+ M src/iscguard/iscguard.cpp
+ M src/isql/InputDevices.cpp
+ M src/isql/OptionsBase.cpp
+ M src/isql/extract.epp
+ M src/isql/isql.epp
+ M src/isql/iutils.cpp
+ M src/isql/show.epp
+ M src/jrd/Attachment.h
+ M src/jrd/DataTypeUtil.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/ExtEngineManager.h
+ M src/jrd/Function.epp
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/PluginManager.h
+ M src/jrd/PreparedStatement.h
+ M src/jrd/RecordBuffer.cpp
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/RecordSourceNodes.h
+ M src/jrd/ResultSet.h
+ M src/jrd/RuntimeStatistics.cpp
+ M src/jrd/TempSpace.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/ValueImpl.h
+ M src/jrd/VirtualTable.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/blob_filter.cpp
+ M src/jrd/btn.cpp
+ M src/jrd/btn.h
+ M src/jrd/btr.cpp
+ M src/jrd/builtin.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/cmp.cpp
+ D src/jrd/common.h
+ M src/jrd/cvt.cpp
+ M src/jrd/cvt2.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/dpm.epp
+ M src/jrd/dyn.epp
+ M src/jrd/dyn_def.epp
+ M src/jrd/dyn_del.epp
+ M src/jrd/dyn_mod.epp
+ M src/jrd/dyn_util.epp
+ M src/jrd/err.cpp
+ M src/jrd/event.cpp
+ M src/jrd/event.h
+ M src/jrd/evl.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/execute_statement.cpp
+ M src/jrd/ext.cpp
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/IscDS.cpp
+ D src/jrd/file_params.h
+ M src/jrd/filters.cpp
+ M src/jrd/flu.cpp
+ M src/jrd/fun.epp
+ D src/jrd/gdsassert.h
+ M src/jrd/grant.epp
+ M src/jrd/idx.cpp
+ M src/jrd/inf.cpp
+ M src/jrd/ini.epp
+ M src/jrd/intl.cpp
+ M src/jrd/intl_builtin.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/lck.cpp
+ M src/jrd/met.epp
+ M src/jrd/mov.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/nodebug.cpp
+ M src/jrd/ntrace.h
+ M src/jrd/ods.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/os/vms/vmsevent.cpp
+ M src/jrd/os/vms/vmslock.cpp
+ M src/jrd/os/win32/thd_priority.cpp
+ M src/jrd/os/win32/winnt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/par.cpp
+ M src/jrd/pcmet.epp
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/recsrc/BitmapTableScan.cpp
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/Cursor.cpp
+ M src/jrd/recsrc/FilteredStream.cpp
+ M src/jrd/recsrc/FirstRowsStream.cpp
+ M src/jrd/recsrc/FullOuterJoin.cpp
+ M src/jrd/recsrc/FullTableScan.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/jrd/recsrc/IndexTableScan.cpp
+ M src/jrd/recsrc/LockedStream.cpp
+ M src/jrd/recsrc/MergeJoin.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/recsrc/RecordSource.cpp
+ M src/jrd/recsrc/RecursiveStream.cpp
+ M src/jrd/recsrc/SingularStream.cpp
+ M src/jrd/recsrc/SkipRowsStream.cpp
+ M src/jrd/recsrc/SortedStream.cpp
+ M src/jrd/recsrc/Union.cpp
+ M src/jrd/recsrc/WindowedStream.cpp
+ M src/jrd/rlck.cpp
+ M src/jrd/rpb_chain.cpp
+ M src/jrd/rpb_chain.h
+ M src/jrd/scl.epp
+ M src/jrd/sdw.cpp
+ M src/jrd/shut.cpp
+ M src/jrd/sort.cpp
+ M src/jrd/sort.h
+ M src/jrd/sqz.cpp
+ M src/jrd/status.cpp
+ M src/jrd/status.h
+ M src/jrd/svc.cpp
+ M src/jrd/tpc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceLog.cpp
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/validation.cpp
+ M src/jrd/vio.cpp
+ M src/lock/driver.cpp
+ M src/lock/lock.cpp
+ M src/lock/lock_proto.h
+ M src/lock/print.cpp
+ M src/misc/blrtable.cpp
+ M src/misc/codes.epp
+ M src/msgs/build_file.epp
+ M src/msgs/change_msgs.epp
+ M src/msgs/check_msgs.epp
+ M src/msgs/enter_msgs.epp
+ M src/msgs/include.epp
+ M src/msgs/load.epp
+ M src/msgs/modify_msgs.epp
+ M src/qli/compile.cpp
+ M src/qli/dtr.h
+ M src/qli/eval.cpp
+ M src/qli/exe.cpp
+ M src/qli/gener.cpp
+ M src/qli/lex.cpp
+ M src/qli/mov.cpp
+ M src/qli/parse.cpp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/parser.cpp
+ M src/remote/protocol.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/chop.cpp
+ M src/remote/server/os/win32/cntl.cpp
+ M src/remote/server/os/win32/property.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/os/win32/window.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/analyse.cpp
+ M src/utilities/cache.cpp
+ M src/utilities/create_db.cpp
+ M src/utilities/drop.cpp
+ M src/utilities/fbcpl/stdafx.h
+ M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gsec/gsecswi.h
+ M src/utilities/gsec/security.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/gstat/dbaswi.h
+ M src/utilities/gstat/ppg.cpp
+ M src/utilities/guard/guard.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/ibmgr.cpp
+ M src/utilities/ibmgr/ibmgrswi.h
+ M src/utilities/ibmgr/srvrmgr.cpp
+ M src/utilities/install/install.cpp
+ M src/utilities/install/install_client.cpp
+ M src/utilities/install/install_reg.cpp
+ M src/utilities/install/install_svc.cpp
+ M src/utilities/install/registry.cpp
+ M src/utilities/install/services.cpp
+ M src/utilities/nbackup/nbackup.cpp
+ M src/utilities/nbackup/nbkswi.h
+ M src/utilities/ntrace/os/FileObject.h
+ M src/utilities/print_event.cpp
+ M src/utilities/print_pool.cpp
+ M src/utilities/rebuild/rebuild.cpp
+ M src/utilities/rebuild/rebuild.h
+ M src/utilities/relay.cpp
+ M src/utilities/run_service.cpp
+ M src/yvalve/alt.cpp
+ M src/yvalve/array.epp
+ M src/yvalve/blob.epp
+ M src/yvalve/gds.cpp
+ M src/yvalve/gds_proto.h
+ M src/yvalve/keywords.h
+ M src/yvalve/perf.cpp
+ M src/yvalve/preparse.cpp
+ M src/yvalve/user_dsql.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Moved some more .h-files to common from jrd as Vlad suggested
+
+ 2010-10-13 09:39 alexpeshkoff
+ D src/install
+cleanup
+
+ 2010-10-13 09:37 alexpeshkoff
+ A builds/install/arch-specific/solx86gcc (from /firebird/trunk/src/install/arch-specific/solx86gcc:51665)
+ D src/install/arch-specific/solx86gcc
+cleanup
+
+ 2010-10-13 09:34 alexpeshkoff
+ D src/config
+cleanup
+
+ 2010-10-13 09:23 hvlad
+ M src/common/ThreadStart.cpp
+ M src/common/config/os/win32/config_root.cpp
+ M src/common/isc_sync.cpp
+Corrections for new build system. Work in progress...
+
+ 2010-10-13 09:15 alexpeshkoff
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/jrd/evl.cpp
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+Full fix for CORE-3024
+
+ 2010-10-13 07:42 alexpeshkoff
+ M configure.in
+Syntax
+
+ 2010-10-13 05:50 alexpeshkoff
+ A src/jrd/RecordSourceNodes.cpp
+ A src/jrd/RecordSourceNodes.h
+More lost files
+
2010-10-12 17:40 asfernandes
M builds/posix/make.defaults
M src/auth/SecurityDatabase/jrd_pwd.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-13 23:11:40 UTC (rev 51679)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-14 03:15:15 UTC (rev 51680)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28767
+ FORMAL BUILD NUMBER:28777
*/
-#define PRODUCT_VER_STRING "3.0.0.28767"
-#define FILE_VER_STRING "WI-T3.0.0.28767"
-#define LICENSE_VER_STRING "WI-T3.0.0.28767"
-#define FILE_VER_NUMBER 3, 0, 0, 28767
+#define PRODUCT_VER_STRING "3.0.0.28777"
+#define FILE_VER_STRING "WI-T3.0.0.28777"
+#define LICENSE_VER_STRING "WI-T3.0.0.28777"
+#define FILE_VER_NUMBER 3, 0, 0, 28777
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28767"
+#define FB_BUILD_NO "28777"
#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-10-13 23:11:40 UTC (rev 51679)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-14 03:15:15 UTC (rev 51680)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28767
+BuildNum=28777
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-10-15 03:15:06
|
Revision: 51696
http://firebird.svn.sourceforge.net/firebird/?rev=51696&view=rev
Author: firebirds
Date: 2010-10-15 03:14:59 +0000 (Fri, 15 Oct 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-10-15 01:55:57 UTC (rev 51695)
+++ firebird/trunk/ChangeLog 2010-10-15 03:14:59 UTC (rev 51696)
@@ -1,3 +1,47 @@
+ 2010-10-15 01:55 asfernandes
+ M src/jrd/met.epp
+ M src/utilities/gstat/dba.epp
+Misc
+
+ 2010-10-15 00:52 asfernandes
+ M src/jrd/RandomGenerator.cpp
+Correction
+
+ 2010-10-14 12:28 alexpeshkoff
+ M src/jrd/sqz.cpp
+Frontported fix for CORE-3115: Bugs in the internal record compression routines
+
+ 2010-10-14 11:39 alexpeshkoff
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/gsec/gsec_proto.h
+Frontported fix for CORE-3116: gsec outputs list of users to stderr instead stdout
+
+ 2010-10-14 11:14 alexpeshkoff
+ M src/utilities/gstat/dba.epp
+Frontported fix for CORE-3143: Segmentation fault may occur when user interrupts gstat
+
+ 2010-10-14 11:13 alexpeshkoff
+ M src/jrd/jrd.cpp
+Temporal quickfix for working engine shutdown
+
+ 2010-10-14 06:11 alexpeshkoff
+ M src/common/classes/objects_array.h
+Fixed issue, detected by clang++ compiler
+
+ 2010-10-14 05:27 dimitr
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/blb.cpp
+ M src/jrd/cmp_proto.h
+ M src/jrd/dfw.epp
+ M src/jrd/irq.h
+ M src/jrd/met.epp
+ M src/jrd/met_proto.h
+ M src/jrd/par.cpp
+ M src/jrd/scl.epp
+ M src/jrd/scl_proto.h
+ M src/jrd/vio.cpp
+Front ported my recent changes. I'm unable to verify the compilation now, sorry.
+
2010-10-13 17:48 hvlad
M src/yvalve/gds.cpp
M src/yvalve/why.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-15 01:55:57 UTC (rev 51695)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-15 03:14:59 UTC (rev 51696)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28777
+ FORMAL BUILD NUMBER:28785
*/
-#define PRODUCT_VER_STRING "3.0.0.28777"
-#define FILE_VER_STRING "WI-T3.0.0.28777"
-#define LICENSE_VER_STRING "WI-T3.0.0.28777"
-#define FILE_VER_NUMBER 3, 0, 0, 28777
+#define PRODUCT_VER_STRING "3.0.0.28785"
+#define FILE_VER_STRING "WI-T3.0.0.28785"
+#define LICENSE_VER_STRING "WI-T3.0.0.28785"
+#define FILE_VER_NUMBER 3, 0, 0, 28785
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28777"
+#define FB_BUILD_NO "28785"
#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-10-15 01:55:57 UTC (rev 51695)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-15 03:14:59 UTC (rev 51696)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28777
+BuildNum=28785
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-10-16 03:15:30
|
Revision: 51710
http://firebird.svn.sourceforge.net/firebird/?rev=51710&view=rev
Author: firebirds
Date: 2010-10-16 03:15:24 +0000 (Sat, 16 Oct 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-10-16 01:15:51 UTC (rev 51709)
+++ firebird/trunk/ChangeLog 2010-10-16 03:15:24 UTC (rev 51710)
@@ -1,3 +1,30 @@
+ 2010-10-16 01:15 asfernandes
+ M builds/posix/Makefile.in
+ M builds/posix/make.defaults
+Fix the UDR engine build
+
+ 2010-10-15 15:53 alexpeshkoff
+ M src/common/classes/array.h
+ M src/common/classes/stack.h
+ M src/common/classes/vector.h
+Fixed issues, found by clang
+
+ 2010-10-15 15:52 alexpeshkoff
+ M builds/posix/make.defaults
+CORE-3185: Firebird compilation on a box, already running firebird server
+
+ 2010-10-15 14:54 alexpeshkoff
+ M builds/posix/make.defaults
+CORE-3185: Firebird compilation on a box, already running firebird server
+
+ 2010-10-15 09:08 alexpeshkoff
+ M src/common/classes/DbImplementation.cpp
+CORE-3184: Committed Damyan's patch - support HW IDs from 2.5
+
+ 2010-10-15 09:05 alexpeshkoff
+ M src/jrd/req.h
+warnings
+
2010-10-15 01:55 asfernandes
M src/jrd/met.epp
M src/utilities/gstat/dba.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-16 01:15:51 UTC (rev 51709)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-16 03:15:24 UTC (rev 51710)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28785
+ FORMAL BUILD NUMBER:28791
*/
-#define PRODUCT_VER_STRING "3.0.0.28785"
-#define FILE_VER_STRING "WI-T3.0.0.28785"
-#define LICENSE_VER_STRING "WI-T3.0.0.28785"
-#define FILE_VER_NUMBER 3, 0, 0, 28785
+#define PRODUCT_VER_STRING "3.0.0.28791"
+#define FILE_VER_STRING "WI-T3.0.0.28791"
+#define LICENSE_VER_STRING "WI-T3.0.0.28791"
+#define FILE_VER_NUMBER 3, 0, 0, 28791
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28785"
+#define FB_BUILD_NO "28791"
#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-10-16 01:15:51 UTC (rev 51709)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-16 03:15:24 UTC (rev 51710)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28785
+BuildNum=28791
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-10-17 03:14:04
|
Revision: 51719
http://firebird.svn.sourceforge.net/firebird/?rev=51719&view=rev
Author: firebirds
Date: 2010-10-17 03:13:57 +0000 (Sun, 17 Oct 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-10-16 18:56:11 UTC (rev 51718)
+++ firebird/trunk/ChangeLog 2010-10-17 03:13:57 UTC (rev 51719)
@@ -1,3 +1,82 @@
+ 2010-10-16 18:56 asfernandes
+ M src/dsql/ExprNodes.cpp
+Misc
+
+ 2010-10-16 18:53 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/exe.h
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/misc/blrtable.cpp
+Refactor EXTRACT
+
+ 2010-10-16 18:17 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/exe.h
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/misc/blrtable.cpp
+Refactor *_LENGTH functions
+
+ 2010-10-16 17:42 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/SysFunction.cpp
+ M src/jrd/SysFunction.h
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/misc/blrtable.cpp
+Refactor SUBSTRING
+
+ 2010-10-16 15:34 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/jrd/blp.h
+ M src/jrd/blr.h
+ M src/jrd/cmp.cpp
+ M src/jrd/drq.h
+ M src/jrd/dyn_ut_proto.h
+ M src/jrd/dyn_util.epp
+ M src/jrd/evl.cpp
+ M src/jrd/nod.h
+ M src/jrd/par.cpp
+ M src/misc/blrtable.cpp
+Cleanup: remove blr_prot_mask and blr_lock_state support
+
2010-10-16 01:15 asfernandes
M builds/posix/Makefile.in
M builds/posix/make.defaults
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-16 18:56:11 UTC (rev 51718)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-17 03:13:57 UTC (rev 51719)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28791
+ FORMAL BUILD NUMBER:28796
*/
-#define PRODUCT_VER_STRING "3.0.0.28791"
-#define FILE_VER_STRING "WI-T3.0.0.28791"
-#define LICENSE_VER_STRING "WI-T3.0.0.28791"
-#define FILE_VER_NUMBER 3, 0, 0, 28791
+#define PRODUCT_VER_STRING "3.0.0.28796"
+#define FILE_VER_STRING "WI-T3.0.0.28796"
+#define LICENSE_VER_STRING "WI-T3.0.0.28796"
+#define FILE_VER_NUMBER 3, 0, 0, 28796
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28791"
+#define FB_BUILD_NO "28796"
#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-10-16 18:56:11 UTC (rev 51718)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-17 03:13:57 UTC (rev 51719)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28791
+BuildNum=28796
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-10-19 03:15:22
|
Revision: 51727
http://firebird.svn.sourceforge.net/firebird/?rev=51727&view=rev
Author: firebirds
Date: 2010-10-19 03:15:16 +0000 (Tue, 19 Oct 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-10-18 17:25:33 UTC (rev 51726)
+++ firebird/trunk/ChangeLog 2010-10-19 03:15:16 UTC (rev 51727)
@@ -1,3 +1,24 @@
+ 2010-10-18 17:25 hvlad
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/os/win32/wnet_proto.h
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/os/win32/xnet_proto.h
+Follow Alex changes and remove ISC_STATUS* from various functions
+
+ 2010-10-18 17:23 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/vio.cpp
+ M src/remote/client/interface.cpp
+Corrections for new build system. Work in progress...
+
+ 2010-10-18 17:17 alexpeshkoff
+ M src/yvalve/why.cpp
+misc
+
+ 2010-10-17 14:22 asfernandes
+ M src/dsql/DdlNodes.epp
+Fixed CORE-3180 - ALTER VIEW with not matched columns in declaration and selection crashs the server
+
2010-10-16 18:56 asfernandes
M src/dsql/ExprNodes.cpp
Misc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-18 17:25:33 UTC (rev 51726)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-19 03:15:16 UTC (rev 51727)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28796
+ FORMAL BUILD NUMBER:28800
*/
-#define PRODUCT_VER_STRING "3.0.0.28796"
-#define FILE_VER_STRING "WI-T3.0.0.28796"
-#define LICENSE_VER_STRING "WI-T3.0.0.28796"
-#define FILE_VER_NUMBER 3, 0, 0, 28796
+#define PRODUCT_VER_STRING "3.0.0.28800"
+#define FILE_VER_STRING "WI-T3.0.0.28800"
+#define LICENSE_VER_STRING "WI-T3.0.0.28800"
+#define FILE_VER_NUMBER 3, 0, 0, 28800
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28796"
+#define FB_BUILD_NO "28800"
#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-10-18 17:25:33 UTC (rev 51726)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-19 03:15:16 UTC (rev 51727)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28796
+BuildNum=28800
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...> - 2010-10-19 13:49:02
|
Revision: 51733
http://firebird.svn.sourceforge.net/firebird/?rev=51733&view=rev
Author: alexpeshkoff
Date: 2010-10-19 13:48:56 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
Changed libraries' names. Improved a bit ModLoader.
Modified Paths:
--------------
firebird/trunk/builds/posix/make.defaults
firebird/trunk/src/common/os/mod_loader.h
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2010-10-19 13:28:18 UTC (rev 51732)
+++ firebird/trunk/builds/posix/make.defaults 2010-10-19 13:48:56 UTC (rev 51733)
@@ -211,7 +211,7 @@
#
#LibraryFileName=libfbclient
-LibraryFileName=libfirebird
+LibraryFileName=libfbclient
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.${MajorVer}
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
@@ -222,8 +222,8 @@
# The firebird engine library name
-EngineFileName=libengine
-EngineSoName=$(EngineFileName).${SHRLIB_EXT}.${OdsVersion}
+EngineFileName=libengine${OdsVersion}
+EngineSoName=$(EngineFileName).${SHRLIB_EXT}
ENGINE_SONAME = $(LIB)/$(EngineSoName)
# intl will load dynamically, and having the whole soname set with version
@@ -280,7 +280,7 @@
LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
LIB_LINK_SONAME= -Wl,-soname,$(1)
LIB_LINK_MAPFILE= -Wl,--version-script,
-FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfirebird
+FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient
LINK_OPTS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS)
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
Modified: firebird/trunk/src/common/os/mod_loader.h
===================================================================
--- firebird/trunk/src/common/os/mod_loader.h 2010-10-19 13:28:18 UTC (rev 51732)
+++ firebird/trunk/src/common/os/mod_loader.h 2010-10-19 13:48:56 UTC (rev 51733)
@@ -97,6 +97,21 @@
**/
static void doctorModuleExtension(Firebird::PathName&);
+ /** Almost like loadModule(), but in case of failure invokes doctorModuleExtension()
+ adn retries.
+ **/
+ static Module* fixAndLoadModule(const Firebird::PathName& modName)
+ {
+ Module* mod = loadModule(modName);
+ if (!mod)
+ {
+ Firebird::PathName fixed(modName);
+ doctorModuleExtension(fixed);
+ mod = loadModule(fixed);
+ }
+ return mod;
+ }
+
/** isLoadableModule checks the given file to see if it is a loadable
module. This function is required because different operating
systems require different checks.
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2010-10-19 13:28:18 UTC (rev 51732)
+++ firebird/trunk/src/common/unicode_util.cpp 2010-10-19 13:48:56 UTC (rev 51733)
@@ -801,12 +801,7 @@
icu = FB_NEW(*getDefaultMemoryPool()) ICU();
- icu->ucModule = ModuleLoader::loadModule(filename);
- if (!icu->ucModule)
- {
- ModuleLoader::doctorModuleExtension(filename);
- icu->ucModule = ModuleLoader::loadModule(filename);
- }
+ icu->ucModule = ModuleLoader::fixAndLoadModule(filename);
if (!icu->ucModule)
{
@@ -816,12 +811,7 @@
filename.printf(inTemplate, majorVersion.c_str(), minorVersion.c_str());
- icu->inModule = ModuleLoader::loadModule(filename);
- if (!icu->inModule)
- {
- ModuleLoader::doctorModuleExtension(filename);
- icu->inModule = ModuleLoader::loadModule(filename);
- }
+ icu->inModule = ModuleLoader::fixAndLoadModule(filename);
if (!icu->inModule)
{
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2010-10-19 13:28:18 UTC (rev 51732)
+++ firebird/trunk/src/yvalve/why.cpp 2010-10-19 13:48:56 UTC (rev 51733)
@@ -1139,7 +1139,7 @@
// load engines
// temp solution
- ModuleLoader::Module* engine = ModuleLoader::loadModule("libengine.so.12");
+ ModuleLoader::Module* engine = ModuleLoader::fixAndLoadModule(fb_utils::getPrefix(fb_utils::FB_DIR_LIB, "engine12"));
if (engine)
{
if ( (plug = fb_query_plugin(Plugin::Provider, NULL)) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-20 03:14:40
|
Revision: 51734
http://firebird.svn.sourceforge.net/firebird/?rev=51734&view=rev
Author: firebirds
Date: 2010-10-20 03:14:33 +0000 (Wed, 20 Oct 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-10-19 13:48:56 UTC (rev 51733)
+++ firebird/trunk/ChangeLog 2010-10-20 03:14:33 UTC (rev 51734)
@@ -1,3 +1,14 @@
+ 2010-10-19 13:48 alexpeshkoff
+ M builds/posix/make.defaults
+ M src/common/os/mod_loader.h
+ M src/common/unicode_util.cpp
+ M src/yvalve/why.cpp
+Changed libraries' names. Improved a bit ModLoader.
+
+ 2010-10-19 13:05 alexpeshkoff
+ M src/jrd/sqz.cpp
+Fixed CORE-3148: possible segfault in SQZ_apply_differences
+
2010-10-18 17:25 hvlad
M src/remote/os/win32/wnet.cpp
M src/remote/os/win32/wnet_proto.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-19 13:48:56 UTC (rev 51733)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-20 03:14:33 UTC (rev 51734)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28800
+ FORMAL BUILD NUMBER:28802
*/
-#define PRODUCT_VER_STRING "3.0.0.28800"
-#define FILE_VER_STRING "WI-T3.0.0.28800"
-#define LICENSE_VER_STRING "WI-T3.0.0.28800"
-#define FILE_VER_NUMBER 3, 0, 0, 28800
+#define PRODUCT_VER_STRING "3.0.0.28802"
+#define FILE_VER_STRING "WI-T3.0.0.28802"
+#define LICENSE_VER_STRING "WI-T3.0.0.28802"
+#define FILE_VER_NUMBER 3, 0, 0, 28802
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28800"
+#define FB_BUILD_NO "28802"
#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-10-19 13:48:56 UTC (rev 51733)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-20 03:14:33 UTC (rev 51734)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28800
+BuildNum=28802
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-10-21 03:15:10
|
Revision: 51744
http://firebird.svn.sourceforge.net/firebird/?rev=51744&view=rev
Author: firebirds
Date: 2010-10-21 03:15:03 +0000 (Thu, 21 Oct 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-10-20 22:15:48 UTC (rev 51743)
+++ firebird/trunk/ChangeLog 2010-10-21 03:15:03 UTC (rev 51744)
@@ -1,3 +1,142 @@
+ 2010-10-20 22:15 hvlad
+ M builds/win32/create_msgs.bat
+ D builds/win32/defs/fbclient.def
+ A builds/win32/defs/firebird.def (from /firebird/trunk/builds/win32/defs/fbclient.def:51671)
+ M builds/win32/make_all.bat
+ M builds/win32/make_boot.bat
+ M builds/win32/make_examples.bat
+ D builds/win32/msvc10/Firebird2.sln
+ D builds/win32/msvc10/Firebird2Boot.sln
+ D builds/win32/msvc10/Firebird2_Examples.sln
+ A builds/win32/msvc10/Firebird3.sln (from /firebird/trunk/builds/win32/msvc10/Firebird2.sln:51660)
+ A builds/win32/msvc10/Firebird3Boot.sln (from /firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln:51733)
+ A builds/win32/msvc10/Firebird3_Examples.sln (from /firebird/trunk/builds/win32/msvc10/Firebird2_Examples.sln:51733)
+ M builds/win32/msvc10/alice.vcxproj
+ M builds/win32/msvc10/alice.vcxproj.filters
+ M builds/win32/msvc10/btyacc.vcxproj
+ M builds/win32/msvc10/btyacc.vcxproj.filters
+ M builds/win32/msvc10/build_msg.vcxproj
+ M builds/win32/msvc10/build_msg.vcxproj.filters
+ M builds/win32/msvc10/burp.vcxproj
+ M builds/win32/msvc10/burp.vcxproj.filters
+ M builds/win32/msvc10/codes.vcxproj
+ M builds/win32/msvc10/codes.vcxproj.filters
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/common.vcxproj.filters
+ D builds/win32/msvc10/common_classic.vcxproj
+ D builds/win32/msvc10/common_classic.vcxproj.filters
+ D builds/win32/msvc10/common_static.vcxproj
+ D builds/win32/msvc10/common_static.vcxproj.filters
+ D builds/win32/msvc10/config.vcxproj
+ D builds/win32/msvc10/config.vcxproj.filters
+ D builds/win32/msvc10/dsql_server.vcxproj
+ D builds/win32/msvc10/dsql_server.vcxproj.filters
+ D builds/win32/msvc10/dsql_server_classic.vcxproj
+ D builds/win32/msvc10/dsql_server_classic.vcxproj.filters
+ M builds/win32/msvc10/empbuild.vcxproj
+ M builds/win32/msvc10/empbuild.vcxproj.filters
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/engine.vcxproj.filters
+ D builds/win32/msvc10/engine_classic.vcxproj
+ D builds/win32/msvc10/engine_classic.vcxproj.filters
+ D builds/win32/msvc10/engine_embed.vcxproj
+ D builds/win32/msvc10/engine_embed.vcxproj.filters
+ M builds/win32/msvc10/fb2control.vcxproj
+ D builds/win32/msvc10/fb_inet_server.vcxproj
+ D builds/win32/msvc10/fb_inet_server.vcxproj.filters
+ M builds/win32/msvc10/fb_lock_print.vcxproj
+ M builds/win32/msvc10/fb_lock_print.vcxproj.filters
+ D builds/win32/msvc10/fbclient.vcxproj
+ D builds/win32/msvc10/fbclient.vcxproj.filters
+ D builds/win32/msvc10/fbembed.vcxproj
+ D builds/win32/msvc10/fbembed.vcxproj.filters
+ M builds/win32/msvc10/fbguard.vcxproj
+ M builds/win32/msvc10/fbguard.vcxproj.filters
+ M builds/win32/msvc10/fbrmclib.vcxproj
+ M builds/win32/msvc10/fbrmclib.vcxproj.filters
+ M builds/win32/msvc10/fbserver.vcxproj
+ M builds/win32/msvc10/fbserver.vcxproj.filters
+ M builds/win32/msvc10/fbsvcmgr.vcxproj
+ M builds/win32/msvc10/fbsvcmgr.vcxproj.filters
+ M builds/win32/msvc10/fbtrace.vcxproj
+ M builds/win32/msvc10/fbtrace.vcxproj.filters
+ M builds/win32/msvc10/fbtracemgr.vcxproj
+ M builds/win32/msvc10/fbudf.vcxproj
+ M builds/win32/msvc10/fbudf.vcxproj.filters
+ M builds/win32/msvc10/firebird2.props
+ M builds/win32/msvc10/gbak.vcxproj
+ M builds/win32/msvc10/gbak.vcxproj.filters
+ D builds/win32/msvc10/gbak_embed.vcxproj
+ D builds/win32/msvc10/gbak_embed.vcxproj.filters
+ M builds/win32/msvc10/gfix.vcxproj
+ M builds/win32/msvc10/gfix.vcxproj.filters
+ M builds/win32/msvc10/gpre.vcxproj
+ M builds/win32/msvc10/gpre.vcxproj.filters
+ M builds/win32/msvc10/gpre_boot.vcxproj
+ M builds/win32/msvc10/gpre_boot.vcxproj.filters
+ A builds/win32/msvc10/gpre_common.vcxproj
+ A builds/win32/msvc10/gpre_common.vcxproj.filters
+ D builds/win32/msvc10/gpre_embed.vcxproj
+ D builds/win32/msvc10/gpre_embed.vcxproj.filters
+ M builds/win32/msvc10/gsec.vcxproj
+ M builds/win32/msvc10/gsec.vcxproj.filters
+ M builds/win32/msvc10/gsplit.vcxproj
+ M builds/win32/msvc10/gsplit.vcxproj.filters
+ M builds/win32/msvc10/gstat.vcxproj
+ M builds/win32/msvc10/gstat.vcxproj.filters
+ M builds/win32/msvc10/ib_util.vcxproj
+ M builds/win32/msvc10/instclient.vcxproj
+ M builds/win32/msvc10/instreg.vcxproj
+ M builds/win32/msvc10/instsvc.vcxproj
+ M builds/win32/msvc10/intl.vcxproj
+ M builds/win32/msvc10/intl.vcxproj.filters
+ M builds/win32/msvc10/intlbuild.vcxproj
+ M builds/win32/msvc10/intlbuild.vcxproj.filters
+ M builds/win32/msvc10/isql.vcxproj
+ M builds/win32/msvc10/isql.vcxproj.filters
+ D builds/win32/msvc10/isql_embed.vcxproj
+ D builds/win32/msvc10/isql_embed.vcxproj.filters
+ D builds/win32/msvc10/lock.vcxproj
+ D builds/win32/msvc10/lock.vcxproj.filters
+ D builds/win32/msvc10/lock_classic.vcxproj
+ D builds/win32/msvc10/lock_classic.vcxproj.filters
+ M builds/win32/msvc10/nbackup.vcxproj
+ M builds/win32/msvc10/nbackup.vcxproj.filters
+ M builds/win32/msvc10/qli.vcxproj
+ M builds/win32/msvc10/qli.vcxproj.filters
+ M builds/win32/msvc10/remote.vcxproj
+ M builds/win32/msvc10/remote.vcxproj.filters
+ M builds/win32/msvc10/udr_engine.vcxproj
+ M builds/win32/msvc10/udr_engine.vcxproj.filters
+ A builds/win32/msvc10/yvalve.vcxproj
+ A builds/win32/msvc10/yvalve.vcxproj.filters
+ M builds/win32/parse.bat
+ M builds/win32/preprocess.bat
+ M builds/win32/set_build_target.bat
+ M builds/win32/setenvvar.bat
+New build system for Windows. MSVC10 only so far.
+
+ 2010-10-20 22:00 hvlad
+ M src/common/utils.cpp
+ M src/iscguard/cntl_guard.cpp
+ M src/iscguard/iscguard.cpp
+ M src/remote/server/os/win32/cntl.cpp
+ M src/remote/server/os/win32/property.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/os/win32/window.cpp
+ M src/remote/server/os/win32/window.rc
+ M src/remote/server/server.cpp
+ M src/utilities/fbcpl/fbdialog.h
+Corrections for new build system. Work in progress...
+
+ 2010-10-20 21:59 hvlad
+ M src/common/file_params.h
+Change names of monitoring and trace shared memory to allow FB3 to run simultaneously with previous versions of engine
+
+ 2010-10-20 21:54 hvlad
+ M extern/btyacc/defs.h
+Avoid annoying warnings
+
2010-10-19 13:48 alexpeshkoff
M builds/posix/make.defaults
M src/common/os/mod_loader.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-20 22:15:48 UTC (rev 51743)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-21 03:15:03 UTC (rev 51744)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28802
+ FORMAL BUILD NUMBER:28806
*/
-#define PRODUCT_VER_STRING "3.0.0.28802"
-#define FILE_VER_STRING "WI-T3.0.0.28802"
-#define LICENSE_VER_STRING "WI-T3.0.0.28802"
-#define FILE_VER_NUMBER 3, 0, 0, 28802
+#define PRODUCT_VER_STRING "3.0.0.28806"
+#define FILE_VER_STRING "WI-T3.0.0.28806"
+#define LICENSE_VER_STRING "WI-T3.0.0.28806"
+#define FILE_VER_NUMBER 3, 0, 0, 28806
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28802"
+#define FB_BUILD_NO "28806"
#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-10-20 22:15:48 UTC (rev 51743)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-21 03:15:03 UTC (rev 51744)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28802
+BuildNum=28806
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...> - 2010-10-22 01:24:38
|
Revision: 51752
http://firebird.svn.sourceforge.net/firebird/?rev=51752&view=rev
Author: asfernandes
Date: 2010-10-22 01:24:31 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Misc
Modified Paths:
--------------
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/builds/win32/make_examples.bat
firebird/trunk/builds/win32/set_build_target.bat
firebird/trunk/src/common/fb_exception.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/vio.cpp
firebird/trunk/src/remote/os/win32/wnet.cpp
firebird/trunk/src/remote/os/win32/xnet.cpp
firebird/trunk/src/remote/server/os/win32/property.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/remote/server/os/win32/window.cpp
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/builds/win32/make_boot.bat 2010-10-22 01:24:31 UTC (rev 51752)
@@ -218,4 +218,3 @@
@goto :EOF
:END
-
Modified: firebird/trunk/builds/win32/make_examples.bat
===================================================================
--- firebird/trunk/builds/win32/make_examples.bat 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/builds/win32/make_examples.bat 2010-10-22 01:24:31 UTC (rev 51752)
@@ -172,4 +172,3 @@
::------------
@goto :EOF
-
Modified: firebird/trunk/builds/win32/set_build_target.bat
===================================================================
--- firebird/trunk/builds/win32/set_build_target.bat 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/builds/win32/set_build_target.bat 2010-10-22 01:24:31 UTC (rev 51752)
@@ -16,4 +16,3 @@
@echo Executed %0
@echo.
-
Modified: firebird/trunk/src/common/fb_exception.cpp
===================================================================
--- firebird/trunk/src/common/fb_exception.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/common/fb_exception.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -203,7 +203,7 @@
{
memcpy(perm, ex.value(), sizeof(ISC_STATUS_ARRAY));
}
- catch (const BadAlloc& /*ex*/)
+ catch (const BadAlloc&)
{
*perm++ = isc_arg_gds;
*perm++ = isc_virmemexh;
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -3223,7 +3223,7 @@
ValueExprNode* ExtractNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
{
// Figure out the data type of the sub parameter, and make
- // sure the requested type of information can be extracted
+ // sure the requested type of information can be extracted.
dsql_nod* sub1 = PASS1_node(dsqlScratch, dsqlArg);
MAKE_desc(dsqlScratch, &sub1->nod_desc, sub1, NULL);
@@ -3397,6 +3397,7 @@
TimeStamp::decode_time(*(GDS_TIME*) value->dsc_address,
×.tm_hour, ×.tm_min, ×.tm_sec, &fractions);
break;
+
default:
ERR_post(Arg::Gds(isc_expression_eval_err) <<
Arg::Gds(isc_invalid_extractpart_time));
@@ -3413,6 +3414,7 @@
ERR_post(Arg::Gds(isc_expression_eval_err) <<
Arg::Gds(isc_invalid_extractpart_date));
break;
+
default:
TimeStamp::decode_date(*(GDS_DATE*) value->dsc_address, ×);
}
@@ -3435,15 +3437,19 @@
case blr_extract_year:
part = times.tm_year + 1900;
break;
+
case blr_extract_month:
part = times.tm_mon + 1;
break;
+
case blr_extract_day:
part = times.tm_mday;
break;
+
case blr_extract_hour:
part = times.tm_hour;
break;
+
case blr_extract_minute:
part = times.tm_min;
break;
@@ -3521,9 +3527,11 @@
case blr_extract_yearday:
part = times.tm_yday;
break;
+
case blr_extract_weekday:
part = times.tm_wday;
break;
+
default:
fb_assert(false);
part = 0;
@@ -5003,17 +5011,17 @@
switch (blrSubOp)
{
case blr_strlen_bit:
+ {
+ FB_UINT64 l = (FB_UINT64) blob->blb_length * 8;
+ if (l > MAX_SINT64)
{
- FB_UINT64 l = (FB_UINT64) blob->blb_length * 8;
- if (l > MAX_SINT64)
- {
- ERR_post(Arg::Gds(isc_arith_except) <<
- Arg::Gds(isc_numeric_out_of_range));
- }
+ ERR_post(Arg::Gds(isc_arith_except) <<
+ Arg::Gds(isc_numeric_out_of_range));
+ }
- length = l;
- }
+ length = l;
break;
+ }
case blr_strlen_octet:
length = blob->blb_length;
@@ -5058,17 +5066,17 @@
switch (blrSubOp)
{
case blr_strlen_bit:
+ {
+ FB_UINT64 l = (FB_UINT64) length * 8;
+ if (l > MAX_SINT64)
{
- FB_UINT64 l = (FB_UINT64) length * 8;
- if (l > MAX_SINT64)
- {
- ERR_post(Arg::Gds(isc_arith_except) <<
- Arg::Gds(isc_numeric_out_of_range));
- }
+ ERR_post(Arg::Gds(isc_arith_except) <<
+ Arg::Gds(isc_numeric_out_of_range));
+ }
- length = l;
- }
+ length = l;
break;
+ }
case blr_strlen_octet:
break;
@@ -5302,7 +5310,7 @@
blb* newBlob = BLB_create(tdbb, tdbb->getRequest()->req_transaction, &impure->vlu_misc.vlu_bid);
blb* blob = BLB_open(tdbb, tdbb->getRequest()->req_transaction,
- reinterpret_cast<bid*>(valueDsc->dsc_address));
+ reinterpret_cast<bid*>(valueDsc->dsc_address));
HalfStaticArray<UCHAR, BUFFER_LARGE> buffer;
CharSet* charSet = INTL_charset_lookup(tdbb, valueDsc->getCharSet());
@@ -5362,8 +5370,8 @@
// they aren't accepted, so they will cause error() to be called anyway.
VaryStr<32> temp;
USHORT ttype;
- desc.dsc_length =
- MOV_get_string_ptr(valueDsc, &ttype, &desc.dsc_address, &temp, sizeof(temp));
+ desc.dsc_length = MOV_get_string_ptr(valueDsc, &ttype, &desc.dsc_address,
+ &temp, sizeof(temp));
desc.setTextType(ttype);
// CVC: Why bother? If the start is greater or equal than the length in bytes,
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/jrd/cch.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -1619,15 +1619,16 @@
// writer startup in progress
bcb->bcb_flags |= BCB_writer_start;
- try
+ try
{
Thread::start(cache_writer, dbb, THREAD_high);
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
bcb->bcb_flags &= ~BCB_writer_start;
ERR_bugcheck_msg("cannot start cache writer thread");
}
+
{ // scope
Database::Checkout dcoHolder(dbb);
dbb->dbb_writer_init.enter();
Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/jrd/vio.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -2096,14 +2096,15 @@
if (!(dbb->dbb_flags & DBB_garbage_collector))
{
- try
+ try
{
Thread::start(garbage_collector, dbb, THREAD_medium);
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
ERR_bugcheck_msg("cannot start garbage collector thread");
}
+
{ // scope
Database::Checkout dcoHolder(dbb);
dbb->dbb_gc_init.enter();
Modified: firebird/trunk/src/remote/os/win32/wnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/wnet.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/remote/os/win32/wnet.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -113,9 +113,7 @@
};
-rem_port* WNET_analyze(const Firebird::PathName& file_name,
- const TEXT* node_name,
- bool uv_flag)
+rem_port* WNET_analyze(const Firebird::PathName& file_name, const TEXT* node_name, bool uv_flag)
{
/**************************************
*
@@ -320,9 +318,7 @@
}
-rem_port* WNET_connect(const TEXT* name,
- PACKET* packet,
- USHORT flag)
+rem_port* WNET_connect(const TEXT* name, PACKET* packet, USHORT flag)
{
/**************************************
*
@@ -441,9 +437,8 @@
CloseHandle(port->port_pipe);
}
- if (wnet_shutdown) {
+ if (wnet_shutdown)
disconnect(port);
- }
}
if (wnet_shutdown)
@@ -452,6 +447,7 @@
temp << Arg::Str("WNET");
temp.raise();
}
+
return NULL;
}
Modified: firebird/trunk/src/remote/os/win32/xnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/xnet.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/remote/os/win32/xnet.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -130,28 +130,32 @@
static volatile bool xnet_initialized = false;
static volatile bool xnet_shutdown = false;
-static Firebird::GlobalPtr<Firebird::Mutex> xnet_mutex;
-static Firebird::GlobalPtr<PortsCleanup> xnet_ports;
+static GlobalPtr<Mutex> xnet_mutex;
+static GlobalPtr<PortsCleanup> xnet_ports;
static ULONG xnet_next_free_map_num = 0;
static bool connect_init();
static void connect_fini();
static void release_all();
-class ExitHandler
+namespace
{
-public:
- ExitHandler(MemoryPool&) {};
-
- ~ExitHandler()
+ class ExitHandler
{
- xnet_shutdown = true;
- release_all();
- }
-};
-static Firebird::GlobalPtr<ExitHandler> xnet_exit_handler;
+ public:
+ ExitHandler(MemoryPool&) {};
+ ~ExitHandler()
+ {
+ xnet_shutdown = true;
+ release_all();
+ }
+ };
+ static GlobalPtr<ExitHandler> xnet_exit_handler;
+}
+
+
inline void make_obj_name(char* buffer, size_t size, const char* format)
{
fb_assert(strcmp(xnet_endpoint, "") != 0);
@@ -178,7 +182,7 @@
static void xnet_log_error(const char* err_msg, const Exception& ex)
{
- Firebird::string str("XNET error: ");
+ string str("XNET error: ");
str += err_msg;
iscLogException(str.c_str(), ex);
}
@@ -196,8 +200,7 @@
#define ERR_STR(str) (str)
#endif
-rem_port* XNET_analyze(const Firebird::PathName& file_name,
- bool uv_flag)
+rem_port* XNET_analyze(const PathName& file_name, bool uv_flag)
{
/**************************************
*
@@ -221,8 +224,8 @@
// Pick up some user identification information
- Firebird::string buffer;
- Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
+ string buffer;
+ ClumpletWriter user_id(ClumpletReader::UnTagged, MAX_DPB_SIZE);
ISC_get_user(&buffer, 0, 0);
buffer.lower();
@@ -381,7 +384,7 @@
// Once we've decided on a protocol, concatenate the version
// string to reflect it...
- Firebird::string temp;
+ string temp;
temp.printf("%s/P%d", port->port_version->str_data,
port->port_protocol & FB_PROTOCOL_MASK);
@@ -466,14 +469,14 @@
make_obj_name(name_buffer, sizeof(name_buffer), XNET_RESPONSE_EVENT);
xnet_response_event = OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xnet_response_event) {
- Firebird::system_error::raise(ERR_STR("OpenEvent"));
+ system_error::raise(ERR_STR("OpenEvent"));
}
xpm = make_xpm(current_process_id, 0);
port = get_server_port(client_pid, xpm, current_process_id, 0, 0);
}
- catch (const Firebird::Exception& ex)
+ catch (const Exception& ex)
{
xnet_log_error("Unable to initialize child process", ex);
@@ -529,36 +532,36 @@
Arg::Gds(isc_unavailable).raise();
}
- Firebird::system_error::raise(ERR_STR("OpenMutex"));
+ system_error::raise(ERR_STR("OpenMutex"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_CONNECT_EVENT);
xnet_connect_event = OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xnet_connect_event) {
- Firebird::system_error::raise(ERR_STR("OpenEvent"));
+ system_error::raise(ERR_STR("OpenEvent"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_RESPONSE_EVENT);
xnet_response_event = OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xnet_response_event) {
- Firebird::system_error::raise(ERR_STR("OpenEvent"));
+ system_error::raise(ERR_STR("OpenEvent"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_CONNECT_MAP);
xnet_connect_map_h = OpenFileMapping(FILE_MAP_WRITE, TRUE, name_buffer);
if (!xnet_connect_map_h) {
- Firebird::system_error::raise(ERR_STR("OpenFileMapping"));
+ system_error::raise(ERR_STR("OpenFileMapping"));
}
xnet_connect_map = MapViewOfFile(xnet_connect_map_h, FILE_MAP_WRITE, 0, 0,
XNET_CONNECT_RESPONZE_SIZE);
if (!xnet_connect_map) {
- Firebird::system_error::raise(ERR_STR("MapViewOfFile"));
+ system_error::raise(ERR_STR("MapViewOfFile"));
}
return true;
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
connect_fini();
throw;
@@ -748,7 +751,7 @@
xcc->xcc_event_send_channel_filled =
OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xcc->xcc_event_send_channel_filled) {
- Firebird::system_call_failed::raise(ERR_STR("OpenEvent"));
+ system_call_failed::raise(ERR_STR("OpenEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_C2S_EVNT_CHAN_EMPTED,
@@ -756,7 +759,7 @@
xcc->xcc_event_send_channel_empted =
OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xcc->xcc_event_send_channel_empted) {
- Firebird::system_call_failed::raise(ERR_STR("OpenEvent"));
+ system_call_failed::raise(ERR_STR("OpenEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_EVNT_CHAN_FILLED,
@@ -764,7 +767,7 @@
xcc->xcc_event_recv_channel_filled =
OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xcc->xcc_event_recv_channel_filled) {
- Firebird::system_call_failed::raise(ERR_STR("OpenEvent"));
+ system_call_failed::raise(ERR_STR("OpenEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_EVNT_CHAN_EMPTED,
@@ -772,7 +775,7 @@
xcc->xcc_event_recv_channel_empted =
OpenEvent(EVENT_ALL_ACCESS, FALSE, name_buffer);
if (!xcc->xcc_event_recv_channel_empted) {
- Firebird::system_call_failed::raise(ERR_STR("OpenEvent"));
+ system_call_failed::raise(ERR_STR("OpenEvent"));
}
// send and receive events channels
@@ -797,7 +800,7 @@
return new_port;
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
xnet_log_error("aux_connect() failed");
@@ -871,7 +874,7 @@
if (!xcc->xcc_event_recv_channel_filled ||
(xcc->xcc_event_recv_channel_filled && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_call_failed::raise(ERR_STR("CreateEvent"));
+ system_call_failed::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_C2S_EVNT_CHAN_EMPTED,
@@ -881,7 +884,7 @@
if (!xcc->xcc_event_recv_channel_empted ||
(xcc->xcc_event_recv_channel_empted && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_call_failed::raise(ERR_STR("CreateEvent"));
+ system_call_failed::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_EVNT_CHAN_FILLED,
@@ -891,7 +894,7 @@
if (!xcc->xcc_event_send_channel_filled ||
(xcc->xcc_event_send_channel_filled && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_call_failed::raise(ERR_STR("CreateEvent"));
+ system_call_failed::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_EVNT_CHAN_EMPTED,
@@ -901,7 +904,7 @@
if (!xcc->xcc_event_send_channel_empted ||
(xcc->xcc_event_send_channel_empted && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_call_failed::raise(ERR_STR("CreateEvent"));
+ system_call_failed::raise(ERR_STR("CreateEvent"));
}
// send and receive events channels
@@ -930,7 +933,7 @@
return new_port;
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
xnet_log_error("aux_request() failed");
@@ -1002,7 +1005,7 @@
static void cleanup_mapping(XPM xpm)
{
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
// if this was the last area for this map, unmap it
xpm->xpm_count--;
@@ -1054,9 +1057,9 @@
static void raise_lostconn_or_syserror(const char* msg)
{
if (ERRNO == ERROR_FILE_NOT_FOUND)
- Firebird::status_exception::raise(Arg::Gds(isc_conn_lost));
+ status_exception::raise(Arg::Gds(isc_conn_lost));
else
- Firebird::system_error::raise(msg);
+ system_error::raise(msg);
}
@@ -1075,7 +1078,7 @@
if (!xnet_initialized)
{
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
if (!xnet_initialized)
{
xnet_initialized = true;
@@ -1090,7 +1093,7 @@
XNET_RESPONSE response;
{ // xnet_mutex scope
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
// First, try to connect using default kernel namespace.
// This should work on Win9X, NT4 and on later OS when server is running
@@ -1125,7 +1128,7 @@
DWORD err = WaitForSingleObject(xnet_connect_mutex, timeout);
{ // xnet_mutex scope
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
if (err != WAIT_OBJECT_0)
{
@@ -1151,7 +1154,7 @@
err = WaitForSingleObject(xnet_response_event, timeout);
{ // xnet_mutex scope
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
if (err != WAIT_OBJECT_0)
{
@@ -1193,7 +1196,7 @@
try {
{ // xnet_mutex scope
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
// see if area is already mapped for this client
@@ -1221,7 +1224,7 @@
mapped_address = MapViewOfFile(file_handle, FILE_MAP_WRITE, 0L, 0L,
XPS_MAPPED_SIZE(global_slots_per_map, global_pages_per_slot));
if (!mapped_address) {
- Firebird::system_error::raise(ERR_STR("MapViewOfFile"));
+ system_error::raise(ERR_STR("MapViewOfFile"));
}
xpm = new struct xpm;
@@ -1256,7 +1259,7 @@
// only speak if server has correct protocol
if (xps->xps_server_protocol != XPI_SERVER_PROTOCOL_VERSION) {
- Firebird::fatal_exception::raise("Unknown XNET protocol version");
+ fatal_exception::raise("Unknown XNET protocol version");
}
xps->xps_client_protocol = XPI_CLIENT_PROTOCOL_VERSION;
@@ -1266,7 +1269,7 @@
xcc->xcc_proc_h = OpenProcess(SYNCHRONIZE, 0, xps->xps_server_proc_id);
if (!xcc->xcc_proc_h) {
- Firebird::system_error::raise(ERR_STR("OpenProcess"));
+ system_error::raise(ERR_STR("OpenProcess"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_C2S_DATA_CHAN_FILLED,
@@ -1324,7 +1327,7 @@
return port;
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
if (xcc)
cleanup_comm(xcc);
@@ -1410,7 +1413,7 @@
return port;
}
- catch (const Firebird::Exception& ex)
+ catch (const Exception& ex)
{
xnet_log_error("Failed to allocate server port for communication", ex);
@@ -1636,7 +1639,7 @@
// mark all mapped areas connected to the process with pid == dead_proc_id
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
for (xpm = global_client_maps; xpm; xpm = xpm->xpm_next)
{
@@ -1694,7 +1697,7 @@
}
-static void xnet_gen_error (rem_port* port, const Firebird::Arg::StatusVector& v)
+static void xnet_gen_error (rem_port* port, const Arg::StatusVector& v)
{
/**************************************
*
@@ -2137,7 +2140,7 @@
connect_fini();
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
// release all map stuff left not released by broken ports
@@ -2184,15 +2187,15 @@
try
{
if (!(*map_handle) || (ERRNO == ERROR_ALREADY_EXISTS))
- Firebird::system_error::raise(ERR_STR("CreateFileMapping"));
+ system_error::raise(ERR_STR("CreateFileMapping"));
*map_address = MapViewOfFile(*map_handle, FILE_MAP_WRITE, 0, 0,
XPS_MAPPED_SIZE(global_slots_per_map, global_pages_per_slot));
if (!(*map_address))
- Firebird::system_error::raise(ERR_STR("MapViewOfFile"));
+ system_error::raise(ERR_STR("MapViewOfFile"));
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
if (*map_handle)
CloseHandle(*map_handle);
@@ -2233,7 +2236,7 @@
}
xpm->xpm_flags = 0;
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
xpm->xpm_next = global_client_maps;
global_client_maps = xpm;
@@ -2290,21 +2293,21 @@
xnet_connect_mutex = CreateMutex(ISC_get_security_desc(), FALSE, name_buffer);
if (!xnet_connect_mutex || (xnet_connect_mutex && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_error::raise(ERR_STR("CreateMutex"));
+ system_error::raise(ERR_STR("CreateMutex"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_CONNECT_EVENT);
xnet_connect_event = CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xnet_connect_event || (xnet_connect_event && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_RESPONSE_EVENT);
xnet_response_event = CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xnet_response_event || (xnet_response_event && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
make_obj_name(name_buffer, sizeof(name_buffer), XNET_CONNECT_MAP);
@@ -2316,16 +2319,16 @@
name_buffer);
if (!xnet_connect_map_h || (xnet_connect_map_h && ERRNO == ERROR_ALREADY_EXISTS))
{
- Firebird::system_error::raise(ERR_STR("CreateFileMapping"));
+ system_error::raise(ERR_STR("CreateFileMapping"));
}
xnet_connect_map = MapViewOfFile(xnet_connect_map_h, FILE_MAP_WRITE, 0L, 0L,
XNET_CONNECT_RESPONZE_SIZE);
if (!xnet_connect_map) {
- Firebird::system_error::raise(ERR_STR("MapViewOfFile"));
+ system_error::raise(ERR_STR("MapViewOfFile"));
}
}
- catch (const Firebird::Exception& ex)
+ catch (const Exception& ex)
{
xnet_log_error("XNET server initialization failed. "
"Probably another instance of server is already running.", ex);
@@ -2362,7 +2365,7 @@
XPM xpm = NULL;
ULONG free_slot = 0, free_map = 0;
- Firebird::MutexLockGuard guard(xnet_mutex);
+ MutexLockGuard guard(xnet_mutex);
// go through list of maps
@@ -2426,7 +2429,7 @@
TEXT name[MAXPATHLEN];
GetModuleFileName(NULL, name, sizeof(name));
- Firebird::string cmdLine;
+ string cmdLine;
cmdLine.printf("%s -x -h %"ULONGFORMAT, name, client_pid);
STARTUPINFO start_crud;
@@ -2500,7 +2503,7 @@
xcc->xcc_proc_h = OpenProcess(SYNCHRONIZE, 0, client_pid);
if (!xcc->xcc_proc_h) {
- Firebird::system_error::raise(ERR_STR("OpenProcess"));
+ system_error::raise(ERR_STR("OpenProcess"));
}
xcc->xcc_map_num = map_num;
@@ -2518,7 +2521,7 @@
xcc->xcc_event_recv_channel_filled =
CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xcc->xcc_event_recv_channel_filled) {
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_C2S_DATA_CHAN_EMPTED,
@@ -2526,7 +2529,7 @@
xcc->xcc_event_recv_channel_empted =
CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xcc->xcc_event_recv_channel_empted) {
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_DATA_CHAN_FILLED,
@@ -2534,7 +2537,7 @@
xcc->xcc_event_send_channel_filled =
CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xcc->xcc_event_send_channel_filled) {
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
make_event_name(name_buffer, sizeof(name_buffer), XNET_E_S2C_DATA_CHAN_EMPTED,
@@ -2542,7 +2545,7 @@
xcc->xcc_event_send_channel_empted =
CreateEvent(ISC_get_security_desc(), FALSE, FALSE, name_buffer);
if (!xcc->xcc_event_send_channel_empted) {
- Firebird::system_error::raise(ERR_STR("CreateEvent"));
+ system_error::raise(ERR_STR("CreateEvent"));
}
// set up the channel structures
@@ -2586,7 +2589,7 @@
xnet_ports->registerPort(port);
}
- catch (const Firebird::Exception&)
+ catch (const Exception&)
{
if (port)
cleanup_port(port);
Modified: firebird/trunk/src/remote/server/os/win32/property.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/property.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/remote/server/os/win32/property.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -269,6 +269,7 @@
ULONG num_att = 0, num_dbs = 0, num_svc = 0;
const HCURSOR hOldCursor = SetCursor(LoadCursor(NULL, IDC_WAIT));
+ //// FIXME: disabled!
//JRD_num_attachments(NULL, 0, JRD_info_none, &num_att, &num_dbs, &num_svc);
char szText[BUFFER_MEDIUM];
Modified: firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -267,9 +267,8 @@
else if (server_flag & SRVR_xnet)
port = XNET_reconnect((ULONG) connection_handle);
- if (port) {
+ if (port)
service_connection(port);
- }
}
catch (const Firebird::Exception& ex)
{
@@ -383,7 +382,7 @@
break;
}
- try
+ try
{
Thread::start(process_connection_thread, port, THREAD_medium);
}
@@ -424,14 +423,13 @@
ISC_STATUS_ARRAY status_vector;
ex.stuff_exception(status_vector);
wnet_down = (status_vector[1] == isc_net_server_shutdown);
- if (!wnet_down) {
+
+ if (!wnet_down)
iscLogException("WNET_connect", ex);
- }
}
- if (!port && wnet_down) {
+ if (!port && wnet_down)
break;
- }
try
{
@@ -477,14 +475,13 @@
ex.stuff_exception(status_vector);
xnet_down = (status_vector[1] == isc_net_server_shutdown);
- if (!xnet_down ) {
+
+ if (!xnet_down)
iscLogException("XNET_connect", ex);
- }
}
- if (!port && xnet_down) {
+ if (!port && xnet_down)
break;
- }
try
{
Modified: firebird/trunk/src/remote/server/os/win32/window.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/window.cpp 2010-10-21 14:25:26 UTC (rev 51751)
+++ firebird/trunk/src/remote/server/os/win32/window.cpp 2010-10-22 01:24:31 UTC (rev 51752)
@@ -400,6 +400,7 @@
case WM_DEVICECHANGE:
pdbcv = (PDEV_BROADCAST_VOLUME) lParam;
+ //// FIXME: disabled!
//JRD_num_attachments(reinterpret_cast<UCHAR*>(&ulInUseMask),
// sizeof(ULONG), JRD_info_drivemask, &num_att, &num_dbs, &num_svc);
@@ -530,6 +531,7 @@
* the server can be shutdown.
*****************************************************************************/
ULONG usNumAtt = 0, usNumDbs = 0, usNumSvc = 0;
+ //// FIXME: disabled!
//JRD_num_attachments(NULL, 0, JRD_info_none, &usNumAtt, &usNumDbs, &usNumSvc);
if (!usNumAtt && !usNumSvc) // IF 0 CONNECTIONS, JUST SHUTDOWN
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2010-10-22 03:14:34
|
Revision: 51753
http://firebird.svn.sourceforge.net/firebird/?rev=51753&view=rev
Author: firebirds
Date: 2010-10-22 03:14:28 +0000 (Fri, 22 Oct 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-10-22 01:24:31 UTC (rev 51752)
+++ firebird/trunk/ChangeLog 2010-10-22 03:14:28 UTC (rev 51753)
@@ -1,3 +1,51 @@
+ 2010-10-22 01:24 asfernandes
+ M builds/win32/make_boot.bat
+ M builds/win32/make_examples.bat
+ M builds/win32/set_build_target.bat
+ M src/common/fb_exception.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/vio.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/server/os/win32/property.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/os/win32/window.cpp
+Misc
+
+ 2010-10-21 14:25 hvlad
+ M src/remote/os/win32/xnet.cpp
+Don't use obsolete gds cleanup in XNET. It also avoids AV in server at shutdown
+
+ 2010-10-21 11:46 hvlad
+ M src/common/fb_exception.cpp
+Warning
+
+ 2010-10-21 11:46 hvlad
+ M src/utilities/gsec/security.cpp
+Misc
+
+ 2010-10-21 11:45 hvlad
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/pwd.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+Windows-specific hack to register security plugins seems obsolete with new build
+
+ 2010-10-21 11:43 hvlad
+ M builds/win32/msvc10/Firebird3.sln
+ A builds/win32/msvc10/user_management.vcxproj
+ A builds/win32/msvc10/user_management.vcxproj.filters
+User management plugin. Works with gsec, supports manage of user accounts at security database.
+
+ 2010-10-21 11:41 hvlad
+ M builds/win32/msvc10/fbtrace.vcxproj
+Misc
+
+ 2010-10-21 11:40 hvlad
+ M builds/win32/preprocess.bat
+Correction
+
2010-10-20 22:15 hvlad
M builds/win32/create_msgs.bat
D builds/win32/defs/fbclient.def
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-22 01:24:31 UTC (rev 51752)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-22 03:14:28 UTC (rev 51753)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28806
+ FORMAL BUILD NUMBER:28814
*/
-#define PRODUCT_VER_STRING "3.0.0.28806"
-#define FILE_VER_STRING "WI-T3.0.0.28806"
-#define LICENSE_VER_STRING "WI-T3.0.0.28806"
-#define FILE_VER_NUMBER 3, 0, 0, 28806
+#define PRODUCT_VER_STRING "3.0.0.28814"
+#define FILE_VER_STRING "WI-T3.0.0.28814"
+#define LICENSE_VER_STRING "WI-T3.0.0.28814"
+#define FILE_VER_NUMBER 3, 0, 0, 28814
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28806"
+#define FB_BUILD_NO "28814"
#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-10-22 01:24:31 UTC (rev 51752)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-22 03:14:28 UTC (rev 51753)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28806
+BuildNum=28814
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-10-23 03:15:02
|
Revision: 51760
http://firebird.svn.sourceforge.net/firebird/?rev=51760&view=rev
Author: firebirds
Date: 2010-10-23 03:14:55 +0000 (Sat, 23 Oct 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-10-22 21:18:13 UTC (rev 51759)
+++ firebird/trunk/ChangeLog 2010-10-23 03:14:55 UTC (rev 51760)
@@ -1,3 +1,132 @@
+ 2010-10-22 21:18 hvlad
+ D builds/win32/msvc8/Firebird2.sln
+ D builds/win32/msvc8/Firebird2Boot.sln
+ D builds/win32/msvc8/Firebird2_Examples.sln
+ A builds/win32/msvc8/Firebird3.sln (from /firebird/trunk/builds/win32/msvc8/Firebird2.sln:51739)
+ A builds/win32/msvc8/Firebird3Boot.sln (from /firebird/trunk/builds/win32/msvc8/Firebird2Boot.sln:51739)
+ A builds/win32/msvc8/Firebird3_Examples.sln (from /firebird/trunk/builds/win32/msvc8/Firebird2_Examples.sln:51739)
+ M builds/win32/msvc8/alice.vcproj
+ M builds/win32/msvc8/btyacc.vcproj
+ M builds/win32/msvc8/build_msg.vcproj
+ M builds/win32/msvc8/burp.vcproj
+ M builds/win32/msvc8/codes.vcproj
+ M builds/win32/msvc8/common.vcproj
+ D builds/win32/msvc8/common_classic.vcproj
+ D builds/win32/msvc8/common_static.vcproj
+ D builds/win32/msvc8/config.vcproj
+ D builds/win32/msvc8/dsql_server.vcproj
+ D builds/win32/msvc8/dsql_server_classic.vcproj
+ M builds/win32/msvc8/empbuild.vcproj
+ M builds/win32/msvc8/engine.vcproj
+ D builds/win32/msvc8/engine_classic.vcproj
+ D builds/win32/msvc8/engine_embed.vcproj
+ M builds/win32/msvc8/fb2control.vcproj
+ D builds/win32/msvc8/fb_inet_server.vcproj
+ M builds/win32/msvc8/fb_lock_print.vcproj
+ D builds/win32/msvc8/fbclient.vcproj
+ D builds/win32/msvc8/fbclient_static.vcproj
+ D builds/win32/msvc8/fbembed.vcproj
+ M builds/win32/msvc8/fbguard.vcproj
+ M builds/win32/msvc8/fbrmclib.vcproj
+ M builds/win32/msvc8/fbserver.vcproj
+ M builds/win32/msvc8/fbsvcmgr.vcproj
+ M builds/win32/msvc8/fbtrace.vcproj
+ M builds/win32/msvc8/fbtracemgr.vcproj
+ M builds/win32/msvc8/fbudf.vcproj
+ M builds/win32/msvc8/firebird2.vsprops
+ M builds/win32/msvc8/gbak.vcproj
+ D builds/win32/msvc8/gbak_embed.vcproj
+ D builds/win32/msvc8/gds32.vcproj
+ M builds/win32/msvc8/gfix.vcproj
+ M builds/win32/msvc8/gpre.vcproj
+ M builds/win32/msvc8/gpre_boot.vcproj
+ A builds/win32/msvc8/gpre_common.vcproj
+ D builds/win32/msvc8/gpre_embed.vcproj
+ D builds/win32/msvc8/gpre_static.vcproj
+ M builds/win32/msvc8/gsec.vcproj
+ M builds/win32/msvc8/gsplit.vcproj
+ M builds/win32/msvc8/gstat.vcproj
+ M builds/win32/msvc8/ib_udf.vcproj
+ M builds/win32/msvc8/ib_util.vcproj
+ M builds/win32/msvc8/instclient.vcproj
+ M builds/win32/msvc8/instreg.vcproj
+ M builds/win32/msvc8/instsvc.vcproj
+ M builds/win32/msvc8/intl.vcproj
+ M builds/win32/msvc8/intlbuild.vcproj
+ M builds/win32/msvc8/isql.vcproj
+ D builds/win32/msvc8/isql_embed.vcproj
+ D builds/win32/msvc8/lock.vcproj
+ D builds/win32/msvc8/lock_classic.vcproj
+ M builds/win32/msvc8/nbackup.vcproj
+ M builds/win32/msvc8/qli.vcproj
+ M builds/win32/msvc8/remote.vcproj
+ D builds/win32/msvc8/remote_classic.vcproj
+ M builds/win32/msvc8/udr_engine.vcproj
+ A builds/win32/msvc8/user_management.vcproj
+ D builds/win32/msvc8/utilities.vcproj
+ D builds/win32/msvc8/utilities_embed.vcproj
+ A builds/win32/msvc8/yvalve.vcproj
+New build system for Windows. MSVC8.
+
+ 2010-10-22 21:14 hvlad
+ M builds/win32/make_all.bat
+ M builds/win32/make_examples.bat
+ M builds/win32/msvc10
+ M builds/win32/msvc10/Firebird3_Examples.sln
+ M builds/win32/msvc10/btyacc.vcxproj
+Corrections
+
+ 2010-10-22 20:48 hvlad
+ M src/jrd/os/win32/ibinitdll.cpp
+Engine always works in embedded mode
+
+ 2010-10-22 17:55 hvlad
+ M builds/win32/msvc10/fbguard.vcxproj
+ M builds/win32/msvc10/fbguard.vcxproj.filters
+ M builds/win32/msvc10/gstat.vcxproj
+ M builds/win32/msvc10/gstat.vcxproj.filters
+ M builds/win32/msvc10/ib_udf.vcxproj.filters
+ M builds/win32/msvc10/ib_util.vcxproj.filters
+ M builds/win32/msvc10/instclient.vcxproj
+ M builds/win32/msvc10/instclient.vcxproj.filters
+ M builds/win32/msvc10/intl.vcxproj.filters
+ M builds/win32/msvc10/isql.vcxproj.filters
+ M builds/win32/msvc10/qli.vcxproj
+ M builds/win32/msvc10/qli.vcxproj.filters
+ M builds/win32/msvc10/remote.vcxproj
+ M builds/win32/msvc10/remote.vcxproj.filters
+ M builds/win32/msvc10/udr_engine.vcxproj.filters
+ M builds/win32/msvc10/user_management.vcxproj.filters
+Misc
+
+ 2010-10-22 15:00 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/ddl.cpp
+ M src/dsql/gen.cpp
+ M src/dsql/make.cpp
+ M src/dsql/node.h
+ M src/dsql/parse.y
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/misc/blrtable.cpp
+Refactor NULL expression
+
+ 2010-10-22 13:10 alexpeshkoff
+ M src/utilities/guard/guard.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/guard/util_proto.h
+Fixed fbguard - thanks to Damyan
+
2010-10-22 01:24 asfernandes
M builds/win32/make_boot.bat
M builds/win32/make_examples.bat
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-22 21:18:13 UTC (rev 51759)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-23 03:14:55 UTC (rev 51760)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28814
+ FORMAL BUILD NUMBER:28820
*/
-#define PRODUCT_VER_STRING "3.0.0.28814"
-#define FILE_VER_STRING "WI-T3.0.0.28814"
-#define LICENSE_VER_STRING "WI-T3.0.0.28814"
-#define FILE_VER_NUMBER 3, 0, 0, 28814
+#define PRODUCT_VER_STRING "3.0.0.28820"
+#define FILE_VER_STRING "WI-T3.0.0.28820"
+#define LICENSE_VER_STRING "WI-T3.0.0.28820"
+#define FILE_VER_NUMBER 3, 0, 0, 28820
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28814"
+#define FB_BUILD_NO "28820"
#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-10-22 21:18:13 UTC (rev 51759)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-23 03:14:55 UTC (rev 51760)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28814
+BuildNum=28820
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-10-24 03:13:27
|
Revision: 51763
http://firebird.svn.sourceforge.net/firebird/?rev=51763&view=rev
Author: firebirds
Date: 2010-10-24 03:13:20 +0000 (Sun, 24 Oct 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-10-24 00:26:00 UTC (rev 51762)
+++ firebird/trunk/ChangeLog 2010-10-24 03:13:20 UTC (rev 51763)
@@ -1,3 +1,35 @@
+ 2010-10-24 00:26 asfernandes
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/dsql/Nodes.h
+ M src/dsql/Visitors.h
+ M src/dsql/ddl.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/gen.cpp
+ M src/dsql/gen_proto.h
+ M src/dsql/make.cpp
+ M src/dsql/make_proto.h
+ M src/dsql/node.h
+ M src/dsql/pass1.cpp
+ M src/jrd/Optimizer.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/evl.cpp
+ M src/jrd/exe.h
+ M src/jrd/ext.cpp
+ M src/jrd/nod.h
+ M src/jrd/opt.cpp
+ M src/jrd/par.cpp
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/misc/blrtable.cpp
+Refactor literal values.
+
+ 2010-10-23 22:36 hvlad
+ M builds/win32/preprocess.bat
+Misc
+
2010-10-22 21:18 hvlad
D builds/win32/msvc8/Firebird2.sln
D builds/win32/msvc8/Firebird2Boot.sln
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2010-10-24 00:26:00 UTC (rev 51762)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-24 03:13:20 UTC (rev 51763)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28820
+ FORMAL BUILD NUMBER:28822
*/
-#define PRODUCT_VER_STRING "3.0.0.28820"
-#define FILE_VER_STRING "WI-T3.0.0.28820"
-#define LICENSE_VER_STRING "WI-T3.0.0.28820"
-#define FILE_VER_NUMBER 3, 0, 0, 28820
+#define PRODUCT_VER_STRING "3.0.0.28822"
+#define FILE_VER_STRING "WI-T3.0.0.28822"
+#define LICENSE_VER_STRING "WI-T3.0.0.28822"
+#define FILE_VER_NUMBER 3, 0, 0, 28822
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28820"
+#define FB_BUILD_NO "28822"
#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-10-24 00:26:00 UTC (rev 51762)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-24 03:13:20 UTC (rev 51763)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28820
+BuildNum=28822
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-10-25 03:14:06
|
Revision: 51765
http://firebird.svn.sourceforge.net/firebird/?rev=51765&view=rev
Author: firebirds
Date: 2010-10-25 03:13:59 +0000 (Mon, 25 Oct 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-10-24 21:35:45 UTC (rev 51764)
+++ firebird/trunk/ChangeLog 2010-10-25 03:13:59 UTC (rev 51765)
@@ -1,3 +1,7 @@
+ 2010-10-24 21:35 asfernandes
+ M src/dsql/parse.y
+Misc
+
2010-10-24 00:26 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 2010-10-24 21:35:45 UTC (rev 51764)
+++ firebird/trunk/src/jrd/build_no.h 2010-10-25 03:13:59 UTC (rev 51765)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:28822
+ FORMAL BUILD NUMBER:28823
*/
-#define PRODUCT_VER_STRING "3.0.0.28822"
-#define FILE_VER_STRING "WI-T3.0.0.28822"
-#define LICENSE_VER_STRING "WI-T3.0.0.28822"
-#define FILE_VER_NUMBER 3, 0, 0, 28822
+#define PRODUCT_VER_STRING "3.0.0.28823"
+#define FILE_VER_STRING "WI-T3.0.0.28823"
+#define LICENSE_VER_STRING "WI-T3.0.0.28823"
+#define FILE_VER_NUMBER 3, 0, 0, 28823
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "28822"
+#define FB_BUILD_NO "28823"
#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-10-24 21:35:45 UTC (rev 51764)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2010-10-25 03:13:59 UTC (rev 51765)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=28822
+BuildNum=28823
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...> - 2010-10-25 15:48:42
|
Revision: 51775
http://firebird.svn.sourceforge.net/firebird/?rev=51775&view=rev
Author: alexpeshkoff
Date: 2010-10-25 15:48:35 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
Patches from Damyan Ivanov
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/Makefile.in.examples
firebird/trunk/builds/posix/Makefile.in.plugins_examples
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/posix/make.rules
firebird/trunk/builds/posix/prefix.linux_powerpc
firebird/trunk/builds/posix/prefix.linux_sparc32
firebird/trunk/src/common/classes/fb_atomic.h
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in 2010-10-25 15:48:35 UTC (rev 51775)
@@ -209,6 +209,8 @@
-$(RM) $@
$(LN) $^ $@
+export LD_LIBRARY_PATH += :$(FIREBIRD)/lib
+
metadata.fdb: $(BLD_ROOT)/misc/metadata.gbak
$(GBAK) -MODE read_only -R $< $@
$(TOUCH) $@
@@ -396,14 +398,14 @@
.PHONY: qli examples message_file
-rest: qli examples message_file
+rest: qli examples message_file include_generic
qli: $(QLI)
$(QLI): $(QLI_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
-examples:
+examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/
@@ -416,7 +418,51 @@
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+#---------------------------------------------------------------------------
+# This target builds the include files for disttribution with the release
+# Some of the files differ from the ones used internally to compile the
+# software - mainly they are just flattened out to make the view simpler
+# from an external point of view.
+
+INCLUDE_DEST= $(FIREBIRD)/include
+
+include_generic: $(INCLUDE_DEST)/ib_util.h \
+ $(INCLUDE_DEST)/ibase.h
+
+# ib_util.h actually is a marker for a number of headers
+
+# All these files are #includes in ibase.h here we cat them all together
+# and remove the embedded #includes to make it simpler for external usage.
+
+IBASE_ExtraFiles = include/types_pub.h include/consts_pub.h dsql/sqlda_pub.h common/dsc_pub.h jrd/ibase.h jrd/inf_pub.h jrd/blr.h include/gen/iberror.h
+SRC_IBASE_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(IBASE_ExtraFiles))
+MAKE_HEADER_Src = $(addprefix $(SRC_ROOT)/, misc/makeHeader.cpp)
+MAKE_HEADER_Bin = ./makeHeader
+
+$(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)
+ $(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src)
+ $(CP) $^ .
+ $(MAKE_HEADER_Bin) <ibase.h >$@
+ $(RM) -f ibase.h
+
+# Copy all the other headers to the distribution directory. we use
+# ib_util.h as the marker for all the files.
+
+OtherDistribHeaders = extlib/ib_util.h \
+ yvalve/perf.h \
+ include/gen/iberror.h
+
+SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders))
+
+$(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
+ mkdir -p $(INCLUDE_DEST)
+ $(CP) $^ $(INCLUDE_DEST)/
+
+
+# There are also gds*f and gds*ada header files around if someone
+# wants them. You might need to hunt around in the old cvs tree for them.
+
#___________________________________________________________________________
# track dependencies
#
Modified: firebird/trunk/builds/posix/Makefile.in.examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.examples 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in.examples 2010-10-25 15:48:35 UTC (rev 51775)
@@ -33,7 +33,7 @@
# Add the install include directory to the search path since the
# examples need to build using those headers values.
-CFLAGS := $(CFLAGS) -I$(ROOT)/gen/firebird/include
+CFLAGS := $(CFLAGS) -I$(FIREBIRD)/include
include $(ROOT)/gen/make.defaults
Modified: firebird/trunk/builds/posix/Makefile.in.plugins_examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.plugins_examples 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/Makefile.in.plugins_examples 2010-10-25 15:48:35 UTC (rev 51775)
@@ -29,7 +29,7 @@
#
ROOT=../..
-CXXFLAGS+= -I$(ROOT)/gen/firebird/include
+CXXFLAGS+= -I$(FIREBIRD)/include
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/make.defaults 2010-10-25 15:48:35 UTC (rev 51775)
@@ -213,7 +213,7 @@
#LibraryFileName=libfbclient
LibraryFileName=libfbclient
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
-LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.${MajorVer}
+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
Modified: firebird/trunk/builds/posix/make.rules
===================================================================
--- firebird/trunk/builds/posix/make.rules 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/make.rules 2010-10-25 15:48:35 UTC (rev 51775)
@@ -39,9 +39,9 @@
endif
ifeq ($(TARGET),Release)
- WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
+ WFLAGS:= $(PROD_FLAGS) $(WFLAGS)
else
- WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD
+ WFLAGS:= $(DEV_FLAGS) $(WFLAGS) -DDEV_BUILD
endif
WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS)
Modified: firebird/trunk/builds/posix/prefix.linux_powerpc
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_powerpc 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/prefix.linux_powerpc 2010-10-25 15:48:35 UTC (rev 51775)
@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 -mcpu=powerpc
+PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3
DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
#DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor
Modified: firebird/trunk/builds/posix/prefix.linux_sparc32
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_sparc32 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/builds/posix/prefix.linux_sparc32 2010-10-25 15:48:35 UTC (rev 51775)
@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-m32 -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
+COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL
PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS)
DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
Modified: firebird/trunk/src/common/classes/fb_atomic.h
===================================================================
--- firebird/trunk/src/common/classes/fb_atomic.h 2010-10-25 15:14:41 UTC (rev 51774)
+++ firebird/trunk/src/common/classes/fb_atomic.h 2010-10-25 15:48:35 UTC (rev 51775)
@@ -437,7 +437,10 @@
// wbo 2009-10 - We tested libatomic_ops against Firebird 2.5/HPUX and the
// atomic implementation was incomplete on IA-64/HPPA
+extern "C" {
+#define AO_REQUIRE_CAS
#include <atomic_ops.h>
+};
namespace Firebird {
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