From: <fir...@us...> - 2013-08-19 00:31:43
|
Revision: 58504 http://sourceforge.net/p/firebird/code/58504 Author: firebirds Date: 2013-08-19 00:31:38 +0000 (Mon, 19 Aug 2013) 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 2013-08-18 18:53:41 UTC (rev 58503) +++ firebird/trunk/ChangeLog 2013-08-19 00:31:38 UTC (rev 58504) @@ -1,3 +1,15 @@ + 2013-08-18 18:53 asfernandes + M src/jrd/EngineInterface.h + M src/jrd/cch.cpp + M src/jrd/dfw.epp + M src/jrd/sort.cpp + M src/msgs/facilities2.sql +Misc. + + 2013-08-18 15:32 dimitr + M src/jrd/opt.cpp +Fixed the optimizer regression causing different from FB2 plans being generated + some cleanup. + 2013-08-16 12:44 alexpeshkoff M src/common/classes/locks.h M src/jrd/Attachment.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-18 18:53:41 UTC (rev 58503) +++ firebird/trunk/src/jrd/build_no.h 2013-08-19 00:31:38 UTC (rev 58504) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30594 + FORMAL BUILD NUMBER:30596 */ -#define PRODUCT_VER_STRING "3.0.0.30594" -#define FILE_VER_STRING "WI-T3.0.0.30594" -#define LICENSE_VER_STRING "WI-T3.0.0.30594" -#define FILE_VER_NUMBER 3, 0, 0, 30594 +#define PRODUCT_VER_STRING "3.0.0.30596" +#define FILE_VER_STRING "WI-T3.0.0.30596" +#define LICENSE_VER_STRING "WI-T3.0.0.30596" +#define FILE_VER_NUMBER 3, 0, 0, 30596 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30594" +#define FB_BUILD_NO "30596" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-18 18:53:41 UTC (rev 58503) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-19 00:31:38 UTC (rev 58504) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30594 +BuildNum=30596 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...> - 2013-08-20 00:31:14
|
Revision: 58511 http://sourceforge.net/p/firebird/code/58511 Author: firebirds Date: 2013-08-20 00:31:11 +0000 (Tue, 20 Aug 2013) 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 2013-08-19 18:51:55 UTC (rev 58510) +++ firebird/trunk/ChangeLog 2013-08-20 00:31:11 UTC (rev 58511) @@ -1,3 +1,38 @@ + 2013-08-19 18:51 dimitr + M src/jrd/DatabaseSnapshot.cpp +Minor optimization. + + 2013-08-19 18:50 dimitr + M src/jrd/Attachment.cpp + M src/jrd/Attachment.h + 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/jrd.cpp + M src/jrd/pag.cpp + M src/jrd/shut.cpp +Code simplification and some corrections. + + 2013-08-19 17:29 dimitr + M src/jrd/lck.cpp + M src/jrd/lck.h +Cleanup. + + 2013-08-19 15:46 dimitr + M src/lock/print.cpp +Warnings. + + 2013-08-19 15:31 asfernandes + M src/dsql/StmtNodes.cpp +Fixed (as possible) CORE-4160 - The parameterized exception does not accept not ASCII characters as parameter. + + 2013-08-19 08:17 alexpeshkoff + M src/jrd/jrd.cpp +CORE-3944 - fixed a bug in my previous commit, noticed by Adriano + 2013-08-18 18:53 asfernandes M src/jrd/EngineInterface.h M src/jrd/cch.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-19 18:51:55 UTC (rev 58510) +++ firebird/trunk/src/jrd/build_no.h 2013-08-20 00:31:11 UTC (rev 58511) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30596 + FORMAL BUILD NUMBER:30602 */ -#define PRODUCT_VER_STRING "3.0.0.30596" -#define FILE_VER_STRING "WI-T3.0.0.30596" -#define LICENSE_VER_STRING "WI-T3.0.0.30596" -#define FILE_VER_NUMBER 3, 0, 0, 30596 +#define PRODUCT_VER_STRING "3.0.0.30602" +#define FILE_VER_STRING "WI-T3.0.0.30602" +#define LICENSE_VER_STRING "WI-T3.0.0.30602" +#define FILE_VER_NUMBER 3, 0, 0, 30602 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30596" +#define FB_BUILD_NO "30602" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-19 18:51:55 UTC (rev 58510) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-20 00:31:11 UTC (rev 58511) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30596 +BuildNum=30602 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...> - 2013-08-21 01:01:53
|
Revision: 58513 http://sourceforge.net/p/firebird/code/58513 Author: firebirds Date: 2013-08-21 01:01:49 +0000 (Wed, 21 Aug 2013) 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 2013-08-20 06:11:12 UTC (rev 58512) +++ firebird/trunk/ChangeLog 2013-08-21 01:01:49 UTC (rev 58513) @@ -1,3 +1,8 @@ + 2013-08-20 06:11 dimitr + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/DatabaseSnapshot.h +Code simplification. + 2013-08-19 18:51 dimitr M src/jrd/DatabaseSnapshot.cpp Minor optimization. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-20 06:11:12 UTC (rev 58512) +++ firebird/trunk/src/jrd/build_no.h 2013-08-21 01:01:49 UTC (rev 58513) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30602 + FORMAL BUILD NUMBER:30603 */ -#define PRODUCT_VER_STRING "3.0.0.30602" -#define FILE_VER_STRING "WI-T3.0.0.30602" -#define LICENSE_VER_STRING "WI-T3.0.0.30602" -#define FILE_VER_NUMBER 3, 0, 0, 30602 +#define PRODUCT_VER_STRING "3.0.0.30603" +#define FILE_VER_STRING "WI-T3.0.0.30603" +#define LICENSE_VER_STRING "WI-T3.0.0.30603" +#define FILE_VER_NUMBER 3, 0, 0, 30603 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30602" +#define FB_BUILD_NO "30603" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-20 06:11:12 UTC (rev 58512) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-21 01:01:49 UTC (rev 58513) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30602 +BuildNum=30603 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...> - 2013-08-23 00:35:28
|
Revision: 58531 http://sourceforge.net/p/firebird/code/58531 Author: firebirds Date: 2013-08-23 00:35:24 +0000 (Fri, 23 Aug 2013) 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 2013-08-22 13:52:04 UTC (rev 58530) +++ firebird/trunk/ChangeLog 2013-08-23 00:35:24 UTC (rev 58531) @@ -1,3 +1,93 @@ + 2013-08-22 13:52 dimitr + M builds/win32/make_examples.bat +Updated the distributed examples. + + 2013-08-22 09:24 dimitr + M builds/win32/make_all.bat +Added plugins.conf to the distribution. + + 2013-08-22 06:23 dimitr + M builds/win32/make_all.bat +Added READMEs and new API headers to Windows snapshots. + + 2013-08-21 13:51 dimitr + M src/isql/isql.h + M src/isql/show.epp + M src/msgs/facilities2.sql + M src/msgs/messages2.sql +Improved the ISQL output for the SHOW GRANT command. + + 2013-08-21 11:56 alexpeshkoff + M src/jrd/DatabaseSnapshot.cpp +Fixed assertion in classic mode + + 2013-08-21 09:17 dimitr + M src/dsql/StmtNodes.cpp + M src/dsql/gen.cpp + M src/jrd/Routine.cpp + M src/jrd/recsrc/BufferedStream.cpp + M src/jrd/val.h +On second thought, I'm removing the artifical message size limit. + + 2013-08-21 09:14 dimitr + M src/jrd/RecordSourceNodes.cpp +Removed the record size limit for aggregates/unions. + + 2013-08-21 09:11 dimitr + M src/jrd/exe.h + M src/jrd/opt.cpp + M src/jrd/recsrc/RecordSource.h + M src/jrd/recsrc/SortedStream.cpp + M src/jrd/sort.cpp + M src/jrd/sort.h +Increased the sort record size limit to 1MB. I've kept this limit due to the possible performance implications, but it can be extended/removed any time. + + 2013-08-21 07:41 dimitr + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/DatabaseSnapshot.h +Minor refactoring and support for records longer than 64KB (not really actual, but just in case). + + 2013-08-21 07:40 dimitr + M src/jrd/RecordBuffer.cpp + M src/jrd/req.h + M src/jrd/tra.h + M src/jrd/validation.cpp + M src/jrd/vio.cpp +Core support for records longer than 64KB. Not exposed to the external world yet. + + 2013-08-21 07:19 dimitr + M src/jrd/ext.cpp +Misc. + + 2013-08-21 07:18 dimitr + M src/jrd/recsrc/BitmapTableScan.cpp + M src/jrd/recsrc/BufferedStream.cpp + M src/jrd/recsrc/ConditionalStream.cpp + M src/jrd/recsrc/ExternalTableScan.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/VirtualTableScan.cpp + M src/jrd/recsrc/WindowedStream.cpp +Misc. + + 2013-08-21 07:16 dimitr + M src/dsql/AggNodes.h +Impure offsets must be 32-bit. + 2013-08-20 06:11 dimitr M src/jrd/DatabaseSnapshot.cpp M src/jrd/DatabaseSnapshot.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-22 13:52:04 UTC (rev 58530) +++ firebird/trunk/src/jrd/build_no.h 2013-08-23 00:35:24 UTC (rev 58531) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30603 + FORMAL BUILD NUMBER:30616 */ -#define PRODUCT_VER_STRING "3.0.0.30603" -#define FILE_VER_STRING "WI-T3.0.0.30603" -#define LICENSE_VER_STRING "WI-T3.0.0.30603" -#define FILE_VER_NUMBER 3, 0, 0, 30603 +#define PRODUCT_VER_STRING "3.0.0.30616" +#define FILE_VER_STRING "WI-T3.0.0.30616" +#define LICENSE_VER_STRING "WI-T3.0.0.30616" +#define FILE_VER_NUMBER 3, 0, 0, 30616 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30603" +#define FB_BUILD_NO "30616" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-22 13:52:04 UTC (rev 58530) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-23 00:35:24 UTC (rev 58531) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30603 +BuildNum=30616 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...> - 2013-08-24 00:29:28
|
Revision: 58538 http://sourceforge.net/p/firebird/code/58538 Author: firebirds Date: 2013-08-24 00:29:25 +0000 (Sat, 24 Aug 2013) 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 2013-08-23 15:37:20 UTC (rev 58537) +++ firebird/trunk/ChangeLog 2013-08-24 00:29:25 UTC (rev 58538) @@ -1,3 +1,89 @@ + 2013-08-23 15:37 asfernandes + M builds/posix/make.shared.targets +Hope this fixes the POSIX build. + + 2013-08-23 10:44 alexpeshkoff + D extern/editline/CHANGELOG + R extern/editline/COPYING + A extern/editline/ChangeLog + R extern/editline/INSTALL + R extern/editline/Makefile.am + R extern/editline/Makefile.in + R extern/editline/THANKS + R extern/editline/acinclude.m4 + R extern/editline/aclocal.m4 + A extern/editline/compile + R extern/editline/config.guess + R extern/editline/config.h.in + R extern/editline/config.sub + R extern/editline/configure + R extern/editline/configure.ac + R extern/editline/depcomp + R extern/editline/install-sh + A extern/editline/libedit.pc.in + R extern/editline/ltmain.sh + A extern/editline/m4 + A extern/editline/m4/libtool.m4 + A extern/editline/m4/ltoptions.m4 + A extern/editline/m4/ltsugar.m4 + A extern/editline/m4/ltversion.m4 + A extern/editline/m4/lt~obsolete.m4 + R extern/editline/missing + R extern/editline/src + A extern/editline/src/Makefile.am + A extern/editline/src/Makefile.in + A extern/editline/src/chared.c + A extern/editline/src/chared.h + A extern/editline/src/chartype.c + A extern/editline/src/chartype.h + A extern/editline/src/common.c + A extern/editline/src/editline + A extern/editline/src/editline/readline.h + A extern/editline/src/el.c + A extern/editline/src/el.h + A extern/editline/src/eln.c + A extern/editline/src/emacs.c + A extern/editline/src/fgetln.c + A extern/editline/src/filecomplete.c + A extern/editline/src/filecomplete.h + A extern/editline/src/hist.c + A extern/editline/src/hist.h + A extern/editline/src/histedit.h + A extern/editline/src/history.c + A extern/editline/src/keymacro.c + A extern/editline/src/keymacro.h + A extern/editline/src/makelist + A extern/editline/src/map.c + A extern/editline/src/map.h + A extern/editline/src/parse.c + A extern/editline/src/parse.h + A extern/editline/src/prompt.c + A extern/editline/src/prompt.h + A extern/editline/src/read.c + A extern/editline/src/read.h + A extern/editline/src/readline.c + A extern/editline/src/refresh.c + A extern/editline/src/refresh.h + A extern/editline/src/search.c + A extern/editline/src/search.h + A extern/editline/src/shlib_version + A extern/editline/src/sig.c + A extern/editline/src/sig.h + A extern/editline/src/strlcat.c + A extern/editline/src/strlcpy.c + A extern/editline/src/sys.h + A extern/editline/src/terminal.c + A extern/editline/src/terminal.h + A extern/editline/src/tokenizer.c + A extern/editline/src/tty.c + A extern/editline/src/tty.h + A extern/editline/src/unvis.c + A extern/editline/src/vi.c + A extern/editline/src/vis.c + A extern/editline/src/vis.h + A extern/editline/src/wcsdup.c +Replaced editline with new version, recommended by Frank + 2013-08-22 13:52 dimitr M builds/win32/make_examples.bat Updated the distributed examples. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-23 15:37:20 UTC (rev 58537) +++ firebird/trunk/src/jrd/build_no.h 2013-08-24 00:29:25 UTC (rev 58538) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30616 + FORMAL BUILD NUMBER:30618 */ -#define PRODUCT_VER_STRING "3.0.0.30616" -#define FILE_VER_STRING "WI-T3.0.0.30616" -#define LICENSE_VER_STRING "WI-T3.0.0.30616" -#define FILE_VER_NUMBER 3, 0, 0, 30616 +#define PRODUCT_VER_STRING "3.0.0.30618" +#define FILE_VER_STRING "WI-T3.0.0.30618" +#define LICENSE_VER_STRING "WI-T3.0.0.30618" +#define FILE_VER_NUMBER 3, 0, 0, 30618 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30616" +#define FB_BUILD_NO "30618" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-23 15:37:20 UTC (rev 58537) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-24 00:29:25 UTC (rev 58538) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30616 +BuildNum=30618 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...> - 2013-08-25 01:31:14
|
Revision: 58543 http://sourceforge.net/p/firebird/code/58543 Author: firebirds Date: 2013-08-25 01:31:10 +0000 (Sun, 25 Aug 2013) 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 2013-08-24 12:00:55 UTC (rev 58542) +++ firebird/trunk/ChangeLog 2013-08-25 01:31:10 UTC (rev 58543) @@ -1,3 +1,7 @@ + 2013-08-24 08:43 dimitr + M builds/win32/make_examples.bat +Fixed snapshot builds. + 2013-08-23 15:37 asfernandes M builds/posix/make.shared.targets Hope this fixes the POSIX build. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-24 12:00:55 UTC (rev 58542) +++ firebird/trunk/src/jrd/build_no.h 2013-08-25 01:31:10 UTC (rev 58543) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30618 + FORMAL BUILD NUMBER:30619 */ -#define PRODUCT_VER_STRING "3.0.0.30618" -#define FILE_VER_STRING "WI-T3.0.0.30618" -#define LICENSE_VER_STRING "WI-T3.0.0.30618" -#define FILE_VER_NUMBER 3, 0, 0, 30618 +#define PRODUCT_VER_STRING "3.0.0.30619" +#define FILE_VER_STRING "WI-T3.0.0.30619" +#define LICENSE_VER_STRING "WI-T3.0.0.30619" +#define FILE_VER_NUMBER 3, 0, 0, 30619 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30618" +#define FB_BUILD_NO "30619" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-24 12:00:55 UTC (rev 58542) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-25 01:31:10 UTC (rev 58543) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30618 +BuildNum=30619 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...> - 2013-08-27 00:31:17
|
Revision: 58549 http://sourceforge.net/p/firebird/code/58549 Author: firebirds Date: 2013-08-27 00:31:14 +0000 (Tue, 27 Aug 2013) 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 2013-08-26 16:06:26 UTC (rev 58548) +++ firebird/trunk/ChangeLog 2013-08-27 00:31:14 UTC (rev 58549) @@ -1,3 +1,20 @@ + 2013-08-26 16:06 asfernandes + M src/dsql/StmtNodes.cpp + M src/dsql/dsql.cpp +Fixed CORE-4184 - Executing empty EXECUTE BLOCK with NotNull output parameter raised error. + + 2013-08-26 10:02 dimitr + M src/common/isc_s_proto.h +Temporary bugfix for the thread scheduling issue on Linux. + + 2013-08-26 09:50 dimitr + M src/jrd/DatabaseSnapshot.cpp +Misc. + + 2013-08-26 06:28 alexpeshkoff + M src/jrd/lck.cpp +Fixed CORE-4185: message "Invalid lock ID" happened due to incorrect lock kind + 2013-08-24 08:43 dimitr M builds/win32/make_examples.bat Fixed snapshot builds. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-26 16:06:26 UTC (rev 58548) +++ firebird/trunk/src/jrd/build_no.h 2013-08-27 00:31:14 UTC (rev 58549) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30619 + FORMAL BUILD NUMBER:30623 */ -#define PRODUCT_VER_STRING "3.0.0.30619" -#define FILE_VER_STRING "WI-T3.0.0.30619" -#define LICENSE_VER_STRING "WI-T3.0.0.30619" -#define FILE_VER_NUMBER 3, 0, 0, 30619 +#define PRODUCT_VER_STRING "3.0.0.30623" +#define FILE_VER_STRING "WI-T3.0.0.30623" +#define LICENSE_VER_STRING "WI-T3.0.0.30623" +#define FILE_VER_NUMBER 3, 0, 0, 30623 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30619" +#define FB_BUILD_NO "30623" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-26 16:06:26 UTC (rev 58548) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-27 00:31:14 UTC (rev 58549) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30619 +BuildNum=30623 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fs...@us...> - 2013-08-27 17:04:04
|
Revision: 58550 http://sourceforge.net/p/firebird/code/58550 Author: fsg Date: 2013-08-27 17:04:00 +0000 (Tue, 27 Aug 2013) Log Message: ----------- enable UTF8 support for the new editline version and isql Modified Paths: -------------- firebird/trunk/builds/posix/Makefile.in.extern.editline firebird/trunk/extern/editline/src/eln.c firebird/trunk/src/isql/isql.epp Modified: firebird/trunk/builds/posix/Makefile.in.extern.editline =================================================================== --- firebird/trunk/builds/posix/Makefile.in.extern.editline 2013-08-27 00:31:14 UTC (rev 58549) +++ firebird/trunk/builds/posix/Makefile.in.extern.editline 2013-08-27 17:04:00 UTC (rev 58550) @@ -62,7 +62,7 @@ libeditline : $(LIB)/libedit.a $(LIB)/libedit.a: - cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared + cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared --enable-widec $(MAKE) -C $(ROOT)/extern/editline cp $(ROOT)/extern/editline/src/.libs/libedit.a $(LIB) Modified: firebird/trunk/extern/editline/src/eln.c =================================================================== --- firebird/trunk/extern/editline/src/eln.c 2013-08-27 00:31:14 UTC (rev 58549) +++ firebird/trunk/extern/editline/src/eln.c 2013-08-27 17:04:00 UTC (rev 58550) @@ -75,10 +75,12 @@ el_gets(EditLine *el, int *nread) { const wchar_t *tmp; - - el->el_flags |= IGNORE_EXTCHARS; +//we don't want to ignore extended chars with UTF8 charsets /FSG 20011 + if (!(el->el_flags & CHARSET_IS_UTF8)) + el->el_flags |= IGNORE_EXTCHARS; tmp = el_wgets(el, nread); - el->el_flags &= ~IGNORE_EXTCHARS; + if (!(el->el_flags & CHARSET_IS_UTF8)) + el->el_flags &= ~IGNORE_EXTCHARS; return ct_encode_string(tmp, &el->el_lgcyconv); } Modified: firebird/trunk/src/isql/isql.epp =================================================================== --- firebird/trunk/src/isql/isql.epp 2013-08-27 00:31:14 UTC (rev 58549) +++ firebird/trunk/src/isql/isql.epp 2013-08-27 17:04:00 UTC (rev 58550) @@ -83,6 +83,7 @@ // This is a local file included in our distribution - but not always // compiled into the system #include "editline.h" +#include <locale.h> #endif enum literal_string_type @@ -532,6 +533,9 @@ isqlGlob.major_ods = 0; isqlGlob.minor_ods = 0; +#ifdef HAVE_EDITLINE_H + setlocale(LC_CTYPE, ""); +#endif int rc = ISQL_main(argc, argv); return rc; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2013-08-28 00:27:36
|
Revision: 58551 http://sourceforge.net/p/firebird/code/58551 Author: firebirds Date: 2013-08-28 00:27:32 +0000 (Wed, 28 Aug 2013) 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 2013-08-27 17:04:00 UTC (rev 58550) +++ firebird/trunk/ChangeLog 2013-08-28 00:27:32 UTC (rev 58551) @@ -1,3 +1,9 @@ + 2013-08-27 17:04 fsg + M builds/posix/Makefile.in.extern.editline + M extern/editline/src/eln.c + M src/isql/isql.epp +enable UTF8 support for the new editline version and isql + 2013-08-26 16:06 asfernandes M src/dsql/StmtNodes.cpp M src/dsql/dsql.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-27 17:04:00 UTC (rev 58550) +++ firebird/trunk/src/jrd/build_no.h 2013-08-28 00:27:32 UTC (rev 58551) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30623 + FORMAL BUILD NUMBER:30624 */ -#define PRODUCT_VER_STRING "3.0.0.30623" -#define FILE_VER_STRING "WI-T3.0.0.30623" -#define LICENSE_VER_STRING "WI-T3.0.0.30623" -#define FILE_VER_NUMBER 3, 0, 0, 30623 +#define PRODUCT_VER_STRING "3.0.0.30624" +#define FILE_VER_STRING "WI-T3.0.0.30624" +#define LICENSE_VER_STRING "WI-T3.0.0.30624" +#define FILE_VER_NUMBER 3, 0, 0, 30624 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30623" +#define FB_BUILD_NO "30624" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-27 17:04:00 UTC (rev 58550) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-28 00:27:32 UTC (rev 58551) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30623 +BuildNum=30624 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...> - 2013-08-30 00:30:06
|
Revision: 58555 http://sourceforge.net/p/firebird/code/58555 Author: firebirds Date: 2013-08-30 00:30:04 +0000 (Fri, 30 Aug 2013) 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 2013-08-29 16:05:37 UTC (rev 58554) +++ firebird/trunk/ChangeLog 2013-08-30 00:30:04 UTC (rev 58555) @@ -1,3 +1,17 @@ + 2013-08-29 16:05 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/Nodes.h + M src/dsql/Parser.cpp + M src/dsql/make.cpp + M src/dsql/make_proto.h + M src/dsql/parse.y +Simplificate representation of 64-bit numbers and sequences in the parser. + + 2013-08-29 15:51 asfernandes + M src/dsql/Parser.cpp +Fixed CORE-4198 - Incorrect "token unknown" error when the SQL string ends with a hex number literal. + 2013-08-27 17:04 fsg M builds/posix/Makefile.in.extern.editline M extern/editline/src/eln.c Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-29 16:05:37 UTC (rev 58554) +++ firebird/trunk/src/jrd/build_no.h 2013-08-30 00:30:04 UTC (rev 58555) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30624 + FORMAL BUILD NUMBER:30626 */ -#define PRODUCT_VER_STRING "3.0.0.30624" -#define FILE_VER_STRING "WI-T3.0.0.30624" -#define LICENSE_VER_STRING "WI-T3.0.0.30624" -#define FILE_VER_NUMBER 3, 0, 0, 30624 +#define PRODUCT_VER_STRING "3.0.0.30626" +#define FILE_VER_STRING "WI-T3.0.0.30626" +#define LICENSE_VER_STRING "WI-T3.0.0.30626" +#define FILE_VER_NUMBER 3, 0, 0, 30626 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30624" +#define FB_BUILD_NO "30626" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-29 16:05:37 UTC (rev 58554) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-30 00:30:04 UTC (rev 58555) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30624 +BuildNum=30626 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...> - 2013-08-31 01:21:51
|
Revision: 58559 http://sourceforge.net/p/firebird/code/58559 Author: firebirds Date: 2013-08-31 01:21:47 +0000 (Sat, 31 Aug 2013) 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 2013-08-30 08:42:24 UTC (rev 58558) +++ firebird/trunk/ChangeLog 2013-08-31 01:21:47 UTC (rev 58559) @@ -1,3 +1,7 @@ + 2013-08-30 08:42 paulbeach + M builds/posix/firebird.vers +Enable support for the Cobol pre-compiler in libfbclient and libfbembed should anyone want to compile it and use it. + 2013-08-29 16:05 asfernandes M src/dsql/DdlNodes.epp M src/dsql/DdlNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-08-30 08:42:24 UTC (rev 58558) +++ firebird/trunk/src/jrd/build_no.h 2013-08-31 01:21:47 UTC (rev 58559) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30626 + FORMAL BUILD NUMBER:30627 */ -#define PRODUCT_VER_STRING "3.0.0.30626" -#define FILE_VER_STRING "WI-T3.0.0.30626" -#define LICENSE_VER_STRING "WI-T3.0.0.30626" -#define FILE_VER_NUMBER 3, 0, 0, 30626 +#define PRODUCT_VER_STRING "3.0.0.30627" +#define FILE_VER_STRING "WI-T3.0.0.30627" +#define LICENSE_VER_STRING "WI-T3.0.0.30627" +#define FILE_VER_NUMBER 3, 0, 0, 30627 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30626" +#define FB_BUILD_NO "30627" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-30 08:42:24 UTC (rev 58558) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-31 01:21:47 UTC (rev 58559) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30626 +BuildNum=30627 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...> - 2013-09-03 00:33:53
|
Revision: 58562 http://sourceforge.net/p/firebird/code/58562 Author: firebirds Date: 2013-09-03 00:33:50 +0000 (Tue, 03 Sep 2013) 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 2013-09-02 13:21:37 UTC (rev 58561) +++ firebird/trunk/ChangeLog 2013-09-03 00:33:50 UTC (rev 58562) @@ -1,3 +1,7 @@ + 2013-09-02 13:21 alexpeshkoff + M src/jrd/lck.cpp +Rollback bad fix for CORE-4185 + 2013-08-30 08:42 paulbeach M builds/posix/firebird.vers Enable support for the Cobol pre-compiler in libfbclient and libfbembed should anyone want to compile it and use it. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-02 13:21:37 UTC (rev 58561) +++ firebird/trunk/src/jrd/build_no.h 2013-09-03 00:33:50 UTC (rev 58562) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30627 + FORMAL BUILD NUMBER:30628 */ -#define PRODUCT_VER_STRING "3.0.0.30627" -#define FILE_VER_STRING "WI-T3.0.0.30627" -#define LICENSE_VER_STRING "WI-T3.0.0.30627" -#define FILE_VER_NUMBER 3, 0, 0, 30627 +#define PRODUCT_VER_STRING "3.0.0.30628" +#define FILE_VER_STRING "WI-T3.0.0.30628" +#define LICENSE_VER_STRING "WI-T3.0.0.30628" +#define FILE_VER_NUMBER 3, 0, 0, 30628 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30627" +#define FB_BUILD_NO "30628" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-02 13:21:37 UTC (rev 58561) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-03 00:33:50 UTC (rev 58562) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30627 +BuildNum=30628 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...> - 2013-09-04 01:05:31
|
Revision: 58564 http://sourceforge.net/p/firebird/code/58564 Author: firebirds Date: 2013-09-04 01:05:25 +0000 (Wed, 04 Sep 2013) 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 2013-09-03 15:46:46 UTC (rev 58563) +++ firebird/trunk/ChangeLog 2013-09-04 01:05:25 UTC (rev 58564) @@ -1,3 +1,7 @@ + 2013-09-03 15:46 asfernandes + M src/dsql/PackageNodes.epp +Fixed CORE-4203 - Cannot create packaged routines with [VAR]CHAR parameters. + 2013-09-02 13:21 alexpeshkoff M src/jrd/lck.cpp Rollback bad fix for CORE-4185 Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-03 15:46:46 UTC (rev 58563) +++ firebird/trunk/src/jrd/build_no.h 2013-09-04 01:05:25 UTC (rev 58564) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30628 + FORMAL BUILD NUMBER:30629 */ -#define PRODUCT_VER_STRING "3.0.0.30628" -#define FILE_VER_STRING "WI-T3.0.0.30628" -#define LICENSE_VER_STRING "WI-T3.0.0.30628" -#define FILE_VER_NUMBER 3, 0, 0, 30628 +#define PRODUCT_VER_STRING "3.0.0.30629" +#define FILE_VER_STRING "WI-T3.0.0.30629" +#define LICENSE_VER_STRING "WI-T3.0.0.30629" +#define FILE_VER_NUMBER 3, 0, 0, 30629 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30628" +#define FB_BUILD_NO "30629" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-03 15:46:46 UTC (rev 58563) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-04 01:05:25 UTC (rev 58564) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30628 +BuildNum=30629 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2013-09-04 07:21:01
|
Revision: 58566 http://sourceforge.net/p/firebird/code/58566 Author: dimitr Date: 2013-09-04 07:20:56 +0000 (Wed, 04 Sep 2013) Log Message: ----------- Improved the error reporting. Modified Paths: -------------- firebird/trunk/lang_helpers/gds_codes.ftn firebird/trunk/lang_helpers/gds_codes.pas firebird/trunk/src/dsql/ExprNodes.cpp firebird/trunk/src/dsql/StmtNodes.cpp firebird/trunk/src/include/gen/codetext.h firebird/trunk/src/include/gen/iberror.h firebird/trunk/src/include/gen/msgs.h firebird/trunk/src/include/gen/sql_code.h firebird/trunk/src/include/gen/sql_state.h firebird/trunk/src/msgs/facilities2.sql firebird/trunk/src/msgs/messages2.sql firebird/trunk/src/msgs/system_errors2.sql Modified: firebird/trunk/lang_helpers/gds_codes.ftn =================================================================== --- firebird/trunk/lang_helpers/gds_codes.ftn 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/lang_helpers/gds_codes.ftn 2013-09-04 07:20:56 UTC (rev 58566) @@ -1528,6 +1528,8 @@ PARAMETER (GDS__include_miss = 335545057) INTEGER*4 GDS__protect_ownership PARAMETER (GDS__protect_ownership = 335545058) + INTEGER*4 GDS__badvarnum + PARAMETER (GDS__badvarnum = 335545059) 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 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/lang_helpers/gds_codes.pas 2013-09-04 07:20:56 UTC (rev 58566) @@ -771,6 +771,7 @@ gds_include_depth = 335545056; gds_include_miss = 335545057; gds_protect_ownership = 335545058; + gds_badvarnum = 335545059; gds_gfix_db_name = 335740929; gds_gfix_invalid_sw = 335740930; gds_gfix_incmp_sw = 335740932; Modified: firebird/trunk/src/dsql/ExprNodes.cpp =================================================================== --- firebird/trunk/src/dsql/ExprNodes.cpp 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/dsql/ExprNodes.cpp 2013-09-04 07:20:56 UTC (rev 58566) @@ -11109,7 +11109,7 @@ vec<DeclareVariableNode*>* vector = csb->csb_variables; if (!vector || n >= vector->count()) - PAR_syntax_error(csb, "variable identifier"); + PAR_error(csb, Arg::Gds(isc_badvarnum)); VariableNode* node = FB_NEW(pool) VariableNode(pool); node->varId = n; @@ -11208,7 +11208,7 @@ vec<DeclareVariableNode*>* vector = csb->csb_variables; if (!vector || varId >= vector->count() || !(varDecl = (*vector)[varId])) - PAR_syntax_error(csb, "variable identifier"); + PAR_error(csb, Arg::Gds(isc_badvarnum)); return this; } Modified: firebird/trunk/src/dsql/StmtNodes.cpp =================================================================== --- firebird/trunk/src/dsql/StmtNodes.cpp 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/dsql/StmtNodes.cpp 2013-09-04 07:20:56 UTC (rev 58566) @@ -3593,7 +3593,7 @@ vec<DeclareVariableNode*>* vector = csb->csb_variables; if (!vector || node->varId >= vector->count()) - PAR_syntax_error(csb, "variable identifier"); + PAR_error(csb, Arg::Gds(isc_badvarnum)); return node; } @@ -3626,7 +3626,7 @@ vec<DeclareVariableNode*>* vector = csb->csb_variables; if (!vector || varId >= vector->count() || !(varDecl = (*vector)[varId])) - PAR_syntax_error(csb, "variable identifier"); + PAR_error(csb, Arg::Gds(isc_badvarnum)); return this; } Modified: firebird/trunk/src/include/gen/codetext.h =================================================================== --- firebird/trunk/src/include/gen/codetext.h 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/include/gen/codetext.h 2013-09-04 07:20:56 UTC (rev 58566) @@ -760,6 +760,7 @@ {"include_depth", 335545056}, {"include_miss", 335545057}, {"protect_ownership", 335545058}, + {"badvarnum", 335545059}, {"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 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/include/gen/iberror.h 2013-09-04 07:20:56 UTC (rev 58566) @@ -794,6 +794,7 @@ const ISC_STATUS isc_include_depth = 335545056L; const ISC_STATUS isc_include_miss = 335545057L; const ISC_STATUS isc_protect_ownership = 335545058L; +const ISC_STATUS isc_badvarnum = 335545059L; const ISC_STATUS isc_gfix_db_name = 335740929L; const ISC_STATUS isc_gfix_invalid_sw = 335740930L; const ISC_STATUS isc_gfix_incmp_sw = 335740932L; @@ -1238,7 +1239,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 = 1182; +const ISC_STATUS isc_err_max = 1183; #else /* c definitions */ @@ -2002,6 +2003,7 @@ #define isc_include_depth 335545056L #define isc_include_miss 335545057L #define isc_protect_ownership 335545058L +#define isc_badvarnum 335545059L #define isc_gfix_db_name 335740929L #define isc_gfix_invalid_sw 335740930L #define isc_gfix_incmp_sw 335740932L @@ -2446,7 +2448,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 1182 +#define isc_err_max 1183 #endif Modified: firebird/trunk/src/include/gen/msgs.h =================================================================== --- firebird/trunk/src/include/gen/msgs.h 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/include/gen/msgs.h 2013-09-04 07:20:56 UTC (rev 58566) @@ -129,7 +129,7 @@ {335544426, "context not defined (BLR error)"}, /* ctxnotdef */ {335544427, "data operation not supported"}, /* datnotsup */ {335544428, "undefined message number"}, /* badmsgnum */ - {335544429, "bad parameter number"}, /* badparnum */ + {335544429, "undefined parameter number"}, /* badparnum */ {335544430, "unable to allocate memory from operating system"}, /* virmemexh */ {335544431, "blocking signal has been received"}, /* blocking_signal */ {335544432, "lock manager error"}, /* lockmanerr */ @@ -763,6 +763,7 @@ {335545056, "Include depth too big"}, /* include_depth */ {335545057, "File to include not found"}, /* include_miss */ {335545058, "Only the owner can change the ownership"}, /* protect_ownership */ + {335545059, "undefined variable number"}, /* badvarnum */ {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 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/include/gen/sql_code.h 2013-09-04 07:20:56 UTC (rev 58566) @@ -759,6 +759,7 @@ {335545056, -902}, /* 736 include_depth */ {335545057, -902}, /* 737 include_miss */ {335545058, -552}, /* 738 protect_ownership */ + {335545059, -901}, /* 739 badvarnum */ {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 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/include/gen/sql_state.h 2013-09-04 07:20:56 UTC (rev 58566) @@ -759,6 +759,7 @@ {335545056, "XX000"}, // 736 include_depth {335545057, "XX000"}, // 737 include_miss {335545058, "28000"}, // 738 protect_ownership + {335545059, "HY000"}, // 739 badvarnum {335740929, "00000"}, // 1 gfix_db_name {335740930, "00000"}, // 2 gfix_invalid_sw {335740932, "00000"}, // 4 gfix_incmp_sw Modified: firebird/trunk/src/msgs/facilities2.sql =================================================================== --- firebird/trunk/src/msgs/facilities2.sql 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/msgs/facilities2.sql 2013-09-04 07:20:56 UTC (rev 58566) @@ -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 (?, ?, ?, ?); -- -('2013-08-04 17:52:41', 'JRD', 0, 739) +('2013-09-04 11:02:00', 'JRD', 0, 740) ('2012-01-23 20:10:30', 'QLI', 1, 532) ('2009-07-16 05:26:11', 'GFIX', 3, 121) ('1996-11-07 13:39:40', 'GPRE', 4, 1) Modified: firebird/trunk/src/msgs/messages2.sql =================================================================== --- firebird/trunk/src/msgs/messages2.sql 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/msgs/messages2.sql 2013-09-04 07:20:56 UTC (rev 58566) @@ -197,7 +197,7 @@ ('ctxnotdef', NULL, NULL, NULL, 0, 106, NULL, 'context not defined (BLR error)', NULL, NULL); ('datnotsup', NULL, NULL, NULL, 0, 107, NULL, 'data operation not supported', NULL, NULL); ('badmsgnum', NULL, NULL, NULL, 0, 108, NULL, 'undefined message number', NULL, NULL); -('badparnum', NULL, NULL, NULL, 0, 109, NULL, 'bad parameter number', NULL, NULL); +('badparnum', NULL, NULL, NULL, 0, 109, NULL, 'undefined parameter number', NULL, NULL); ('virmemexh', NULL, NULL, NULL, 0, 110, NULL, 'unable to allocate memory from operating system', NULL, NULL); ('blocking_signal', NULL, NULL, NULL, 0, 111, NULL, 'blocking signal has been received', NULL, NULL); ('lockmanerr', NULL, NULL, NULL, 0, 112, NULL, 'lock manager error', NULL, NULL); @@ -846,6 +846,7 @@ ('include_depth', NULL, 'config_file.cpp', NULL, 0, 736, NULL, 'Include depth too big', NULL, NULL); ('include_miss', NULL, 'config_file.cpp', NULL, 0, 737, NULL, 'File to include not found', NULL, NULL); ('protect_ownership', 'check_owner', 'vio.cpp', NULL, 0, 738, NULL, 'Only the owner can change the ownership', NULL, NULL); +('badvarnum', NULL, NULL, NULL, 0, 739, NULL, 'undefined variable number', 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 2013-09-04 06:01:55 UTC (rev 58565) +++ firebird/trunk/src/msgs/system_errors2.sql 2013-09-04 07:20:56 UTC (rev 58566) @@ -745,6 +745,7 @@ (-902, 'XX', '000', 0, 736, 'include_depth', NULL, NULL) (-902, 'XX', '000', 0, 737, 'include_miss', NULL, NULL) (-552, '28', '000', 0, 738, 'protect_ownership', NULL, NULL) +(-901, 'HY', '000', 0, 739, 'badvarnum', NULL, NULL) -- 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: <asf...@us...> - 2013-09-04 15:54:22
|
Revision: 58569 http://sourceforge.net/p/firebird/code/58569 Author: asfernandes Date: 2013-09-04 15:54:19 +0000 (Wed, 04 Sep 2013) Log Message: ----------- Improvement CORE-4199 - Add optional START WITH clause to identity columns. Modified Paths: -------------- firebird/trunk/doc/sql.extensions/README.identity_columns.txt firebird/trunk/src/dsql/DdlNodes.epp firebird/trunk/src/dsql/DdlNodes.h firebird/trunk/src/dsql/parse.y firebird/trunk/src/isql/extract.epp Modified: firebird/trunk/doc/sql.extensions/README.identity_columns.txt =================================================================== --- firebird/trunk/doc/sql.extensions/README.identity_columns.txt 2013-09-04 15:39:30 UTC (rev 58568) +++ firebird/trunk/doc/sql.extensions/README.identity_columns.txt 2013-09-04 15:54:19 UTC (rev 58569) @@ -11,7 +11,7 @@ Syntax: <column definition> ::= - <name> <type> GENERATED BY DEFAULT AS IDENTITY <constraints> + <name> <type> GENERATED BY DEFAULT AS IDENTITY [ (START WITH <value>) ] <constraints> Syntax rules: - The type of an identity column must be an exact number type with zero scale. That includes: Modified: firebird/trunk/src/dsql/DdlNodes.epp =================================================================== --- firebird/trunk/src/dsql/DdlNodes.epp 2013-09-04 15:39:30 UTC (rev 58568) +++ firebird/trunk/src/dsql/DdlNodes.epp 2013-09-04 15:54:19 UTC (rev 58569) @@ -4890,14 +4890,8 @@ executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_BEFORE, DDL_TRIGGER_CREATE_SEQUENCE, name); const SINT64 val = value.specified ? value.value : 0; + store(tdbb, transaction, name, fb_sysflag_user, val); - const SSHORT id = store(tdbb, transaction, name, fb_sysflag_user, val); - fb_assert(id > 0); - - // the store() call above has caused the DFW item to be posted, - // so we just adjust the cached generator value - transaction->getGenIdCache()->put(id, val); - executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_AFTER, DDL_TRIGGER_CREATE_SEQUENCE, name); } @@ -5012,6 +5006,10 @@ storePrivileges(tdbb, transaction, name, obj_generator, USAGE_PRIVILEGES); + // The STORE above has caused the DFW item to be posted, so we just adjust the cached + // generator value. + transaction->getGenIdCache()->put(storedId, val); + return storedId; } @@ -5546,7 +5544,7 @@ DYN_UTIL_generate_generator_name(tdbb, fieldDefinition.identitySequence); CreateAlterSequenceNode::store(tdbb, transaction, fieldDefinition.identitySequence, - fb_sysflag_identity_generator, 0); + fb_sysflag_identity_generator, clause->identityStart); } BlrDebugWriter::BlrData defaultValue; Modified: firebird/trunk/src/dsql/DdlNodes.h =================================================================== --- firebird/trunk/src/dsql/DdlNodes.h 2013-09-04 15:39:30 UTC (rev 58568) +++ firebird/trunk/src/dsql/DdlNodes.h 2013-09-04 15:54:19 UTC (rev 58569) @@ -1168,7 +1168,8 @@ constraints(p), collate(p), computed(NULL), - identity(false) + identity(false), + identityStart(0) { } @@ -1178,6 +1179,7 @@ Firebird::MetaName collate; NestConst<ValueSourceClause> computed; bool identity; + SINT64 identityStart; }; struct AlterColNameClause : public Clause Modified: firebird/trunk/src/dsql/parse.y =================================================================== --- firebird/trunk/src/dsql/parse.y 2013-09-04 15:39:30 UTC (rev 58568) +++ firebird/trunk/src/dsql/parse.y 2013-09-04 15:54:19 UTC (rev 58569) @@ -1466,10 +1466,15 @@ %type <nullableInt64Val> start_with_opt start_with_opt - : /* nothing */ { $$ = Nullable<SINT64>::empty(); } - | START WITH sequence_value { $$ = Nullable<SINT64>::val($3); } + : /* nothing */ { $$ = Nullable<SINT64>::empty(); } + | start_with { $$ = Nullable<SINT64>::val($1); } ; +%type <int64Val> start_with +start_with + : START WITH sequence_value { $$ = $3; } + ; + %type <createAlterSequenceNode> replace_sequence_clause replace_sequence_clause : symbol_generator_name replace_sequence_options @@ -1805,6 +1810,7 @@ clause->field = $2; clause->field->fld_name = *$1; clause->identity = true; + clause->identityStart = $3; $relationNode->clauses.add(clause); } column_constraint_clause(NOTRIAL($<addColumnClause>4)) collate_clause @@ -1832,10 +1838,17 @@ } ; +%type <int64Val> identity_clause identity_clause - : GENERATED BY DEFAULT AS IDENTITY + : GENERATED BY DEFAULT AS IDENTITY identity_clause_options { $$ = $6; } ; +%type <int64Val> identity_clause_options +identity_clause_options + : /* nothing */ { $$ = 0; } + | '(' start_with ')' { $$ = $2; } + ; + // value does allow parens around it, but there is a problem getting the source text. %type <valueSourceClause> def_computed Modified: firebird/trunk/src/isql/extract.epp =================================================================== --- firebird/trunk/src/isql/extract.epp 2013-09-04 15:39:30 UTC (rev 58568) +++ firebird/trunk/src/isql/extract.epp 2013-09-04 15:54:19 UTC (rev 58569) @@ -510,12 +510,17 @@ if (ENCODE_ODS(isqlGlob.major_ods, isqlGlob.minor_ods) >= ODS_12_0) { - FOR RFR2 IN RDB$RELATION_FIELDS - WITH RFR2.RDB$RELATION_NAME = RFR.RDB$RELATION_NAME AND + FOR RFR2 IN RDB$RELATION_FIELDS CROSS + GEN IN RDB$GENERATORS + WITH GEN.RDB$GENERATOR_NAME = RFR2.RDB$GENERATOR_NAME AND + RFR2.RDB$RELATION_NAME = RFR.RDB$RELATION_NAME AND RFR2.RDB$FIELD_NAME = RFR.RDB$FIELD_NAME + { - if (!RFR2.RDB$GENERATOR_NAME.NULL) - isqlGlob.printf(" GENERATED BY DEFAULT AS IDENTITY"); + isqlGlob.printf(" GENERATED BY DEFAULT AS IDENTITY"); + + if (!GEN.RDB$INITIAL_VALUE.NULL && GEN.RDB$INITIAL_VALUE != 0) + isqlGlob.printf(" (START WITH %" SQUADFORMAT ")", GEN.RDB$INITIAL_VALUE); } END_FOR ON_ERROR This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2013-09-05 00:28:18
|
Revision: 58573 http://sourceforge.net/p/firebird/code/58573 Author: firebirds Date: 2013-09-05 00:28:15 +0000 (Thu, 05 Sep 2013) 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 2013-09-04 17:52:13 UTC (rev 58572) +++ firebird/trunk/ChangeLog 2013-09-05 00:28:15 UTC (rev 58573) @@ -1,3 +1,47 @@ + 2013-09-04 17:52 dimitr + M src/jrd/jrd.cpp +Avoid rescheduling if we're kindly asked to stop immediately. + + 2013-09-04 17:46 dimitr + M src/jrd/Attachment.h + M src/jrd/jrd.cpp +Cleanup and use the explicit rollback via TIP for all kinds of forced disconnections. + + 2013-09-04 15:54 asfernandes + M doc/sql.extensions/README.identity_columns.txt + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/parse.y + M src/isql/extract.epp +Improvement CORE-4199 - Add optional START WITH clause to identity columns. + + 2013-09-04 15:39 asfernandes + M src/isql/extract.epp +Fixed CORE-4205 - ISQL -x does not output the START WITH clause of generators/sequences. + + 2013-09-04 15:05 dimitr + M src/jrd/Attachment.h +Totally misc. + + 2013-09-04 07:20 dimitr + M lang_helpers/gds_codes.ftn + M lang_helpers/gds_codes.pas + M src/dsql/ExprNodes.cpp + M src/dsql/StmtNodes.cpp + M src/include/gen/codetext.h + M src/include/gen/iberror.h + M src/include/gen/msgs.h + M src/include/gen/sql_code.h + M src/include/gen/sql_state.h + M src/msgs/facilities2.sql + M src/msgs/messages2.sql + M src/msgs/system_errors2.sql +Improved the error reporting. + + 2013-09-04 06:01 dimitr + M src/dsql/ExprNodes.cpp +Fixed CORE-4202: Backup/Restore from old version to v3.0 fails with BLR error. + 2013-09-03 15:46 asfernandes M src/dsql/PackageNodes.epp Fixed CORE-4203 - Cannot create packaged routines with [VAR]CHAR parameters. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-04 17:52:13 UTC (rev 58572) +++ firebird/trunk/src/jrd/build_no.h 2013-09-05 00:28:15 UTC (rev 58573) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30629 + FORMAL BUILD NUMBER:30636 */ -#define PRODUCT_VER_STRING "3.0.0.30629" -#define FILE_VER_STRING "WI-T3.0.0.30629" -#define LICENSE_VER_STRING "WI-T3.0.0.30629" -#define FILE_VER_NUMBER 3, 0, 0, 30629 +#define PRODUCT_VER_STRING "3.0.0.30636" +#define FILE_VER_STRING "WI-T3.0.0.30636" +#define LICENSE_VER_STRING "WI-T3.0.0.30636" +#define FILE_VER_NUMBER 3, 0, 0, 30636 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30629" +#define FB_BUILD_NO "30636" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-04 17:52:13 UTC (rev 58572) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-05 00:28:15 UTC (rev 58573) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30629 +BuildNum=30636 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...> - 2013-09-06 00:28:04
|
Revision: 58580 http://sourceforge.net/p/firebird/code/58580 Author: firebirds Date: 2013-09-06 00:28:01 +0000 (Fri, 06 Sep 2013) 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 2013-09-05 16:09:25 UTC (rev 58579) +++ firebird/trunk/ChangeLog 2013-09-06 00:28:01 UTC (rev 58580) @@ -1,3 +1,20 @@ + 2013-09-05 16:09 asfernandes + M doc/sql.extensions/README.identity_columns.txt +Improvement CORE-4206 - Add RESTART [WITH] clause for alter identity columns - documentation. + + 2013-09-05 15:58 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/parse.y + M src/msgs/facilities2.sql + M src/msgs/messages2.sql +Improvement CORE-4206 - Add RESTART [WITH] clause for alter identity columns. + + 2013-09-05 07:38 dimitr + M src/jrd/DebugInterface.cpp + M src/jrd/DebugInterface.h +Provided support for both old and new debug info formats. It eliminates the annoying "bad debug info format" warning during restore as well as allows the migrated debug info to be useful without recreation of the PSQL objects. + 2013-09-04 17:52 dimitr M src/jrd/jrd.cpp Avoid rescheduling if we're kindly asked to stop immediately. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-05 16:09:25 UTC (rev 58579) +++ firebird/trunk/src/jrd/build_no.h 2013-09-06 00:28:01 UTC (rev 58580) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30636 + FORMAL BUILD NUMBER:30639 */ -#define PRODUCT_VER_STRING "3.0.0.30636" -#define FILE_VER_STRING "WI-T3.0.0.30636" -#define LICENSE_VER_STRING "WI-T3.0.0.30636" -#define FILE_VER_NUMBER 3, 0, 0, 30636 +#define PRODUCT_VER_STRING "3.0.0.30639" +#define FILE_VER_STRING "WI-T3.0.0.30639" +#define LICENSE_VER_STRING "WI-T3.0.0.30639" +#define FILE_VER_NUMBER 3, 0, 0, 30639 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30636" +#define FB_BUILD_NO "30639" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-05 16:09:25 UTC (rev 58579) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-06 00:28:01 UTC (rev 58580) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30636 +BuildNum=30639 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...> - 2013-09-07 00:53:11
|
Revision: 58587 http://sourceforge.net/p/firebird/code/58587 Author: firebirds Date: 2013-09-07 00:53:07 +0000 (Sat, 07 Sep 2013) 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 2013-09-06 15:58:01 UTC (rev 58586) +++ firebird/trunk/ChangeLog 2013-09-07 00:53:07 UTC (rev 58587) @@ -1,3 +1,8 @@ + 2013-09-06 13:09 alexpeshkoff + M src/jrd/CryptoManager.cpp + M src/jrd/CryptoManager.h +Fixed CORE-4185: FB craches with "invalid lock id (NNNNN)" + 2013-09-05 16:09 asfernandes M doc/sql.extensions/README.identity_columns.txt Improvement CORE-4206 - Add RESTART [WITH] clause for alter identity columns - documentation. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-06 15:58:01 UTC (rev 58586) +++ firebird/trunk/src/jrd/build_no.h 2013-09-07 00:53:07 UTC (rev 58587) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30639 + FORMAL BUILD NUMBER:30640 */ -#define PRODUCT_VER_STRING "3.0.0.30639" -#define FILE_VER_STRING "WI-T3.0.0.30639" -#define LICENSE_VER_STRING "WI-T3.0.0.30639" -#define FILE_VER_NUMBER 3, 0, 0, 30639 +#define PRODUCT_VER_STRING "3.0.0.30640" +#define FILE_VER_STRING "WI-T3.0.0.30640" +#define LICENSE_VER_STRING "WI-T3.0.0.30640" +#define FILE_VER_NUMBER 3, 0, 0, 30640 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30639" +#define FB_BUILD_NO "30640" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-06 15:58:01 UTC (rev 58586) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-07 00:53:07 UTC (rev 58587) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30639 +BuildNum=30640 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...> - 2013-09-10 00:30:58
|
Revision: 58593 http://sourceforge.net/p/firebird/code/58593 Author: firebirds Date: 2013-09-10 00:30:56 +0000 (Tue, 10 Sep 2013) 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 2013-09-09 11:05:54 UTC (rev 58592) +++ firebird/trunk/ChangeLog 2013-09-10 00:30:56 UTC (rev 58593) @@ -1,3 +1,18 @@ + 2013-09-09 11:03 alexpeshkoff + M src/common/classes/init.h + M src/jrd/trace/TraceConfigStorage.h + M src/jrd/trace/TraceManager.cpp + M src/jrd/trace/TraceManager.h +Fixed CORE-4211: Embedded engine hangs for 5 seconds when closing + + 2013-09-09 10:32 alexpeshkoff + M src/jrd/CryptoManager.cpp +Fixed CORE-4185: related issues with crypt thread start/stop + + 2013-09-09 09:14 alexpeshkoff + M examples/dbcrypt/CryptApplication.cpp +fixed interface usage + 2013-09-06 13:09 alexpeshkoff M src/jrd/CryptoManager.cpp M src/jrd/CryptoManager.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-09 11:05:54 UTC (rev 58592) +++ firebird/trunk/src/jrd/build_no.h 2013-09-10 00:30:56 UTC (rev 58593) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30640 + FORMAL BUILD NUMBER:30643 */ -#define PRODUCT_VER_STRING "3.0.0.30640" -#define FILE_VER_STRING "WI-T3.0.0.30640" -#define LICENSE_VER_STRING "WI-T3.0.0.30640" -#define FILE_VER_NUMBER 3, 0, 0, 30640 +#define PRODUCT_VER_STRING "3.0.0.30643" +#define FILE_VER_STRING "WI-T3.0.0.30643" +#define LICENSE_VER_STRING "WI-T3.0.0.30643" +#define FILE_VER_NUMBER 3, 0, 0, 30643 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30640" +#define FB_BUILD_NO "30643" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-09 11:05:54 UTC (rev 58592) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-10 00:30:56 UTC (rev 58593) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30640 +BuildNum=30643 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...> - 2013-09-11 00:28:19
|
Revision: 58600 http://sourceforge.net/p/firebird/code/58600 Author: firebirds Date: 2013-09-11 00:28:17 +0000 (Wed, 11 Sep 2013) 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 2013-09-10 14:52:59 UTC (rev 58599) +++ firebird/trunk/ChangeLog 2013-09-11 00:28:17 UTC (rev 58600) @@ -1,3 +1,11 @@ + 2013-09-10 14:37 hvlad + M src/dsql/DdlNodes.epp +Fixed bug CORE-4214 : GTT should not reference permanent relation + + 2013-09-10 14:30 hvlad + M src/jrd/vio.cpp +Fixed bug CORE-4212 : Dropping FK on GTT crashes server + 2013-09-09 11:03 alexpeshkoff M src/common/classes/init.h M src/jrd/trace/TraceConfigStorage.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-10 14:52:59 UTC (rev 58599) +++ firebird/trunk/src/jrd/build_no.h 2013-09-11 00:28:17 UTC (rev 58600) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30643 + FORMAL BUILD NUMBER:30645 */ -#define PRODUCT_VER_STRING "3.0.0.30643" -#define FILE_VER_STRING "WI-T3.0.0.30643" -#define LICENSE_VER_STRING "WI-T3.0.0.30643" -#define FILE_VER_NUMBER 3, 0, 0, 30643 +#define PRODUCT_VER_STRING "3.0.0.30645" +#define FILE_VER_STRING "WI-T3.0.0.30645" +#define LICENSE_VER_STRING "WI-T3.0.0.30645" +#define FILE_VER_NUMBER 3, 0, 0, 30645 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30643" +#define FB_BUILD_NO "30645" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-10 14:52:59 UTC (rev 58599) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-11 00:28:17 UTC (rev 58600) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30643 +BuildNum=30645 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...> - 2013-09-13 00:29:17
|
Revision: 58612 http://sourceforge.net/p/firebird/code/58612 Author: firebirds Date: 2013-09-13 00:29:14 +0000 (Fri, 13 Sep 2013) 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 2013-09-12 19:08:59 UTC (rev 58611) +++ firebird/trunk/ChangeLog 2013-09-13 00:29:14 UTC (rev 58612) @@ -1,3 +1,15 @@ + 2013-09-12 19:08 hvlad + M src/jrd/lck.cpp + M src/jrd/lck.h + M src/jrd/tra.cpp + M src/jrd/tra_proto.h + M src/jrd/vio.cpp +Fixed bug CORE-3921 : "record disappeared (186), file: vio.cpp line: 408" + + 2013-09-11 15:39 hvlad + M src/jrd/btr.cpp +Improvement CORE-4215 : Execution of SET STATISTICS INDEX statement could block or slow execution of concurrent attachments + 2013-09-10 14:37 hvlad M src/dsql/DdlNodes.epp Fixed bug CORE-4214 : GTT should not reference permanent relation Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-12 19:08:59 UTC (rev 58611) +++ firebird/trunk/src/jrd/build_no.h 2013-09-13 00:29:14 UTC (rev 58612) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30645 + FORMAL BUILD NUMBER:30647 */ -#define PRODUCT_VER_STRING "3.0.0.30645" -#define FILE_VER_STRING "WI-T3.0.0.30645" -#define LICENSE_VER_STRING "WI-T3.0.0.30645" -#define FILE_VER_NUMBER 3, 0, 0, 30645 +#define PRODUCT_VER_STRING "3.0.0.30647" +#define FILE_VER_STRING "WI-T3.0.0.30647" +#define LICENSE_VER_STRING "WI-T3.0.0.30647" +#define FILE_VER_NUMBER 3, 0, 0, 30647 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30645" +#define FB_BUILD_NO "30647" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-12 19:08:59 UTC (rev 58611) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-13 00:29:14 UTC (rev 58612) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30645 +BuildNum=30647 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...> - 2013-09-13 12:27:25
|
Revision: 58617 http://sourceforge.net/p/firebird/code/58617 Author: alexpeshkoff Date: 2013-09-13 12:27:16 +0000 (Fri, 13 Sep 2013) Log Message: ----------- Added support for systemd Removed scripts to change firebird runuser to root and back to firebird Removed script changing SYSDBA password (nothing except gsec call left in it) Reorganize posix/linux install files minimizing OS-specific part of .tgz install scripts Related cleanup and bugfixing in posix install Modified Paths: -------------- firebird/trunk/configure.ac Added Paths: ----------- firebird/trunk/builds/install/arch-specific/linux/README firebird/trunk/builds/install/arch-specific/linux/firebird-classic.service.in firebird/trunk/builds/install/arch-specific/linux/firebird-classic.socket.in firebird/trunk/builds/install/arch-specific/linux/firebird-superserver.service.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.debian.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.generic.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.gentoo.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.mandrake.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.slackware.in firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.suse.in firebird/trunk/builds/install/arch-specific/linux/firebird.xinetd.in firebird/trunk/builds/install/arch-specific/linux/linuxLibrary.sh.in firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in firebird/trunk/builds/install/arch-specific/linux/rc.config.firebird.in firebird/trunk/builds/install/posix-common/ firebird/trunk/builds/install/posix-common/changeServerMode.sh.in firebird/trunk/builds/install/posix-common/fb_config.in firebird/trunk/builds/install/posix-common/posixLibrary.sh.in firebird/trunk/builds/install/posix-common/postinstall.sh.in firebird/trunk/builds/install/posix-common/postuninstall.sh.in firebird/trunk/builds/install/posix-common/preinstall.sh.in firebird/trunk/builds/install/posix-common/preuninstall.sh.in firebird/trunk/builds/install/posix-common/registerDatabase.sh.in firebird/trunk/builds/install/posix-common/tarMainInstall.sh.in firebird/trunk/builds/install/posix-common/tarMainUninstall.sh.in firebird/trunk/builds/install/posix-common/tarinstall.sh.in firebird/trunk/builds/install/posix-common/taruninstall.sh.in Removed Paths: ------------- firebird/trunk/builds/install/arch-specific/linux/misc/ firebird/trunk/builds/install/misc/changeDBAPassword.sh.in firebird/trunk/builds/install/misc/changeRunUser.sh.in firebird/trunk/builds/install/misc/changeServerMode.sh.in firebird/trunk/builds/install/misc/createAliasDB.sh.in firebird/trunk/builds/install/misc/fb_config.in firebird/trunk/builds/install/misc/posixLibrary.sh.in firebird/trunk/builds/install/misc/restoreRootRunUser.sh.in Property Changed: ---------------- firebird/trunk/builds/install/arch-specific/linux/Makefile.in firebird/trunk/builds/install/misc/IDPLicense.txt firebird/trunk/builds/install/misc/IPLicense.txt firebird/trunk/builds/install/misc/fbintl.conf firebird/trunk/builds/install/misc/firebird.conf.in firebird/trunk/builds/install/misc/firebird.init.d.Solaris.in Index: firebird/trunk/builds/install/arch-specific/linux/Makefile.in =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/Makefile.in 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/arch-specific/linux/Makefile.in 2013-09-13 12:27:16 UTC (rev 58617) Property changes on: firebird/trunk/builds/install/arch-specific/linux/Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/README (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/README) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/README (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/README 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,22 @@ +Firebird 2 Server for Linux + + +More information can be found about the Firebird +database engine from: +http://www.firebirdsql.org/ +http://sourceforge.net/projects/firebird + +or affiliated sites: + +http://www.ibphoenix.com +http://www.interbase2000.com + + + +The Firebird database engine is derived from the +InterBase(tm) product currently owned by Inprise. +The documentation for InterBase v 6.0 applies also to +the current FireBird release. InterBase documentation +is available in Adobe Acrobat format from +http://www.interbase.com. + Property changes on: firebird/trunk/builds/install/arch-specific/linux/README ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: firebird/trunk/builds/install/arch-specific/linux/firebird-classic.service.in =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird-classic.service.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird-classic.service.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Database Server ( Classic ) +After=local-fs.target + +[Service] +User=firebird +Group=firebird +ExecStart=@FB_SBINDIR@/firebird +StandardInput=socket +StandardError=syslog Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird-classic.service.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: firebird/trunk/builds/install/arch-specific/linux/firebird-classic.socket.in =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird-classic.socket.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird-classic.socket.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Classic Activation Socket +Conflicts=firebird-superserver.service + +[Socket] +ListenStream=3050 +Accept=true + +[Install] +WantedBy=sockets.target Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird-classic.socket.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: firebird/trunk/builds/install/arch-specific/linux/firebird-superserver.service.in =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird-superserver.service.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird-superserver.service.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server ( SuperServer ) +After=syslog.target network.target +Conflicts=firebird-classic.socket + +[Service] +User=firebird +Group=firebird +Type=forking +PIDFile=/var/run/firebird/default.pid +ExecStart=@FB_SBINDIR@/fbguard -pidfile /var/run/firebird/default.pid -daemon -forever +StandardError=syslog + +[Install] +WantedBy=multi-user.target Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird-superserver.service.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.debian.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.debian.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.debian.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.debian.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,94 @@ +#!/bin/sh + +# chkconfig: 345 80 20 +# description: Start/Stop firebird database server +# +# This file belongs in /etc/init.d where it will be run +# on system startup and shutdown to start the background +# Firebird database server daemon + +### BEGIN INIT INFO +# Provides: firebird +# Required-Start: $remote_fs $syslog $named +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start firebird server +# Description: Start the firebird guardian process (fbguard) +# which starts the actual firebird server process +# (firebird) and makes sure there is always firebird +# running +### END INIT INFO + +# This init script contains functions specific for debian +# init scripts. + +# Source function library. +#. /etc/rc.d/init.d/functions + +FIREBIRD=@FB_CONFDIR@ +FBRunUser=firebird + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/`basename $0`.pid" +FB_OPTS="-pidfile $pidfile -daemon -forever" +export FIREBIRD + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +GUARDIAN=$FIREBIRD/bin/fbguard +if [ ! -x $GUARDIAN ]; then + GUARDIAN=@FB_SBINDIR@/fbguard +fi + +# See how we were called. +case "$1" in + start) + echo -n "Starting Firebird server: " + start-stop-daemon --start --quiet --oknodo --chuid $FBRunUser --exec $GUARDIAN -- $FB_OPTS + RETVAL=$? + ;; + stop) + echo -n "Stopping Firebird server: " + if [ -f $pidfile ] + then + kill `cat $pidfile` + fi + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + shutdown) + echo -n "Forcibly killing Firebird server..." + killall fbguard + killall firebird + echo "done." + RETVAL=0 + ;; + *) + echo "Usage: firebird {start|stop|shutdown|restart|reload}" + exit 1 +esac + +exit $RETVAL Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.debian.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.generic.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.generic.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.generic.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.generic.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,92 @@ +#!/bin/sh + +# description: Start/Stop firebird database server + +# To run more instances of firebird: +# Copy @prefix@ somewhere +# Copy this script under a new name +# Change INSTANCE and FIREBIRD below (all instance names should be unique) +# Edit the copied firebird.conf to change at least RemoteServicePort +INSTANCE=default +FIREBIRD=@FB_CONFDIR@ + +# No changes needed below for multiple instances +FBRunUser=firebird + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/$INSTANCE.pid" +FULLNAME="Firebird server [$INSTANCE]" +LD_LIBRARY_PATH=$FIREBIRD/lib:$LD_LIBRARY_PATH + +export FIREBIRD LD_LIBRARY_PATH + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +GUARDIAN=$FIREBIRD/bin/fbguard +if [ ! -x $GUARDIAN ]; then + GUARDIAN=@FB_SBINDIR@/fbguard +fi + +# See how we were called. +case "$1" in + start) + echo -n "Starting $FULLNAME: " + echo "$GUARDIAN -pidfile $pidfile -daemon -forever" | su $FBRunUser + RETVAL=$? + ;; + stop) + echo -n "Stopping $FULLNAME: " + if [ -f $pidfile ] + then + kill `cat $pidfile` + fi + echo "stopped." + RETVAL=$? + ;; + status) + if [ -f $pidfile ] + then + pid=`cat $pidfile` + ps -p $pid >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL -eq 0 ] + then + echo "$FULLNAME is running, pid $pid" + else + echo "$FULLNAME is stopped." + fi + ;; + restart|reload) + $0 stop + sleep 1 + $0 start + RETVAL=$? + ;; + *) + echo "Usage: firebird {start|stop|status|restart|reload}" + exit 1 +esac + +exit $RETVAL + Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.generic.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.gentoo.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.gentoo.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.gentoo.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,69 @@ +#!/sbin/runscript +#Gentoo Linux RC script +# description: Start/Stop firebird database server +# +# This file belongs in /etc/init.d where it will be run +# on system startup and shutdown to start the background +# Firebird database server daemon + +# To run more instances of firebird: +# Copy @prefix@ somewhere +# Copy this script under a new name +# Change INSTANCE and FIREBIRD below (all instance names should be unique) +# Edit the copied firebird.conf to change at least RemoteServicePort +# Optionally run rc-update to autostart the new service +INSTANCE=default +FIREBIRD=@FB_CONFDIR@ + +FBRunUser=firebird + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/$INSTANCE.pid" +FULLNAME="firebird server [$INSTANCE]" +LD_LIBRARY_PATH=$FIREBIRD/lib:$LD_LIBRARY_PATH +FB_OPTS="-pidfile $pidfile -daemon -forever" + +export FIREBIRD LD_LIBRARY_PATH + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +GUARDIAN=$FIREBIRD/bin/fbguard +if [ ! -x $GUARDIAN ]; then + GUARDIAN=@FB_SBINDIR@/fbguard +fi + +start(){ + ebegin "Starting $FULLNAME" + start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $GUARDIAN -- $FB_OPTS + eend $? +} + +stop(){ + ebegin "Stopping $FULLNAME" + start-stop-daemon --stop --pidfile $pidfile --oknodo + eend $? +} + +restart(){ + svc_stop + sleep 1 + svc_start +} Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.gentoo.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.mandrake.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.mandrake.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.mandrake.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,116 @@ +#!/bin/sh + +# chkconfig: 345 80 20 +# description: Start/Stop firebird database server +# +# This file belongs in /etc/init.d where it will be run +# on system startup and shutdown to start the background +# Firebird database server daemon +### BEGIN INIT INFO +# Provides: firebird +# Required-Start: $local_fs $syslog +# Required-Stop: +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Firebird server database +# Description: Starts and stops the Firebird database server backend daemon. +### END INIT INFO + +# Source function library - RedHat or Mandriva specific +# functions actually used: checkpid killproc daemon +. /etc/rc.d/init.d/functions + +# To run more instances of firebird: +# Copy @prefix@ somewhere +# Copy this script under a new name +# Change at least INSTANCE and FIREBIRD below +# Edit the copied firebird.conf to change at least RemoteServicePort +# Optionally run chkconfig to autostart the new service +INSTANCE=default +FIREBIRD=@FB_CONFDIR@ + +# No changes needed below for multiple instances +name=$(basename `readlink -f $0`) +FBRunUser=firebird + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/$INSTANCE.pid" +FULLNAME="Firebird server [$INSTANCE]" +LD_LIBRARY_PATH=$FIREBIRD/lib:$LD_LIBRARY_PATH + +export FIREBIRD LD_LIBRARY_PATH + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +GUARDIAN=$FIREBIRD/bin/fbguard +if [ ! -x $GUARDIAN ]; then + GUARDIAN=@FB_SBINDIR@/fbguard +fi + +# initialize as "success" +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting $FULLNAME " + daemon --user=$FBRunUser "export FIREBIRD LD_LIBRARY_PATH; $GUARDIAN -pidfile $pidfile -daemon -forever" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name + echo + ;; + stop) + if [ -f $pidfile ] + then + echo -n "Stopping $FULLNAME: " + killproc -p $pidfile $name + RETVAL=$? + echo + else + echo -n "$FULLNAME server is stopped" + echo + fi + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name + ;; + status) + if [ -f $pidfile ] + then + pid=`cat $pidfile` + checkpid $pid + RETVAL=$? + [ $RETVAL -eq 0 ] && echo "$FULLNAME is running (pid $pid)" || echo "$FULLNAME is dead but pid file exists" + else + echo "$FULLNAME is stopped" + RETVAL=3 + fi + ;; + restart|reload) + $0 stop + sleep 1 + $0 start + RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|status|restart|reload}" + exit 1 +esac + +exit $RETVAL Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.mandrake.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.slackware.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.slackware.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.slackware.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.slackware.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,59 @@ +#!/bin/sh +# +# /etc/rc.d/rc.firebirdss +# +# Start/stop/restart the firebird super server. +# + +# To run more instances of firebird: +# Copy @prefix@ somewhere +# Copy this script under a new name +# Change INSTANCE and FIREBIRD below (all instance names should be unique) +# Edit the copied firebird.conf to change at least RemoteServicePort +# Optionally run rc-update to autostart the new service +INSTANCE=default +FIREBIRD=@FB_CONFDIR@ + +# No changes needed below for multiple instances +FBRunUser=firebird + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/$INSTANCE.pid" +FULLNAME="Firebird server [$INSTANCE]" +LD_LIBRARY_PATH=$FIREBIRD/lib:$LD_LIBRARY_PATH + +export FIREBIRD LD_LIBRARY_PATH + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +GUARDIAN=$FIREBIRD/bin/fbguard +if [ ! -x $GUARDIAN ]; then + GUARDIAN=@FB_SBINDIR@/fbguard +fi + +case "$1" in + 'start') echo -n "Starting $FULLNAME: " + echo $GUARDIAN -pidfile $pidfile -daemon -forever | su $FBRunUser ;; + 'stop') echo -n "Stopping $FULLNAME: " + if [ -f $pidfile ]; then kill `cat $pidfile`; echo "done."; else echo "error: no PID file."; fi ;; + 'restart') $0 stop ; sleep 1; $0 start ;; + *) echo "usage $0 start|stop|restart" ;; +esac Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.slackware.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.suse.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.suse.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.suse.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,183 @@ +#! /bin/sh +# Copyright (c) 2001 IBPhoenix +# +# Author: Pavel Cisar <pc...@ib...> +# +# init.d/firebird +# +# and symbolic its link +# +# /usr/sbin/rcfirebird +# +# System startup script for the Firebird SuperServer +# +### BEGIN INIT INFO +# Provides: firebird +# Required-Start: $network $remote_fs +# Required-Stop: +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Description: Start the Firebird database server. +### END INIT INFO + +# Source SuSE config +if [ -r /etc/rc.config ] + then + . /etc/rc.config +fi + +if [ -r /etc/sysconfig/firebird ] + then + . /etc/sysconfig/firebird +fi + + +# Determine the base and follow a runlevel link name. +base=${0##*/} +link=${base#*[SK][0-9][0-9]} + +# Force execution if not called by a runlevel directory. +test $link = $base && START_FIREBIRD="yes" +test "$START_FIREBIRD" = yes || exit 0 + +FIREBIRD=@FB_CONFDIR@ +FBRunUser=firebird +INSTANCE=default + +makeFbDir() { + mDir=${1} + mode=${2} + if [ ! -d $mDir ]; then + rm -rf $mDir + mkdir $mDir + if [ "$mode" ]; then + chmod $mode $mDir + fi + fi + chown $FBRunUser:$FBRunUser $mDir +} +runDir=/var/run/firebird +makeFbDir $runDir +lockDir=/tmp/firebird +makeFbDir $lockDir 0770 + +pidfile="$runDir/$INSTANCE.pid" + +export FIREBIRD + +ISC_USER= +ISC_PASSWORD= +export ISC_USER ISC_PASSWORD + +# Check the files are there and are executable. +FBSBIN=$FIREBIRD/bin +if [ ! -x $FBSBIN/fbguard ]; then + FBSBIN=@FB_SBINDIR@ +fi + +[ -x $FBSBIN/fbguard ] || exit 5 +[ -x $FBSBIN/firebird ] || exit 5 + +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v ditto but be verbose in local rc status +# rc_status -v -r ditto and clear the local rc status +# rc_failed set local and overall rc status to failed +# rc_failed <num> set local and overall rc status to <num><num> +# rc_reset clear local rc status (overall remains) +# rc_exit exit appropriate to overall rc status +. /etc/rc.status + +# First reset status of this service +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - insufficient privilege +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signalling is not supported) are +# considered a success. + +case "$1" in + start) + echo -n "Starting Firebird" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + startproc -u $FBRunUser $FBSBIN/fbguard -pidfile $pidfile -forever + + # Remember status and be verbose + rc_status -v + ;; + stop) + echo -n "Shutting down Firebird" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + ## I had to use generic approach here - I can't test on suse. AP. + if [ -f $pidfile ] + then + kill `cat $pidfile` + sleep 1 + fi + + + # Remember status and be verbose + rc_status -v + ;; + try-restart) + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; + restart|force-reload) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + echo "Restarting service Firebird" + $0 stop + sleep 1 + $0 start + + # Remember status and be quiet + rc_status + ;; + reload) + + ;; + status) + echo -n "Checking for Firebird: " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $FBSBIN/fbguard + rc_status -v + ;; + + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; +esac +rc_exit Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.init.d.suse.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/firebird.xinetd.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/firebird.xinetd.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/firebird.xinetd.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/firebird.xinetd.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,20 @@ +# default: on +# description: FirebirdSQL server +# +# Be careful when commenting out entries in this file. Active key entry should +# be the first as some scripts (CSchangeRunUser.sh in particular) use sed +# scripting to modify it. + +service @FB_SERVICE_NAME@ +{ + disable = no + flags = REUSE + socket_type = stream + wait = no + user = root +# These lines cause problems with Windows XP SP2 clients +# using default firewall configuration (SF#1065511) +# log_on_success += USERID +# log_on_failure += USERID + server = @FB_SBINDIR@/firebird +} Property changes on: firebird/trunk/builds/install/arch-specific/linux/firebird.xinetd.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/linuxLibrary.sh.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/linuxLibrary.sh.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/linuxLibrary.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,549 @@ +#!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue <mar...@lu...> +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +RunUser=firebird +export RunUser +RunGroup=firebird +export RunGroup +PidDir=/var/run/firebird +export PidDir + +# Additional OS settings +OS_Has_Specific_Classic_Startup=yes + +#------------------------------------------------------------------------ +# Get correct options & misc. + +psOptions=-efaww +export psOptions +mktOptions=-q +export mktOptions +tarOptions=z +export tarOptions +tarExt=tar.gz +export tarExt + +#------------------------------------------------------------------------ +# Add new user and group + +TryAddGroup() { + + AdditionalParameter=$1 + testStr=`grep firebird /etc/group` + + if [ -z "$testStr" ] + then + groupadd $AdditionalParameter firebird + fi + +} + + +TryAddUser() { + + AdditionalParameter=$1 + testStr=`grep firebird /etc/passwd` + + if [ -z "$testStr" ] + then + useradd $AdditionalParameter -d @FB_CONFDIR@ -s /sbin/nologin \ + -c "Firebird Database Owner" -g firebird firebird + fi + +} + + +addFirebirdUser() { + + TryAddGroup "-g 84 -r" >/dev/null 2>/dev/null + TryAddGroup "-g 84" >/dev/null 2>/dev/null + TryAddGroup "-r" >/dev/null 2>/dev/null + TryAddGroup " " + + TryAddUser "-u 84 -r -M" >/dev/null 2>/dev/null + TryAddUser "-u 84 -M" >/dev/null 2>/dev/null + TryAddUser "-r -M" >/dev/null 2>/dev/null + TryAddUser "-M" >/dev/null 2>/dev/null + TryAddUser "-u 84 -r" >/dev/null 2>/dev/null + TryAddUser "-u 84" >/dev/null 2>/dev/null + TryAddUser "-r" >/dev/null 2>/dev/null + TryAddUser " " + +} + + +#------------------------------------------------------------------------ +# Detect Distribution. +# AP: very beautiful, but unused. Let's keep alive for a while. (2005) + +detectDistro() { + + # it's not provided... + if [ -z "$linuxDistro" ] + then + if [ -e /etc/SuSE-release ] + then + # SuSE + linuxDistro="SuSE" + elif [ -e /etc/mandrake-release ] + then + # Mandrake + linuxDistro="MDK" + elif [ -e /etc/debian_version ] + then + # Debian + linuxDistro="Debian" + elif [ -e /etc/gentoo-release ] + then + # Debian + linuxDistro="Gentoo" + elif [ -e /etc/rc.d/init.d/functions ] + then + # very likely Red Hat + linuxDistro="RH" + elif [ -d /etc/rc.d/init.d ] + then + # generic Red Hat + linuxDistro="G-RH" + elif [ -d /etc/init.d ] + then + # generic SuSE + linuxDistro="G-SuSE" + fi + fi +} + + +#------------------------------------------------------------------------ +# print location of init script + +getInitScriptLocation() { + if [ -f /etc/rc.d/init.d/firebird ] + then + echo -n /etc/rc.d/init.d/firebird + elif [ -f /etc/rc.d/rc.firebird ] + then + echo -n /etc/rc.d/rc.firebird + elif [ -f /etc/init.d/firebird ] + then + echo -n /etc/init.d/firebird + fi +} + + +#------------------------------------------------------------------------ +# register/start/stop server using systemd + +SYSTEMCTL=systemctl +CLASSIC_CTRL=firebird-classic.socket +SUPER_CTRL=firebird-superserver.service +SYSTEMD_DIR=/usr/lib/systemd/system +TMPFILE_CONF=/usr/lib/tmpfiles.d/firebird.conf + +systemdPresent() { + proc1=`ps -p 1 -o comm=` + + [ "${proc1}" = systemd ] && return 0 + return 1 +} + +systemdError() { + echo Fatal systemctl error - exiting + exit 1 +} + +installSystemdCtrlFiles() { + if systemdPresent + then + cp @FB_MISCDIR@/*.service @FB_MISCDIR@/*.socket ${SYSTEMD_DIR} + tempdir=/var/run/firebird + mkdir -p ${tempdir} + chown firebird:firebird ${tempdir} + chmod 0775 ${tempdir} + echo "d ${tempdir} 0775 firebird firebird -" >${TMPFILE_CONF} + fi +} + +osRemoveStartupFiles() { + rm -f ${SYSTEMD_DIR}/firebird-* + rm -f ${TMPFILE_CONF} +} + +systemdSrv() { + op=${1} + ctrl=${2} + + if [ "${op}" = "stop" -o "${op}" = "disable" ] + then + if [ ! -f ${SYSTEMD_DIR}/${ctrl} ] + then + return 0 + fi + fi + + if systemdPresent + then + ${SYSTEMCTL} --quiet ${op} ${ctrl} || systemdError + return 0 + fi + return 1 +} + +classicSrv() { + op=${1} + + systemdSrv ${op} ${CLASSIC_CTRL} +} + +superSrv() { + op=${1} + + systemdSrv ${op} ${SUPER_CTRL} +} + +osRegisterClassicServer() { + installSystemdCtrlFiles + classicSrv enable +} + +osUnregisterClassicServer() { + classicSrv disable +} + +osStartClassicServer() { + classicSrv start +} + +osStopClassicServer() { + classicSrv stop +} + +registerSuperServer() { + installSystemdCtrlFiles + superSrv enable && return 0 +} + +unregisterSuperServer() { + superSrv disable && return 0 +} + +startSuperServer() { + superSrv start && return 0 +} + +stopSuperServer() { + superSrv stop && return 0 + + init_d=`getInitScriptLocation` + if [ -x "$init_d" ] + then + $init_d stop + return 0 + fi + + return 1 +} + + +#------------------------------------------------------------------------ +# stop super server if it is running + +stopSuperServerIfRunning() { + checkString=`grepProcess "fbserver|fbguard|fb_smp_server|firebird"` + + if [ ! -z "$checkString" ] + then + i=1 + while [ $i -le 20 ] + do + stopSuperServer || return # silently giveup + sleep 1 + checkString=`grepProcess "fbserver|fbguard|fb_smp_server|firebird"` + if [ -z "$checkString" ] + then + return + fi + i=$((i+1)) + done + fi +} + +#------------------------------------------------------------------------ +# Create new password string - this routine is used only in +# silent mode of the install script. + +createNewPassword() { + # openssl generates random data. + openssl </dev/null >/dev/null 2>/dev/null + if [ $? -eq 0 ] + then + # We generate 40 random chars, strip any '/''s and get the first 20 + NewPasswd=`openssl rand -base64 40 | tr -d '/' | cut -c1-20` + fi + + # If openssl is missing... + if [ -z "$NewPasswd" ] + then + NewPasswd=`dd if=/dev/urandom bs=10 count=1 2>/dev/null | od -x | head -n 1 | tr -d ' ' | cut -c8-27` + fi + + # On some systems even this routines may be missing. So if + # the specific one isn't available then keep the original password. + if [ -z "$NewPasswd" ] + then + NewPasswd="masterkey" + fi + + echo "$NewPasswd" +} + +#------------------------------------------------------------------------ +# installInitdScript +# Everbody stores this one in a seperate location, so there is a bit of +# running around to actually get it for each packager. +# Update rcX.d with Firebird initd entries +# initd script for SuSE >= 7.2 is a part of RPM package + +installInitdScript() { + # systemd case + registerSuperServer && return 0 # systemd's service file takes care about PidDir + + srcScript="" + initScript= + +# This is for RH and MDK specific + + if [ -e /etc/rc.d/init.d/functions ] + then + srcScript=firebird.init.d.mandrake + initScript=/etc/rc.d/init.d/firebird + +# SuSE specific + + elif [ -r /etc/SuSE-release ] + then + srcScript=firebird.init.d.suse + initScript=/etc/init.d/firebird + rm -f /usr/sbin/rcfirebird + ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird + +# Debian specific + + elif [ -r /etc/debian_version ] + then + srcScript=firebird.init.d.debian + initScript=/etc/init.d/firebird + rm -f /usr/sbin/rcfirebird + ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird + +# Slackware specific + + elif [ -r /etc/slackware-version ] + then + srcScript=firebird.init.d.slackware + initScript=/etc/rc.d/rc.firebird + rclocal=/etc/rc.d/rc.local + if ! grep -q "$initScript" $rclocal + then + cat >>$rclocal <<EOF +if [ -x $initScript ] ; then + $initScript start +fi +EOF + fi + +# Gentoo specific + + elif [ -r /etc/gentoo-release ] + then + srcScript=firebird.init.d.gentoo + initScript=/etc/init.d/firebird + +# Generic... + + elif [ -d /etc/rc.d/init.d ] + then + srcScript=firebird.init.d.generic + initScript=/etc/rc.d/init.d/firebird + fi + + + if [ "$initScript" ] + then + # Install the firebird init.d script + cp @FB_MISCDIR@/$srcScript $initScript + chown root:root $initScript + chmod ug=rx,o=r $initScript + + + # RedHat and Mandrake specific + if [ -x /sbin/chkconfig ] + then + /sbin/chkconfig --add firebird + + # Gentoo specific + elif [ -x /sbin/rc-update ] + then + /sbin/rc-update add firebird default + + # Suse (& Debian ?) specific + elif [ -x /sbin/insserv ] + then + /sbin/insserv /etc/init.d/firebird + + # One more way to register service - used in Knoppix (& Debian ?) + elif [ -x /usr/sbin/update-rc.d ] + then + /usr/sbin/update-rc.d firebird start 14 2 3 5 . stop 20 0 1 6 . + fi + + # More SuSE - rc.config fillup + if [ -f /etc/rc.config ] + then + if [ -x /bin/fillup ] + then + /bin/fillup -q -d = /etc/rc.config @FB_MISCDIR@/rc.config.firebird + fi + elif [ -d /etc/sysconfig ] + then + cp @FB_MISCDIR@/rc.config.firebird /etc/sysconfig/firebird + fi + + else + echo "Couldn't autodetect linux type. You must select" + echo "the most appropriate startup script in @FB_MISCDIR@" + echo "and manually register it in your OS." + fi + + # Create directory to store pidfile + if [ ! -d $PidDir ] + then + [ -e $PidDir ] && rm -rf $PidDir + mkdir $PidDir + fi + chown $RunUser:$RunGroup $PidDir +} + + +#------------------------------------------------------------------------ +# start init.d service + +startService() { + # systemd case + startSuperServer && return 0 + + InitFile=`getInitScriptLocation` + if [ -f "$InitFile" ]; then + "$InitFile" start + + checkString=`grepProcess "firebird"` + if [ -z "$checkString" ] + then + # server didn't start - wait a bit and recheck + sleep 2 + "$InitFile" start + + checkString=`grepProcess "firebird"` + if [ -z "$checkString" ] + then + echo "Looks like standalone server failed to start" + echo "Trying to continue anyway..." + fi + fi + fi +} + + +#------------------------------------------------------------------------ +# If we have right systems remove the service autostart stuff. + +removeServiceAutostart() { + if standaloneServerInstalled + then + # systemd case + unregisterSuperServer && return 0 + + # Unregister using OS command + if [ -x /sbin/insserv ]; then + /sbin/insserv /etc/init.d/ + fi + + if [ -x /sbin/chkconfig ]; then + /sbin/chkconfig --del firebird + fi + + if [ -x /sbin/rc-update ]; then + /sbin/rc-update del firebird + fi + + # Remove /usr/sbin/rcfirebird symlink + if [ -e /usr/sbin/rcfirebird ] + then + rm -f /usr/sbin/rcfirebird + fi + + # Remove initd script + rm -f $InitFile + fi +} + + +#------------------------------------------------------------------------ +# Returns TRUE if SA server is installed + +standaloneServerInstalled() { + if systemdPresent; then + ${SYSTEMCTL} --quiet is-enabled ${SUPER_CTRL} && return 0 + return 1 + fi + + InitFile=`getInitScriptLocation` + if [ -f "$InitFile" ]; then + return 0 + fi + return 1 +} + + +#------------------------------------------------------------------------ +# Corrects build-time "libdir" value + +CorrectLibDir() { + ld=${1} + l=/usr/lib + l64=/usr/lib64 + + if [ "$ld" = "$l64" ] + then + if [ -d "$l" ] + then + if [ ! -d "$l64" ] + then + ld="$l" + fi + fi + fi + + echo "$ld" +} Property changes on: firebird/trunk/builds/install/arch-specific/linux/linuxLibrary.sh.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,328 @@ +#!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue <mar...@lu...> +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# Script to copy install files from the build/transport area + + +# This script builds an image of the installed system into +# the gen/buildroot directory. + +if [ "`whoami`" != "root" ]; then + echo 'You must be root to build package' + exit 1 +fi + +# Making an assumption that this program is being run in the gen directory +BuildRootDir=.. +BuiltFBDir=Release/firebird # Where the just build fb exists. +TargetDir=buildroot # Where we want to build the install image +SecurityDatabase=security3.fdb + + +#------------------------------------------------------------------------ +# addLibs +# Add required libraries in the beginning of script. +# Place it to target directory. + +addLibs() { + libSdir=$1 + libScript=$2 + libTdir=$3 + libTarget=$libTdir/$libScript + + rm -f $libTarget + touch $libTarget + echo "#!/bin/sh" >>$libTarget + echo >>$libTarget + for i in posixLibrary.sh linuxLibrary.sh + do + echo "# $i" >>$libTarget + cat $libSdir/$i >>$libTarget + echo "" >>$libTarget # avoid missing linefeed + done + cat $libSdir/$libScript >>$libTarget +} + + +#------------------------------------------------------------------------ +# copyIfExists +# Copy file if it exists +# + +copyIfExists() { + Files="" + while [ ${#} -gt 1 ]; do + Files="$Files ${1}" + shift + done + NewDir=${1} + + for OldFile in $Files; do + if [ -f $OldFile ]; then + cp -df $OldFile $NewDir + fi + done +} + + +#------------------------------------------------------------------------ +# linkFiles +# This function creates soft links + +linkFiles() { + From=$1 + Files=$2 + To=$3 + Check=$4 + + if [ "$To" = "$Check" ]; then + return 0 + fi + + for file in $Files; do + ln -s $From/$file $To/$file + done +} + + +#------------------------------------------------------------------------ +# makeDirs +# Make paths, passed as a list in 1st arg + +makeDirs() { + Dirs=$1 + for d in $Dirs; do + Dir=${TargetDir}${d} + mkdir -p $Dir + chown root:root $Dir + chmod 0755 $Dir + done +} + + +#------------------------------------------------------------------------ +# copyFiles +# This function copies all the files for a distribution into a +# directory heirachy mirroring the installation. + +copyFiles() { +# The guts of the tranfer of files and other directories + +#cleanup + if [ -d $TargetDir ] + then + rm -fr $TargetDir + fi + + #directories + makeDirs "@FB_BINDIR@ @FB_SBINDIR@ @FB_CONFDIR@ @FB_LIBDIR@ @FB_INCDIR@/firebird @FB_DOCDIR@/sql.extensions @FB_UDFDIR@ \ + @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \ + @FB_GUARDDIR@ @FB_PLUGDIR@" + + for i in ib_udf metadata security; do + makeDirs @FB_MISCDIR@/upgrade/$i + done + + makeDirs /usr/include + + #bin + cp $BuiltFBDir/bin/gbak ${TargetDir}@FB_BINDIR@/gbak + cp $BuiltFBDir/bin/gfix ${TargetDir}@FB_BINDIR@/gfix + cp $BuiltFBDir/bin/gpre ${TargetDir}@FB_BINDIR@/gpre + cp $BuiltFBDir/bin/gsec ${TargetDir}@FB_BINDIR@/gsec + cp $BuiltFBDir/bin/nbackup ${TargetDir}@FB_BINDIR@/nbackup + copyIfExists $BuiltFBDir/bin/gsplit ${TargetDir}@FB_BINDIR@ + cp $BuiltFBDir/bin/gstat ${TargetDir}@FB_BINDIR@/gstat + copyIfExists $BuiltFBDir/bin/fbsvcmgr ${TargetDir}@FB_BINDIR@ + copyIfExists $BuiltFBDir/bin/fbtracemgr ${TargetDir}@FB_BINDIR@ + cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql + cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli + + chown root:root ${TargetDir}@FB_BINDIR@/* + chmod 0755 ${TargetDir}@FB_BINDIR@/* + + #sbin + cp -f $BuiltFBDir/bin/firebird ${TargetDir}@FB_SBINDIR@/firebird + cp -f $BuiltFBDir/bin/fbguard ${TargetDir}@FB_SBINDIR@ + copyIfExists $BuiltFBDir/bin/fb_lock_print ${TargetDir}@FB_SBINDIR@ + + addLibs $BuiltFBDir/bin changeServerMode.sh ${TargetDir}@FB_SBINDIR@ + cp $BuiltFBDir/bin/registerDatabase.sh ${TargetDir}@FB_SBINDIR@ + cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@ + + chown root:root ${TargetDir}@FB_SBINDIR@/* + chmod 0755 ${TargetDir}@FB_SBINDIR@/* + chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh + + #install scripts + addLibs $BuiltFBDir/bin tarMainInstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin tarinstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin preinstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin postinstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin preuninstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin postuninstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin taruninstall.sh $BuildRootDir/gen/install/scripts + addLibs $BuiltFBDir/bin tarMainUninstall.sh $BuildRootDir/gen/install/scripts + + #examples - copy only if we have them + exampleFiles=`find $BuiltFBDir/examples/README -type f -print` + if [ -z "$exampleFiles" ]; then + echo "Example files have not been built!" + else + (cd $BuiltFBDir/examples; tar cf - .) | (cd ${TargetDir}@FB_SAMPLEDIR@; tar xf -) + rm -rf ${TargetDir}@FB_SAMPLEDIR@/empbuild + + for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type d -print` + do + chown root:root $i + chmod 0555 $i + done + for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type f -print` + do + chown root:root $i + chmod 0444 $i + done + + makeDirs @FB_SAMPLEDBDIR@ + cp $BuiltFBDir/examples/empbuild/*.fdb ${TargetDir}@FB_SAMPLEDBDIR@ + + chown root:root ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb + chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb + fi + + #QLI help + copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@ + cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@ + + chown root:root ${TargetDir}@FB_HELPDIR@/*.fdb + chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb + + #message file + cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@ + + chown root:root ${TargetDir}@FB_MSGDIR@/*.msg + chmod 0444 ${TargetDir}@FB_MSGDIR@/*.msg + + #secureDB (access rights will be set at install time) + cp $BuiltFBDir/$SecurityDatabase ${TargetDir}@FB_SECDBDIR@ + + #include (.h files) + cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@ + cp $BuildRootDir/src/include/firebird/*.h ${TargetDir}@FB_INCDIR@/firebird + + chown root:root ${TargetDir}@FB_INCDIR@/*.h ${TargetDir}@FB_INCDIR@/firebird/*.h + chmod 0444 ${TargetDir}@FB_INCDIR@/*.h ${TargetDir}@FB_INCDIR@/firebird/*.h + + #lib + copyIfExists $BuiltFBDir/lib/libfbembed.so* ${TargetDir}@FB_LIBDIR@ + cp -df $BuiltFBDir/lib/libfbclient.so* ${TargetDir}@FB_LIBDIR@ + cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so + copyIfExists $BuiltFBDir/lib/libicu*.so* ${TargetDir}@FB_LIBDIR@ + + chown root:root ${TargetDir}@FB_LIBDIR@/*.so* + chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so* + + #plugins + (cd $BuiltFBDir/plugins;tar cf - .) | (cd ${TargetDir}@FB_PLUGDIR@; tar xvf -) + + for file in `find ${TargetDir}@FB_PLUGDIR@ -name '*.so*' -print`; do + chown root:root ${file} + chmod 0755 ${file} + done + + #intl + cp $BuiltFBDir/intl/libfbintl.so ${TargetDir}@FB_INTLDIR@/fbintl + cp $BuiltFBDir/intl/fbintl.conf ${TargetDir}@FB_INTLDIR@ + + chown root:root ${TargetDir}@FB_INTLDIR@/fbintl* + chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl + chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf + + #UDF + cp $BuiltFBDir/UDF/ib_udf.so ${TargetDir}@FB_UDFDIR@ + cp $BuiltFBDir/UDF/fbudf.so ${TargetDir}@FB_UDFDIR@ +# Note that the following items copy files from outside the build tree. +# Copy the sql-declarations into the UDF-directory + cp $BuildRootDir/src/extlib/ib_udf.sql ${TargetDir}@FB_UDFDIR@ + cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@ + cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@ + + chown root:root ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql + chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so + chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql + + #doc + cp $BuildRootDir/doc/*.pdf ${TargetDir}@FB_DOCDIR@ + cp $BuildRootDir/doc/README.* ${TargetDir}@FB_DOCDIR@ + cp $BuildRootDir/doc/sql.extensions/README* ${TargetDir}@FB_DOCDIR@/sql.extensions + cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew + cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README + + chown -R root:root ${TargetDir}@FB_MISCDIR@ + for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do + chown root:root $i + if [ -d $i ]; then + chmod 0755 $i + else + chmod 0644 $i + fi + done + + #misc + cp $BuildRootDir/src/misc/intl.sql ${TargetDir}@FB_MISCDIR@ + cp $BuildRootDir/src/misc/upgrade/v2/ib_udf* ${TargetDir}@FB_MISCDIR@/upgrade/ib_udf + cp $BuildRootDir/src/misc/upgrade/v2/security_database* ${TargetDir}@FB_MISCDIR@/upgrade/security + cp $BuildRootDir/src/misc/upgrade/v2.1/metadata_charset* ${TargetDir}@FB_MISCDIR@/upgrade/metadata + cp $BuildRootDir/gen/install/misc/firebird.xinetd ${TargetDir}@FB_MISCDIR@ + cp $BuildRootDir/gen/install/misc/firebird.init.d.* ${TargetDir}@FB_MISCDIR@ + cp $BuildRootDir/gen/install/misc/rc.config.firebird ${TargetDir}@FB_MISCDIR@ + cp $BuildRootDir/gen/install/misc/firebird-* ${TargetDir}@FB_MISCDIR@ + + chown -R root:root ${TargetDir}@FB_MISCDIR@ + chmod -R go-rwx ${TargetDir}@FB_MISCDIR@ + + #conf + cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@ + cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@ + cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@ + cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@ + + chown root:root ${TargetDir}@FB_CONFDIR@/*.conf + chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf + + #license + cp $BuildRootDir/builds/install/misc/*License.txt ${TargetDir}@FB_CONFDIR@ + + chown root:root ${TargetDir}@FB_CONFDIR@/*License.txt + chmod 0444 ${TargetDir}@FB_CONFDIR@/*License.txt + +# link include files to /usr/include + linkFiles "@FB_INCDIR@" "firebird iberror.h ibase.h ib_util.h" "${TargetDir}/usr/include" "${TargetDir}@FB_INCDIR@" + +} + + +#=== MAIN ==================================================================== + +copyFiles Property changes on: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: firebird/trunk/builds/install/arch-specific/linux/rc.config.firebird.in (from rev 58589, firebird/trunk/builds/install/arch-specific/linux/misc/rc.config.firebird.in) =================================================================== --- firebird/trunk/builds/install/arch-specific/linux/rc.config.firebird.in (rev 0) +++ firebird/trunk/builds/install/arch-specific/linux/rc.config.firebird.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -0,0 +1,4 @@ +# +# Start the Firebird RDBMS ? +# +START_FIREBIRD="yes" Property changes on: firebird/trunk/builds/install/arch-specific/linux/rc.config.firebird.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: firebird/trunk/builds/install/misc/IDPLicense.txt =================================================================== --- firebird/trunk/builds/install/misc/IDPLicense.txt 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/IDPLicense.txt 2013-09-13 12:27:16 UTC (rev 58617) Property changes on: firebird/trunk/builds/install/misc/IDPLicense.txt ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: firebird/trunk/builds/install/misc/IPLicense.txt =================================================================== --- firebird/trunk/builds/install/misc/IPLicense.txt 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/IPLicense.txt 2013-09-13 12:27:16 UTC (rev 58617) Property changes on: firebird/trunk/builds/install/misc/IPLicense.txt ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Deleted: firebird/trunk/builds/install/misc/changeDBAPassword.sh.in =================================================================== --- firebird/trunk/builds/install/misc/changeDBAPassword.sh.in 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/changeDBAPassword.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -1,7 +0,0 @@ -# This shell script changes both the SYSDBA user -# Firebird install library should be inserted before this file - -echo "This script is deprecated and should be removed in newer FB versions." -echo "Please use gsec utility directly to change SYSDBA password." - -askUserForNewDBAPassword Deleted: firebird/trunk/builds/install/misc/changeRunUser.sh.in =================================================================== --- firebird/trunk/builds/install/misc/changeRunUser.sh.in 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/changeRunUser.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -1,60 +0,0 @@ -#!/bin/sh -# -# The contents of this file are subject to the Initial -# Developer's Public License Version 1.0 (the "License"); -# you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. -# -# Software distributed under the License is distributed AS IS, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. -# See the License for the specific language governing rights -# and limitations under the License. -# -# The Original Code was created by Mark O'Donohue -# for the Firebird Open Source RDBMS project. -# -# Copyright (c) Mark O'Donohue <mar...@lu...> -# and all contributors signed below. -# -# All Rights Reserved. -# Contributor(s): ______________________________________. -# Alex Peshkoff -# - -# A routine to change the user that runs Firebird - -RunUser=firebird -RunGroup=firebird - -checkInstallUser -checkIfServerRunning - - -# Get confirmation -echo "" -echo "Change Firebird install for @FB_CONFDIR@ to uid=$RunUser gid=$RunGroup" -echo "(User or group options can be changed by editing this script)" -echo "" -AskQuestion "Press return to continue - or ^C to abort" - - -# Add user and group, if missing -if [ $RunUser != "root" ] -then - addFirebirdUser -fi - -# Update the /etc/inetd.conf or xinetd entry or /etc/init.d/firebird -echo "Updating /etc file(s)" -updateInetdServiceEntry -changeInitRunUser $RunUser - -# Update ownership and SUID bits for programs -echo "Updating permissions" -fixFilePermissions - -# Start server again -startFirebird - -echo "Completed." Deleted: firebird/trunk/builds/install/misc/changeServerMode.sh.in =================================================================== --- firebird/trunk/builds/install/misc/changeServerMode.sh.in 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/changeServerMode.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -1,69 +0,0 @@ -#!/bin/sh -# -# The contents of this file are subject to the Initial -# Developer's Public License Version 1.0 (the "License"); -# you may not use this file except in compliance with the -# License. You may obtain a copy of the License at -# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. -# -# Software distributed under the License is distributed AS IS, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. -# See the License for the specific language governing rights -# and limitations under the License. -# -# The Original Code was created by Alex Peshkoff -# for the Firebird Open Source RDBMS project. -# -# Copyright (c) 2008 Alex Peshkoff <pes...@ma...> -# and all contributors signed below. -# -# All Rights Reserved. -# Contributor(s): ______________________________________. -# - -#= Main ==================================================================== - -cat <<EOF -Firebird server may run in 2 different modes - super and classic. -Super server provides better performance, classic - better availability. - -*** Warning: runuser will be reset to firebird. - -EOF - -AskQuestion "Which option would you like to choose: (super|classic) [super] " "super" -multiAnswer=$Answer - -case "$multiAnswer" in -super) - ;; -classic) - ;; -*) - echo "Unknown option $multiAnswer chosen" - exit 1 - ;; -esac - -echo "Stopping currently running engine..." -checkIfServerRunning -removeInetdServiceEntry -removeServiceAutostart - -echo "Starting firebird in $multiAnswer server mode..." -fbconf="@FB_CONFDIR@/firebird.conf" -if [ $multiAnswer == classic ]; then - replaceLineInFile $fbconf "SharedCache = false" "^SharedCache" - replaceLineInFile $fbconf "SharedDatabase = true" "^SharedDatabase" - - updateInetdServiceEntry - resetInetdServer -else - replaceLineInFile $fbconf "SharedCache = true" "^SharedCache" - replaceLineInFile $fbconf "SharedDatabase = false" "^SharedDatabase" - - installInitdScript - startService -fi - -echo "Done." Deleted: firebird/trunk/builds/install/misc/createAliasDB.sh.in =================================================================== --- firebird/trunk/builds/install/misc/createAliasDB.sh.in 2013-09-13 12:21:51 UTC (rev 58616) +++ firebird/trunk/builds/install/misc/createAliasDB.sh.in 2013-09-13 12:27:16 UTC (rev 58617) @@ -1,140 +0,0 @@ -#! /bin/sh -# -# This library is part of the Firebird project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Les... [truncated message content] |
From: <fs...@us...> - 2013-09-14 15:22:41
|
Revision: 58620 http://sourceforge.net/p/firebird/code/58620 Author: fsg Date: 2013-09-14 15:22:37 +0000 (Sat, 14 Sep 2013) Log Message: ----------- No need to include locale.h twice and don't try to call setlocale if it isn't available. Modified Paths: -------------- firebird/trunk/extern/editline/src/eln.c firebird/trunk/src/isql/isql.epp Modified: firebird/trunk/extern/editline/src/eln.c =================================================================== --- firebird/trunk/extern/editline/src/eln.c 2013-09-14 13:15:30 UTC (rev 58619) +++ firebird/trunk/extern/editline/src/eln.c 2013-09-14 15:22:37 UTC (rev 58620) @@ -75,7 +75,7 @@ el_gets(EditLine *el, int *nread) { const wchar_t *tmp; -//we don't want to ignore extended chars with UTF8 charsets /FSG 20011 +//we don't want to ignore extended chars with UTF8 charsets /FSG 2011 if (!(el->el_flags & CHARSET_IS_UTF8)) el->el_flags |= IGNORE_EXTCHARS; tmp = el_wgets(el, nread); Modified: firebird/trunk/src/isql/isql.epp =================================================================== --- firebird/trunk/src/isql/isql.epp 2013-09-14 13:15:30 UTC (rev 58619) +++ firebird/trunk/src/isql/isql.epp 2013-09-14 15:22:37 UTC (rev 58620) @@ -83,7 +83,6 @@ // This is a local file included in our distribution - but not always // compiled into the system #include "editline.h" -#include <locale.h> #endif enum literal_string_type @@ -533,7 +532,7 @@ isqlGlob.major_ods = 0; isqlGlob.minor_ods = 0; -#ifdef HAVE_EDITLINE_H +#if defined(HAVE_EDITLINE_H) || defined(HAVE_LOCALE_H) setlocale(LC_CTYPE, ""); #endif int rc = ISQL_main(argc, argv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2013-09-15 00:32:17
|
Revision: 58621 http://sourceforge.net/p/firebird/code/58621 Author: firebirds Date: 2013-09-15 00:32:13 +0000 (Sun, 15 Sep 2013) 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 2013-09-14 15:22:37 UTC (rev 58620) +++ firebird/trunk/ChangeLog 2013-09-15 00:32:13 UTC (rev 58621) @@ -1,3 +1,66 @@ + 2013-09-14 15:22 fsg + M extern/editline/src/eln.c + M src/isql/isql.epp +No need to include locale.h twice and don't try to call setlocale if it isn't available. + + 2013-09-13 12:27 alexpeshkoff + M builds/install/arch-specific/linux/Makefile.in + A builds/install/arch-specific/linux/README (from /firebird/trunk/builds/install/arch-specific/linux/misc/README:58589) + A builds/install/arch-specific/linux/firebird-classic.service.in + A builds/install/arch-specific/linux/firebird-classic.socket.in + A builds/install/arch-specific/linux/firebird-superserver.service.in + A builds/install/arch-specific/linux/firebird.init.d.debian.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.debian.in:58589) + A builds/install/arch-specific/linux/firebird.init.d.generic.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.generic.in:58589) + A builds/install/arch-specific/linux/firebird.init.d.gentoo.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in:58589) + A builds/install/arch-specific/linux/firebird.init.d.mandrake.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in:58589) + A builds/install/arch-specific/linux/firebird.init.d.slackware.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.slackware.in:58589) + A builds/install/arch-specific/linux/firebird.init.d.suse.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in:58589) + A builds/install/arch-specific/linux/firebird.xinetd.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/firebird.xinetd.in:58589) + A builds/install/arch-specific/linux/linuxLibrary.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in:58589) + A builds/install/arch-specific/linux/makeInstallImage.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in:58589) + D builds/install/arch-specific/linux/misc + A builds/install/arch-specific/linux/rc.config.firebird.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/rc.config.firebird.in:58589) + M builds/install/misc/IDPLicense.txt + M builds/install/misc/IPLicense.txt + D builds/install/misc/changeDBAPassword.sh.in + D builds/install/misc/changeRunUser.sh.in + D builds/install/misc/changeServerMode.sh.in + D builds/install/misc/createAliasDB.sh.in + D builds/install/misc/fb_config.in + M builds/install/misc/fbintl.conf + M builds/install/misc/firebird.conf.in + M builds/install/misc/firebird.init.d.Solaris.in + D builds/install/misc/posixLibrary.sh.in + D builds/install/misc/restoreRootRunUser.sh.in + A builds/install/posix-common + A builds/install/posix-common/changeServerMode.sh.in (from /firebird/trunk/builds/install/misc/changeServerMode.sh.in:58589) + A builds/install/posix-common/fb_config.in (from /firebird/trunk/builds/install/misc/fb_config.in:58589) + A builds/install/posix-common/posixLibrary.sh.in (from /firebird/trunk/builds/install/misc/posixLibrary.sh.in:58589) + A builds/install/posix-common/postinstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/postinstall.sh.in:58589) + A builds/install/posix-common/postuninstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/postuninstall.sh.in:58589) + A builds/install/posix-common/preinstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/preinstall.sh.in:58589) + A builds/install/posix-common/preuninstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/preuninstall.sh.in:58589) + A builds/install/posix-common/registerDatabase.sh.in (from /firebird/trunk/builds/install/misc/createAliasDB.sh.in:58589) + A builds/install/posix-common/tarMainInstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/tarMainInstall.sh.in:58589) + A builds/install/posix-common/tarMainUninstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in:58589) + A builds/install/posix-common/tarinstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/tarinstall.sh.in:58589) + A builds/install/posix-common/taruninstall.sh.in (from /firebird/trunk/builds/install/arch-specific/linux/misc/taruninstall.sh.in:58589) + M configure.ac +Added support for systemd +Removed scripts to change firebird runuser to root and back to firebird +Removed script changing SYSDBA password (nothing except gsec call left in it) +Reorganize posix/linux install files minimizing OS-specific part of .tgz install scripts +Related cleanup and bugfixing in posix install + + 2013-09-13 12:21 alexpeshkoff + M src/jrd/jrd.cpp + M src/jrd/tra.h +Cleanup - removed unused (always NULL) field tra_sibling from transaction class in engine + + 2013-09-13 08:15 hvlad + M src/jrd/vio.cpp +Fix to please GCC + 2013-09-12 19:08 hvlad M src/jrd/lck.cpp M src/jrd/lck.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-14 15:22:37 UTC (rev 58620) +++ firebird/trunk/src/jrd/build_no.h 2013-09-15 00:32:13 UTC (rev 58621) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30647 + FORMAL BUILD NUMBER:30651 */ -#define PRODUCT_VER_STRING "3.0.0.30647" -#define FILE_VER_STRING "WI-T3.0.0.30647" -#define LICENSE_VER_STRING "WI-T3.0.0.30647" -#define FILE_VER_NUMBER 3, 0, 0, 30647 +#define PRODUCT_VER_STRING "3.0.0.30651" +#define FILE_VER_STRING "WI-T3.0.0.30651" +#define LICENSE_VER_STRING "WI-T3.0.0.30651" +#define FILE_VER_NUMBER 3, 0, 0, 30651 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30647" +#define FB_BUILD_NO "30651" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-14 15:22:37 UTC (rev 58620) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-15 00:32:13 UTC (rev 58621) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30647 +BuildNum=30651 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...> - 2013-09-17 01:01:38
|
Revision: 58626 http://sourceforge.net/p/firebird/code/58626 Author: firebirds Date: 2013-09-17 01:01:35 +0000 (Tue, 17 Sep 2013) 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 2013-09-16 13:55:06 UTC (rev 58625) +++ firebird/trunk/ChangeLog 2013-09-17 01:01:35 UTC (rev 58626) @@ -1,3 +1,11 @@ + 2013-09-16 13:55 alexpeshkoff + M src/common/config/config_file.cpp +Fixed CORE-4219: Regular expressions with double-slash fail in trace + + 2013-09-16 09:17 hvlad + M src/jrd/exe.cpp +Fixed bug CORE-4216 : Memory leak with TRIGGER ON TRANSACTION COMMIT + 2013-09-14 15:22 fsg M extern/editline/src/eln.c M src/isql/isql.epp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2013-09-16 13:55:06 UTC (rev 58625) +++ firebird/trunk/src/jrd/build_no.h 2013-09-17 01:01:35 UTC (rev 58626) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:30651 + FORMAL BUILD NUMBER:30653 */ -#define PRODUCT_VER_STRING "3.0.0.30651" -#define FILE_VER_STRING "WI-T3.0.0.30651" -#define LICENSE_VER_STRING "WI-T3.0.0.30651" -#define FILE_VER_NUMBER 3, 0, 0, 30651 +#define PRODUCT_VER_STRING "3.0.0.30653" +#define FILE_VER_STRING "WI-T3.0.0.30653" +#define LICENSE_VER_STRING "WI-T3.0.0.30653" +#define FILE_VER_NUMBER 3, 0, 0, 30653 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30651" +#define FB_BUILD_NO "30653" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-16 13:55:06 UTC (rev 58625) +++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-17 01:01:35 UTC (rev 58626) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30651 +BuildNum=30653 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |