Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2014-05-16 00:42:25
|
Revision: 59594
http://sourceforge.net/p/firebird/code/59594
Author: firebirds
Date: 2014-05-16 00:42:23 +0000 (Fri, 16 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-15 22:06:44 UTC (rev 59593)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-16 00:42:23 UTC (rev 59594)
@@ -1,3 +1,17 @@
+ 2014-05-15 22:06 hvlad
+ M src/jrd/GlobalRWLock.cpp
+Fixed bug CORE-4433 : GlobalRWLock could not downgrade EX lock to SH if readers is present
+
+ 2014-05-15 22:05 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+1. Improvement CORE-4431 : Reduce contention for allocation table lock while database is in stalled physical backup state
+2. Improvement CORE-4432 : Let attachments to not block others when allocation table is read first time
+3. On Windows, file can not be deleted while system writes cached data into it, even if file is not open by anyone.
+Therefore flush delta file implicitly before closing it.
+
2014-05-12 09:44 paulbeach
M builds/install/arch-specific/darwin/embed.darwin
Correct a problem with locating intl dylibs
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-15 22:06:44 UTC (rev 59593)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-16 00:42:23 UTC (rev 59594)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26759
+ FORMAL BUILD NUMBER:26761
*/
-#define PRODUCT_VER_STRING "2.5.3.26759"
-#define FILE_VER_STRING "WI-V2.5.3.26759"
-#define LICENSE_VER_STRING "WI-V2.5.3.26759"
-#define FILE_VER_NUMBER 2, 5, 3, 26759
+#define PRODUCT_VER_STRING "2.5.3.26761"
+#define FILE_VER_STRING "WI-V2.5.3.26761"
+#define LICENSE_VER_STRING "WI-V2.5.3.26761"
+#define FILE_VER_NUMBER 2, 5, 3, 26761
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26759"
+#define FB_BUILD_NO "26761"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-15 22:06:44 UTC (rev 59593)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-16 00:42:23 UTC (rev 59594)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26759
+BuildNum=26761
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-05-17 00:48:32
|
Revision: 59603
http://sourceforge.net/p/firebird/code/59603
Author: firebirds
Date: 2014-05-17 00:48:28 +0000 (Sat, 17 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-17 00:31:50 UTC (rev 59602)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-17 00:48:28 UTC (rev 59603)
@@ -1,3 +1,7 @@
+ 2014-05-16 13:01 hvlad
+ M src/jrd/validation.cpp
+Correct format specifiers
+
2014-05-15 22:06 hvlad
M src/jrd/GlobalRWLock.cpp
Fixed bug CORE-4433 : GlobalRWLock could not downgrade EX lock to SH if readers is present
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-17 00:31:50 UTC (rev 59602)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-17 00:48:28 UTC (rev 59603)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26761
+ FORMAL BUILD NUMBER:26762
*/
-#define PRODUCT_VER_STRING "2.5.3.26761"
-#define FILE_VER_STRING "WI-V2.5.3.26761"
-#define LICENSE_VER_STRING "WI-V2.5.3.26761"
-#define FILE_VER_NUMBER 2, 5, 3, 26761
+#define PRODUCT_VER_STRING "2.5.3.26762"
+#define FILE_VER_STRING "WI-V2.5.3.26762"
+#define LICENSE_VER_STRING "WI-V2.5.3.26762"
+#define FILE_VER_NUMBER 2, 5, 3, 26762
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26761"
+#define FB_BUILD_NO "26762"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-17 00:31:50 UTC (rev 59602)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-17 00:48:28 UTC (rev 59603)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26761
+BuildNum=26762
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-05-23 00:42:26
|
Revision: 59620
http://sourceforge.net/p/firebird/code/59620
Author: firebirds
Date: 2014-05-23 00:42:20 +0000 (Fri, 23 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-23 00:28:39 UTC (rev 59619)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-23 00:42:20 UTC (rev 59620)
@@ -1,3 +1,11 @@
+ 2014-05-22 10:28 alexpeshkoff
+ A builds/posix/prefix.linux_arm64
+Missed file for ARM64 port
+
+ 2014-05-22 10:09 alexpeshkoff
+ M builds/posix/prefix.hpux_aCC
+I have a report that this fix makes it possible to have successfull release build on HP-UX B.11.31 with HP C/aC++ A.06.26 compiler
+
2014-05-16 13:01 hvlad
M src/jrd/validation.cpp
Correct format specifiers
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-23 00:28:39 UTC (rev 59619)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-23 00:42:20 UTC (rev 59620)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26762
+ FORMAL BUILD NUMBER:26764
*/
-#define PRODUCT_VER_STRING "2.5.3.26762"
-#define FILE_VER_STRING "WI-V2.5.3.26762"
-#define LICENSE_VER_STRING "WI-V2.5.3.26762"
-#define FILE_VER_NUMBER 2, 5, 3, 26762
+#define PRODUCT_VER_STRING "2.5.3.26764"
+#define FILE_VER_STRING "WI-V2.5.3.26764"
+#define LICENSE_VER_STRING "WI-V2.5.3.26764"
+#define FILE_VER_NUMBER 2, 5, 3, 26764
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26762"
+#define FB_BUILD_NO "26764"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-23 00:28:39 UTC (rev 59619)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-23 00:42:20 UTC (rev 59620)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26762
+BuildNum=26764
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-05-24 02:35:36
|
Revision: 59624
http://sourceforge.net/p/firebird/code/59624
Author: firebirds
Date: 2014-05-24 02:35:32 +0000 (Sat, 24 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-24 00:55:25 UTC (rev 59623)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-24 02:35:32 UTC (rev 59624)
@@ -1,3 +1,7 @@
+ 2014-05-23 01:31 robocop
+ M src/jrd/nbak.h
+Misc.
+
2014-05-22 10:28 alexpeshkoff
A builds/posix/prefix.linux_arm64
Missed file for ARM64 port
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-24 00:55:25 UTC (rev 59623)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-24 02:35:32 UTC (rev 59624)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26764
+ FORMAL BUILD NUMBER:26765
*/
-#define PRODUCT_VER_STRING "2.5.3.26764"
-#define FILE_VER_STRING "WI-V2.5.3.26764"
-#define LICENSE_VER_STRING "WI-V2.5.3.26764"
-#define FILE_VER_NUMBER 2, 5, 3, 26764
+#define PRODUCT_VER_STRING "2.5.3.26765"
+#define FILE_VER_STRING "WI-V2.5.3.26765"
+#define LICENSE_VER_STRING "WI-V2.5.3.26765"
+#define FILE_VER_NUMBER 2, 5, 3, 26765
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26764"
+#define FB_BUILD_NO "26765"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-24 00:55:25 UTC (rev 59623)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-24 02:35:32 UTC (rev 59624)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26764
+BuildNum=26765
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-05-29 01:27:17
|
Revision: 59639
http://sourceforge.net/p/firebird/code/59639
Author: firebirds
Date: 2014-05-29 01:27:14 +0000 (Thu, 29 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-29 00:58:23 UTC (rev 59638)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-29 01:27:14 UTC (rev 59639)
@@ -1,3 +1,24 @@
+ 2014-05-28 06:39 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2014-05-28 05:56 dimitr
+ M src/gpre/c_cxx.cpp
+ M src/gpre/cme.cpp
+ M src/gpre/cmp.cpp
+ M src/gpre/gpre.h
+ M src/gpre/hsh.h
+ M src/gpre/msc.cpp
+ M src/gpre/msc_proto.h
+ M src/gpre/par.cpp
+ M src/gpre/sqe.cpp
+ M src/gpre/sqe_proto.h
+ M src/gpre/sql.cpp
+ M src/gpre/words.h
+CORE-4437: Add support for the RETURNING clause to Embedded SQL.
+CORE-4438: Add support for UPDATE OR INSERT statement to Embedded SQL.
+Only C/C++ language support is added, other languages will be supported in trunk.
+
2014-05-23 01:31 robocop
M src/jrd/nbak.h
Misc.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-29 00:58:23 UTC (rev 59638)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-29 01:27:14 UTC (rev 59639)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26765
+ FORMAL BUILD NUMBER:26767
*/
-#define PRODUCT_VER_STRING "2.5.3.26765"
-#define FILE_VER_STRING "WI-V2.5.3.26765"
-#define LICENSE_VER_STRING "WI-V2.5.3.26765"
-#define FILE_VER_NUMBER 2, 5, 3, 26765
+#define PRODUCT_VER_STRING "2.5.3.26767"
+#define FILE_VER_STRING "WI-V2.5.3.26767"
+#define LICENSE_VER_STRING "WI-V2.5.3.26767"
+#define FILE_VER_NUMBER 2, 5, 3, 26767
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26765"
+#define FB_BUILD_NO "26767"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-29 00:58:23 UTC (rev 59638)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-29 01:27:14 UTC (rev 59639)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26765
+BuildNum=26767
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hv...@us...> - 2014-05-29 07:44:30
|
Revision: 59642
http://sourceforge.net/p/firebird/code/59642
Author: hvlad
Date: 2014-05-29 07:44:26 +0000 (Thu, 29 May 2014)
Log Message:
-----------
Implement support for fallocate() call on Linux.
Implement improvement CORE-4443 : Use fast file grow on those Linux systems which supports it
Modified Paths:
--------------
firebird/branches/B2_5_Release/configure.in
firebird/branches/B2_5_Release/src/jrd/os/pio.h
firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp
firebird/branches/B2_5_Release/src/jrd/pag.cpp
firebird/branches/B2_5_Release/src/jrd/pag.h
Modified: firebird/branches/B2_5_Release/configure.in
===================================================================
--- firebird/branches/B2_5_Release/configure.in 2014-05-29 07:19:29 UTC (rev 59641)
+++ firebird/branches/B2_5_Release/configure.in 2014-05-29 07:44:26 UTC (rev 59642)
@@ -699,6 +699,7 @@
AC_CHECK_HEADERS(atomic_ops.h)
AC_CHECK_HEADERS(utime.h)
AC_CHECK_HEADERS(poll.h)
+AC_CHECK_HEADERS(linux/falloc.h)
dnl Check for libraries
AC_SEARCH_LIBS(dlopen, dl)
Modified: firebird/branches/B2_5_Release/src/jrd/os/pio.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/pio.h 2014-05-29 07:19:29 UTC (rev 59641)
+++ firebird/branches/B2_5_Release/src/jrd/os/pio.h 2014-05-29 07:44:26 UTC (rev 59642)
@@ -93,6 +93,7 @@
const USHORT FIL_force_write = 1;
const USHORT FIL_no_fs_cache = 2; // not using file system cache
const USHORT FIL_readonly = 4; // file opened in readonly mode
+const USHORT FIL_no_fast_extend = 8; // file not supports fast extending
// Physical IO trace events
Modified: firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp 2014-05-29 07:19:29 UTC (rev 59641)
+++ firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp 2014-05-29 07:44:26 UTC (rev 59642)
@@ -46,6 +46,9 @@
#ifdef HAVE_AIO_H
#include <aio.h>
#endif
+#ifdef HAVE_LINUX_FALLOC_H
+#include <linux/falloc.h>
+#endif
#include "../jrd/jrd.h"
#include "../jrd/os/pio.h"
@@ -281,7 +284,7 @@
}
-void PIO_extend(Database* dbb, jrd_file* /*main_file*/, const ULONG /*extPages*/, const USHORT /*pageSize*/)
+void PIO_extend(Database* dbb, jrd_file* main_file, const ULONG extPages, const USHORT pageSize)
{
/**************************************
*
@@ -293,6 +296,56 @@
* Extend file by extPages pages of pageSize size.
*
**************************************/
+
+#ifdef HAVE_LINUX_FALLOC_H
+ ULONG leftPages = extPages;
+ for (jrd_file* file = main_file; file && leftPages; file = file->fil_next)
+ {
+ const ULONG filePages = PIO_get_number_of_pages(file, pageSize);
+ const ULONG fileMaxPages = (file->fil_max_page == MAX_ULONG) ?
+ MAX_ULONG : file->fil_max_page - file->fil_min_page + 1;
+ if (filePages < fileMaxPages)
+ {
+ if (file->fil_flags & FIL_no_fast_extend)
+ return;
+
+ const ULONG extendBy = MIN(fileMaxPages - filePages + file->fil_fudge, leftPages);
+
+ int r;
+ for (r = 0; r < IO_RETRY; r++)
+ {
+ int err = fallocate(file->fil_desc, 0, filePages * pageSize, extendBy * pageSize);
+ if (err == 0)
+ break;
+
+ err = errno;
+ if (SYSCALL_INTERRUPTED(err))
+ continue;
+
+ if (err == EOPNOTSUPP || err == ENOSYS)
+ file->fil_flags |= FIL_no_fast_extend;
+ else
+ unix_error("fallocate", file, isc_io_write_err);
+ return;
+ }
+
+ if (r == IO_RETRY)
+ {
+#ifdef DEV_BUILD
+ fprintf(stderr, "PIO_extend: retry count exceeded\n");
+ fflush(stderr);
+#endif
+ unix_error("fallocate_retry", file, isc_io_write_err);
+ return;
+ }
+
+ leftPages -= extendBy;
+ }
+ }
+#else
+ main_file->fil_flags |= FIL_no_fast_extend;
+#endif // HAVE_LINUX_FALLOC_H
+
// not implemented
return;
}
Modified: firebird/branches/B2_5_Release/src/jrd/pag.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/pag.cpp 2014-05-29 07:19:29 UTC (rev 59641)
+++ firebird/branches/B2_5_Release/src/jrd/pag.cpp 2014-05-29 07:44:26 UTC (rev 59642)
@@ -918,7 +918,7 @@
// At this point we ensure database has at least "initialized" pages
// allocated. To avoid file growth by few pages when all this space
// will be used, extend file up to initialized + next_init_pages now
- pageSpace->extend(tdbb, initialized + next_init_pages);
+ pageSpace->extend(tdbb, initialized + next_init_pages, false);
}
break; // Found a page and successfully fake-ed it
@@ -2383,7 +2383,7 @@
return pgSpace->maxAlloc(dbb->dbb_page_size);
}
-bool PageSpace::extend(thread_db* tdbb, const ULONG pageNum)
+bool PageSpace::extend(thread_db* tdbb, const ULONG pageNum, const bool forceSize)
{
/**************************************
*
@@ -2395,10 +2395,14 @@
* If "DatabaseGrowthIncrement" is less than MIN_EXTEND_BYTES then don't
* extend file(s)
*
+ * If forceSize is true, extend file up to pageNum pages (despite of value
+ * of "DatabaseGrowthIncrement") and don't make attempts to extend by less
+ * pages.
+ *
**************************************/
const int MAX_EXTEND_BYTES = Config::getDatabaseGrowthIncrement();
- if (pageNum < maxPageNumber || MAX_EXTEND_BYTES < MIN_EXTEND_BYTES)
+ if (pageNum < maxPageNumber || MAX_EXTEND_BYTES < MIN_EXTEND_BYTES && !forceSize)
return true;
Database* dbb = tdbb->getDatabase();
@@ -2415,6 +2419,7 @@
while (true)
{
+ const ULONG oldMaxPageNumber = maxPageNumber;
try
{
PIO_extend(dbb, file, extPages, dbb->dbb_page_size);
@@ -2422,10 +2427,16 @@
}
catch (const status_exception&)
{
- if (extPages > reqPages)
+ if (extPages > reqPages && !forceSize)
{
+ fb_utils::init_status(tdbb->tdbb_status_vector);
+
+ // if file was extended, return, else try to extend by less pages
+
+ if (oldMaxPageNumber < maxAlloc(dbb->dbb_page_size))
+ return true;
+
extPages = MAX(reqPages, extPages / 2);
- fb_utils::init_status(tdbb->tdbb_status_vector);
}
else
{
Modified: firebird/branches/B2_5_Release/src/jrd/pag.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/pag.h 2014-05-29 07:19:29 UTC (rev 59641)
+++ firebird/branches/B2_5_Release/src/jrd/pag.h 2014-05-29 07:44:26 UTC (rev 59642)
@@ -103,7 +103,7 @@
static ULONG maxAlloc(const Database* dbb);
// extend page space
- bool extend(thread_db*, const ULONG);
+ bool extend(thread_db*, const ULONG, const bool);
private:
ULONG maxPageNumber;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-05-30 00:46:40
|
Revision: 59648
http://sourceforge.net/p/firebird/code/59648
Author: firebirds
Date: 2014-05-30 00:46:35 +0000 (Fri, 30 May 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-05-30 00:33:54 UTC (rev 59647)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-05-30 00:46:35 UTC (rev 59648)
@@ -1,3 +1,29 @@
+ 2014-05-29 12:15 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2014-05-29 07:54 hvlad
+ M src/jrd/GlobalRWLock.cpp
+ M src/jrd/GlobalRWLock.h
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+Fixed bug CORE-4444 : Engine could hung and block all attachments in out of disk space condition during physical backup
+Improvement CORE-4445 : Extend main database file faster when physical backup state changed from stalled to merge
+
+ 2014-05-29 07:46 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+Fixed bug CORE-4444 : Engine could hung and block all attachments in out of disk space condition during physical backup
+
+ 2014-05-29 07:44 hvlad
+ M configure.in
+ M src/jrd/os/pio.h
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/pag.h
+Implement support for fallocate() call on Linux.
+Implement improvement CORE-4443 : Use fast file grow on those Linux systems which supports it
+
2014-05-28 06:39 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-30 00:33:54 UTC (rev 59647)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-05-30 00:46:35 UTC (rev 59648)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26767
+ FORMAL BUILD NUMBER:26771
*/
-#define PRODUCT_VER_STRING "2.5.3.26767"
-#define FILE_VER_STRING "WI-V2.5.3.26767"
-#define LICENSE_VER_STRING "WI-V2.5.3.26767"
-#define FILE_VER_NUMBER 2, 5, 3, 26767
+#define PRODUCT_VER_STRING "2.5.3.26771"
+#define FILE_VER_STRING "WI-V2.5.3.26771"
+#define LICENSE_VER_STRING "WI-V2.5.3.26771"
+#define FILE_VER_NUMBER 2, 5, 3, 26771
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26767"
+#define FB_BUILD_NO "26771"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-30 00:33:54 UTC (rev 59647)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-05-30 00:46:35 UTC (rev 59648)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26767
+BuildNum=26771
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-04 01:01:18
|
Revision: 59656
http://sourceforge.net/p/firebird/code/59656
Author: firebirds
Date: 2014-06-04 01:01:11 +0000 (Wed, 04 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-03 11:02:09 UTC (rev 59655)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-04 01:01:11 UTC (rev 59656)
@@ -1,3 +1,9 @@
+ 2014-06-03 11:02 dimitr
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/met.epp
+Replaced debug info blob id with blob contents in cached triggers. This fixes the first part of CORE-3305 / CORE-4390, thus making the original problem visible.
+
2014-05-29 12:15 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-03 11:02:09 UTC (rev 59655)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-04 01:01:11 UTC (rev 59656)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26771
+ FORMAL BUILD NUMBER:26772
*/
-#define PRODUCT_VER_STRING "2.5.3.26771"
-#define FILE_VER_STRING "WI-V2.5.3.26771"
-#define LICENSE_VER_STRING "WI-V2.5.3.26771"
-#define FILE_VER_NUMBER 2, 5, 3, 26771
+#define PRODUCT_VER_STRING "2.5.3.26772"
+#define FILE_VER_STRING "WI-V2.5.3.26772"
+#define LICENSE_VER_STRING "WI-V2.5.3.26772"
+#define FILE_VER_NUMBER 2, 5, 3, 26772
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26771"
+#define FB_BUILD_NO "26772"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-03 11:02:09 UTC (rev 59655)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-04 01:01:11 UTC (rev 59656)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26771
+BuildNum=26772
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-07 01:02:11
|
Revision: 59663
http://sourceforge.net/p/firebird/code/59663
Author: firebirds
Date: 2014-06-07 01:02:01 +0000 (Sat, 07 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-07 00:44:34 UTC (rev 59662)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-07 01:02:01 UTC (rev 59663)
@@ -1,3 +1,7 @@
+ 2014-06-06 10:42 alexpeshkoff
+ M src/jrd/extds/InternalDS.cpp
+Use GlobalPtr for static variable doing memory allocation
+
2014-06-03 11:02 dimitr
M src/jrd/jrd.cpp
M src/jrd/jrd.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-07 00:44:34 UTC (rev 59662)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-07 01:02:01 UTC (rev 59663)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26772
+ FORMAL BUILD NUMBER:26773
*/
-#define PRODUCT_VER_STRING "2.5.3.26772"
-#define FILE_VER_STRING "WI-V2.5.3.26772"
-#define LICENSE_VER_STRING "WI-V2.5.3.26772"
-#define FILE_VER_NUMBER 2, 5, 3, 26772
+#define PRODUCT_VER_STRING "2.5.3.26773"
+#define FILE_VER_STRING "WI-V2.5.3.26773"
+#define LICENSE_VER_STRING "WI-V2.5.3.26773"
+#define FILE_VER_NUMBER 2, 5, 3, 26773
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26772"
+#define FB_BUILD_NO "26773"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-07 00:44:34 UTC (rev 59662)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-07 01:02:01 UTC (rev 59663)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26772
+BuildNum=26773
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-11 00:47:06
|
Revision: 59693
http://sourceforge.net/p/firebird/code/59693
Author: firebirds
Date: 2014-06-11 00:47:03 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-11 00:33:19 UTC (rev 59692)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-11 00:47:03 UTC (rev 59693)
@@ -1,3 +1,12 @@
+ 2014-06-10 20:17 dimitr
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+Patch by Nickolay Samofatov: avoid an AST overhead for heavily-loaded systems with many requests. This is committed into v2.5 only, so far I doubt v3 needs that.
+
+ 2014-06-10 20:05 dimitr
+ M src/jrd/opt.cpp
+Fixed CORE-4460: Expressions containing some built-in functions may be badly optimized.
+
2014-06-06 10:42 alexpeshkoff
M src/jrd/extds/InternalDS.cpp
Use GlobalPtr for static variable doing memory allocation
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-11 00:33:19 UTC (rev 59692)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-11 00:47:03 UTC (rev 59693)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26773
+ FORMAL BUILD NUMBER:26775
*/
-#define PRODUCT_VER_STRING "2.5.3.26773"
-#define FILE_VER_STRING "WI-V2.5.3.26773"
-#define LICENSE_VER_STRING "WI-V2.5.3.26773"
-#define FILE_VER_NUMBER 2, 5, 3, 26773
+#define PRODUCT_VER_STRING "2.5.3.26775"
+#define FILE_VER_STRING "WI-V2.5.3.26775"
+#define LICENSE_VER_STRING "WI-V2.5.3.26775"
+#define FILE_VER_NUMBER 2, 5, 3, 26775
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26773"
+#define FB_BUILD_NO "26775"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-11 00:33:19 UTC (rev 59692)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-11 00:47:03 UTC (rev 59693)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26773
+BuildNum=26775
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-13 00:42:03
|
Revision: 59702
http://sourceforge.net/p/firebird/code/59702
Author: firebirds
Date: 2014-06-13 00:41:56 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-13 00:29:43 UTC (rev 59701)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-13 00:41:56 UTC (rev 59702)
@@ -1,3 +1,12 @@
+ 2014-06-12 15:56 asfernandes
+ M src/intl/lc_narrow.cpp
+ M src/jrd/idx.cpp
+Backported fix for CORE-4417 - gbak: cannot commit index ; primary key with german umlaut.
+
+ 2014-06-12 07:19 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
2014-06-10 20:17 dimitr
M src/jrd/Database.cpp
M src/jrd/Database.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-13 00:29:43 UTC (rev 59701)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-13 00:41:56 UTC (rev 59702)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26775
+ FORMAL BUILD NUMBER:26777
*/
-#define PRODUCT_VER_STRING "2.5.3.26775"
-#define FILE_VER_STRING "WI-V2.5.3.26775"
-#define LICENSE_VER_STRING "WI-V2.5.3.26775"
-#define FILE_VER_NUMBER 2, 5, 3, 26775
+#define PRODUCT_VER_STRING "2.5.3.26777"
+#define FILE_VER_STRING "WI-V2.5.3.26777"
+#define LICENSE_VER_STRING "WI-V2.5.3.26777"
+#define FILE_VER_NUMBER 2, 5, 3, 26777
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26775"
+#define FB_BUILD_NO "26777"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-13 00:29:43 UTC (rev 59701)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-13 00:41:56 UTC (rev 59702)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26775
+BuildNum=26777
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-14 00:48:13
|
Revision: 59708
http://sourceforge.net/p/firebird/code/59708
Author: firebirds
Date: 2014-06-14 00:48:10 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-14 00:33:14 UTC (rev 59707)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-14 00:48:10 UTC (rev 59708)
@@ -1,3 +1,7 @@
+ 2014-06-13 10:52 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
2014-06-12 15:56 asfernandes
M src/intl/lc_narrow.cpp
M src/jrd/idx.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-14 00:33:14 UTC (rev 59707)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-14 00:48:10 UTC (rev 59708)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26777
+ FORMAL BUILD NUMBER:26778
*/
-#define PRODUCT_VER_STRING "2.5.3.26777"
-#define FILE_VER_STRING "WI-V2.5.3.26777"
-#define LICENSE_VER_STRING "WI-V2.5.3.26777"
-#define FILE_VER_NUMBER 2, 5, 3, 26777
+#define PRODUCT_VER_STRING "2.5.3.26778"
+#define FILE_VER_STRING "WI-V2.5.3.26778"
+#define LICENSE_VER_STRING "WI-V2.5.3.26778"
+#define FILE_VER_NUMBER 2, 5, 3, 26778
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26777"
+#define FB_BUILD_NO "26778"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-14 00:33:14 UTC (rev 59707)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-14 00:48:10 UTC (rev 59708)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26777
+BuildNum=26778
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-17 00:54:30
|
Revision: 59714
http://sourceforge.net/p/firebird/code/59714
Author: firebirds
Date: 2014-06-17 00:54:22 +0000 (Tue, 17 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-17 00:40:31 UTC (rev 59713)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-17 00:54:22 UTC (rev 59714)
@@ -1,3 +1,7 @@
+ 2014-06-16 13:50 alexpeshkoff
+ M src/utilities/nbackup.cpp
+Backported fix for CORE-4461: nbackup prints error messages to stdout instead stderr
+
2014-06-13 10:52 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-17 00:40:31 UTC (rev 59713)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-17 00:54:22 UTC (rev 59714)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26778
+ FORMAL BUILD NUMBER:26779
*/
-#define PRODUCT_VER_STRING "2.5.3.26778"
-#define FILE_VER_STRING "WI-V2.5.3.26778"
-#define LICENSE_VER_STRING "WI-V2.5.3.26778"
-#define FILE_VER_NUMBER 2, 5, 3, 26778
+#define PRODUCT_VER_STRING "2.5.3.26779"
+#define FILE_VER_STRING "WI-V2.5.3.26779"
+#define LICENSE_VER_STRING "WI-V2.5.3.26779"
+#define FILE_VER_NUMBER 2, 5, 3, 26779
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26778"
+#define FB_BUILD_NO "26779"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-17 00:40:31 UTC (rev 59713)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-17 00:54:22 UTC (rev 59714)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26778
+BuildNum=26779
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-18 00:58:03
|
Revision: 59726
http://sourceforge.net/p/firebird/code/59726
Author: firebirds
Date: 2014-06-18 00:57:56 +0000 (Wed, 18 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-18 00:57:56 UTC (rev 59726)
@@ -1,3 +1,7 @@
+ 2014-06-17 15:45 asfernandes
+ M src/jrd/dyn_def.epp
+Fixed CORE-4452 - Can`t create two collations with different names if autoddl =OFF.
+
2014-06-16 13:50 alexpeshkoff
M src/utilities/nbackup.cpp
Backported fix for CORE-4461: nbackup prints error messages to stdout instead stderr
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-18 00:57:56 UTC (rev 59726)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26779
+ FORMAL BUILD NUMBER:26780
*/
-#define PRODUCT_VER_STRING "2.5.3.26779"
-#define FILE_VER_STRING "WI-V2.5.3.26779"
-#define LICENSE_VER_STRING "WI-V2.5.3.26779"
-#define FILE_VER_NUMBER 2, 5, 3, 26779
+#define PRODUCT_VER_STRING "2.5.3.26780"
+#define FILE_VER_STRING "WI-V2.5.3.26780"
+#define LICENSE_VER_STRING "WI-V2.5.3.26780"
+#define FILE_VER_NUMBER 2, 5, 3, 26780
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26779"
+#define FB_BUILD_NO "26780"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-18 00:57:56 UTC (rev 59726)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26779
+BuildNum=26780
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-19 00:48:16
|
Revision: 59730
http://sourceforge.net/p/firebird/code/59730
Author: firebirds
Date: 2014-06-19 00:48:08 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-19 00:36:40 UTC (rev 59729)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-19 00:48:08 UTC (rev 59730)
@@ -1,3 +1,8 @@
+ 2014-06-18 10:47 alexpeshkoff
+ M src/jrd/common.h
+ M src/jrd/isc_sync.cpp
+AIX port
+
2014-06-17 15:45 asfernandes
M src/jrd/dyn_def.epp
Fixed CORE-4452 - Can`t create two collations with different names if autoddl =OFF.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-19 00:36:40 UTC (rev 59729)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-19 00:48:08 UTC (rev 59730)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26780
+ FORMAL BUILD NUMBER:26781
*/
-#define PRODUCT_VER_STRING "2.5.3.26780"
-#define FILE_VER_STRING "WI-V2.5.3.26780"
-#define LICENSE_VER_STRING "WI-V2.5.3.26780"
-#define FILE_VER_NUMBER 2, 5, 3, 26780
+#define PRODUCT_VER_STRING "2.5.3.26781"
+#define FILE_VER_STRING "WI-V2.5.3.26781"
+#define LICENSE_VER_STRING "WI-V2.5.3.26781"
+#define FILE_VER_NUMBER 2, 5, 3, 26781
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26780"
+#define FB_BUILD_NO "26781"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-19 00:36:40 UTC (rev 59729)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-19 00:48:08 UTC (rev 59730)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26780
+BuildNum=26781
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-06-20 00:54:56
|
Revision: 59738
http://sourceforge.net/p/firebird/code/59738
Author: firebirds
Date: 2014-06-20 00:54:48 +0000 (Fri, 20 Jun 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-06-20 00:40:07 UTC (rev 59737)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-06-20 00:54:48 UTC (rev 59738)
@@ -1,3 +1,10 @@
+ 2014-06-19 12:24 alexpeshkoff
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+ M src/common/classes/fb_tls.h
+ M src/common/classes/init.cpp
+HPUX port - fixed assertion for RISC machines with compiler missing __thread support
+
2014-06-18 10:47 alexpeshkoff
M src/jrd/common.h
M src/jrd/isc_sync.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-20 00:40:07 UTC (rev 59737)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-06-20 00:54:48 UTC (rev 59738)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26781
+ FORMAL BUILD NUMBER:26782
*/
-#define PRODUCT_VER_STRING "2.5.3.26781"
-#define FILE_VER_STRING "WI-V2.5.3.26781"
-#define LICENSE_VER_STRING "WI-V2.5.3.26781"
-#define FILE_VER_NUMBER 2, 5, 3, 26781
+#define PRODUCT_VER_STRING "2.5.3.26782"
+#define FILE_VER_STRING "WI-V2.5.3.26782"
+#define LICENSE_VER_STRING "WI-V2.5.3.26782"
+#define FILE_VER_NUMBER 2, 5, 3, 26782
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26781"
+#define FB_BUILD_NO "26782"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-20 00:40:07 UTC (rev 59737)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-06-20 00:54:48 UTC (rev 59738)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26781
+BuildNum=26782
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2014-06-30 11:46:29
|
Revision: 59796
http://sourceforge.net/p/firebird/code/59796
Author: alexpeshkoff
Date: 2014-06-30 11:46:26 +0000 (Mon, 30 Jun 2014)
Log Message:
-----------
Backported fix for CORE-4475: attempt to create lock files directory fails during cleanup
Modified Paths:
--------------
firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.gfix
firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.gfix
firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
firebird/branches/B2_5_Release/builds/posix/prefix.aix_powerpc_xlc
firebird/branches/B2_5_Release/src/jrd/gds.cpp
firebird/branches/B2_5_Release/src/jrd/isc.cpp
firebird/branches/B2_5_Release/src/jrd/isc_proto.h
firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
firebird/branches/B2_5_Release/src/jrd/svc.cpp
firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.gfix
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.gfix 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.gfix 2014-06-30 11:46:26 UTC (rev 59796)
@@ -39,7 +39,8 @@
@SET_MAKE@
-GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp common/UtilSvc.cpp
+GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp common/UtilSvc.cpp \
+ $(OS_SPECIFIC_Sources)
GFIX_Files = alice_meta.epp alice.cpp exe.cpp tdr.cpp aliceMain.cpp
GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util 2014-06-30 11:46:26 UTC (rev 59796)
@@ -90,7 +90,7 @@
$(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
-FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
+FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp $(OS_SPECIFIC_Sources)
FBGUARD_Files = guard.cpp util.cpp
FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files)) $(FBGUARD_Other_Sources)
FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sources)))) $(FBCLASSES_ClientObjects)
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.gfix
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.gfix 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.gfix 2014-06-30 11:46:26 UTC (rev 59796)
@@ -42,7 +42,8 @@
GFIX_Files = alice_meta.epp \
alice.cpp exe.cpp tdr.cpp aliceMain.cpp
-GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp common/UtilSvc.cpp
+GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp common/UtilSvc.cpp \
+ $(OS_SPECIFIC_Sources)
GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources))))
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util 2014-06-30 11:46:26 UTC (rev 59796)
@@ -103,7 +103,7 @@
$(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
-FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
+FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp $(OS_SPECIFIC_Sources)
FBGUARD_Files = guard.cpp util.cpp
FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files)) $(FBGUARD_Other_Sources)
FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sources)))) $(FBCLASSES_ClientObjects)
Modified: firebird/branches/B2_5_Release/builds/posix/prefix.aix_powerpc_xlc
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/prefix.aix_powerpc_xlc 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/builds/posix/prefix.aix_powerpc_xlc 2014-06-30 11:46:26 UTC (rev 59796)
@@ -118,7 +118,7 @@
common/classes/MsgPrint.cpp common/classes/SafeArg.cpp \
common/classes/BaseStream.cpp common/classes/fb_string.cpp \
common/classes/TempFile.cpp \
- jrd/gds.cpp jrd/isc.cpp \
+ jrd/gds.cpp jrd/isc.cpp $(OS_SPECIFIC_Sources)\
jrd/os/posix/path_utils.cpp jrd/os/posix/os_utils.cpp \
jrd/os/posix/config_root.cpp jrd/os/posix/fbsyslog.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/gds.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/gds.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/gds.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -202,8 +202,6 @@
static void sanitize(Firebird::string& locale);
-static void safe_concat_path(TEXT* destbuf, const TEXT* srcbuf);
-
// New functions that try to be safe.
static SLONG safe_interpret(char* const s, const size_t bufsize,
const ISC_STATUS** const vector, bool legacy = false);
@@ -1736,7 +1734,7 @@
GDS_init_prefix();
strcpy(resultString, fb_prefix); // safe - no BO
- safe_concat_path(resultString, file);
+ iscSafeConcatPath(resultString, file);
}
@@ -1757,12 +1755,7 @@
GDS_init_prefix();
strcpy(string, fb_prefix_lock); // safe - no BO
-
- // if someone wants to know prefix for lock files,
- // sooner of all he wants that directory to exist
- os_utils::createLockDirectory(string);
-
- safe_concat_path(string, root);
+ iscSafeConcatPath(string, root);
}
@@ -1786,7 +1779,7 @@
GDS_init_prefix();
strcpy(string, fb_prefix_msg); // safe - no BO
- safe_concat_path(string, root);
+ iscSafeConcatPath(string, root);
}
@@ -3555,44 +3548,7 @@
}
}
-static void safe_concat_path(TEXT *resultString, const TEXT *appendString)
-{
-/**************************************
- *
- * s a f e _ c o n c a t _ p a t h
- *
- **************************************
- *
- * Functional description
- * Safely appends appendString to resultString using paths rules.
- * resultString must be at most MAXPATHLEN size.
- * Thread/signal safe code.
- *
- **************************************/
- size_t len = strlen(resultString);
- fb_assert(len > 0);
- if (resultString[len - 1] != PathUtils::dir_sep && len < MAXPATHLEN - 1)
- {
- resultString[len++] = PathUtils::dir_sep;
- resultString[len] = 0;
- }
-
- size_t alen = strlen(appendString);
- if (len + alen > MAXPATHLEN - 1)
- {
- alen = MAXPATHLEN - 1 - len;
- }
-
- fb_assert(len < MAXPATHLEN);
- fb_assert(alen < MAXPATHLEN);
- fb_assert(len + alen < MAXPATHLEN);
-
- memcpy(&resultString[len], appendString, alen);
- resultString[len + alen] = 0;
-}
-
-
void FB_EXPORTED gds__default_printer(void* /*arg*/, SSHORT offset, const TEXT* line)
{
printf("%4d %s\n", offset, line);
Modified: firebird/branches/B2_5_Release/src/jrd/isc.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/isc.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -48,6 +48,8 @@
#include "../jrd/gds_proto.h"
#include "../jrd/isc_proto.h"
#include "../jrd/jrd_proto.h"
+#include "../jrd/os/os_utils.h"
+#include "../jrd/os/path_utils.h"
#include "../common/classes/init.h"
@@ -632,3 +634,61 @@
iscLogStatus(text, s);
}
+
+void iscPrefixLock(TEXT* string, const TEXT* root, bool createLockDir)
+{
+/**************************************
+ *
+ * i s c P r e f i x L o c k
+ *
+ **************************************
+ *
+ * Functional description
+ * Find appropriate Firebird lock file prefix.
+ *
+ **************************************/
+ gds__prefix_lock(string, "");
+
+ if (createLockDir)
+ os_utils::createLockDirectory(string);
+
+ iscSafeConcatPath(string, root);
+}
+
+
+void iscSafeConcatPath(TEXT *resultString, const TEXT *appendString)
+{
+/**************************************
+ *
+ * i s c S a f e C o n c a t P a t h
+ *
+ **************************************
+ *
+ * Functional description
+ * Safely appends appendString to resultString using paths rules.
+ * resultString must be at most MAXPATHLEN size.
+ * Thread/signal safe code.
+ *
+ **************************************/
+ size_t len = strlen(resultString);
+ fb_assert(len > 0);
+
+ if (resultString[len - 1] != PathUtils::dir_sep && len < MAXPATHLEN - 1)
+ {
+ resultString[len++] = PathUtils::dir_sep;
+ resultString[len] = 0;
+ }
+
+ size_t alen = strlen(appendString);
+ if (len + alen > MAXPATHLEN - 1)
+ {
+ alen = MAXPATHLEN - 1 - len;
+ }
+
+ fb_assert(len < MAXPATHLEN);
+ fb_assert(alen < MAXPATHLEN);
+ fb_assert(len + alen < MAXPATHLEN);
+
+ memcpy(&resultString[len], appendString, alen);
+ resultString[len + alen] = 0;
+}
Modified: firebird/branches/B2_5_Release/src/jrd/isc_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_proto.h 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/isc_proto.h 2014-06-30 11:46:26 UTC (rev 59796)
@@ -44,4 +44,7 @@
struct _SECURITY_ATTRIBUTES* ISC_get_security_desc();
#endif
+void iscPrefixLock(TEXT* string, const TEXT* root, bool createLockDir);
+void iscSafeConcatPath(TEXT *resultString, const TEXT *appendString);
+
#endif // JRD_ISC_PROTO_H
Modified: firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -2293,7 +2293,7 @@
{
#ifndef WIN_NT
TEXT expanded_filename[MAXPATHLEN];
- gds__prefix_lock(expanded_filename, filename);
+ iscPrefixLock(expanded_filename, filename, false);
// We can't do much (specially in dtors) when it fails
// therefore do not check for errors - at least it's just /tmp.
@@ -2329,7 +2329,7 @@
**************************************/
TEXT expanded_filename[MAXPATHLEN];
- gds__prefix_lock(expanded_filename, filename);
+ iscPrefixLock(expanded_filename, filename, true);
/* make the complete filename for the init file this file is to be used as a
master lock to eliminate possible race conditions with just a single file
@@ -2337,7 +2337,7 @@
lock to a LCK_SHARED lock is not atomic*/
TEXT init_filename[MAXPATHLEN];
- gds__prefix_lock(init_filename, INIT_FILE);
+ iscPrefixLock(init_filename, INIT_FILE, true);
const bool trunc_flag = (length != 0);
@@ -2370,7 +2370,7 @@
if (fdSem < 0)
{
TEXT sem_filename[MAXPATHLEN];
- gds__prefix_lock(sem_filename, SEM_FILE);
+ iscPrefixLock(sem_filename, SEM_FILE, true);
const int f = openFile(sem_filename);
if (f == -1)
{
@@ -2551,7 +2551,7 @@
int retry_count = 0;
TEXT expanded_filename[MAXPATHLEN];
- gds__prefix_lock(expanded_filename, filename);
+ iscPrefixLock(expanded_filename, filename, true);
const bool trunc_flag = (length != 0);
bool init_flag = false;
@@ -4189,7 +4189,7 @@
CloseHandle(shmem_data->sh_mem_hdr_object);
TEXT expanded_filename[MAXPATHLEN];
- gds__prefix_lock(expanded_filename, shmem_data->sh_mem_name);
+ iscPrefixLock(expanded_filename, shmem_data->sh_mem_name, false);
// Delete file only if it is not used by anyone else
HANDLE hFile = CreateFile(expanded_filename,
Modified: firebird/branches/B2_5_Release/src/jrd/svc.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/svc.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/svc.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -1329,7 +1329,7 @@
gds__prefix(auxBuf, "");
break;
case isc_info_svc_get_env_lock:
- gds__prefix_lock(auxBuf, "");
+ iscPrefixLock(auxBuf, "", false);
break;
case isc_info_svc_get_env_msg:
gds__prefix_msg(auxBuf, "");
@@ -1813,7 +1813,7 @@
gds__prefix(PathBuffer, "");
break;
case isc_info_svc_get_env_lock:
- gds__prefix_lock(PathBuffer, "");
+ iscPrefixLock(PathBuffer, "", false);
break;
case isc_info_svc_get_env_msg:
gds__prefix_msg(PathBuffer, "");
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -236,7 +236,7 @@
fb_assert(m_base->cnt_uses == 0);
char dir[MAXPATHLEN];
- gds__prefix_lock(dir, "");
+ iscPrefixLock(dir, "", true);
PathName filename = TempFile::create("fb_trace_", dir);
filename.copyTo(cfg_file_name, sizeof(m_base->cfg_file_name));
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp 2014-06-30 11:45:53 UTC (rev 59795)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp 2014-06-30 11:46:26 UTC (rev 59796)
@@ -70,7 +70,7 @@
}
char dir[MAXPATHLEN];
- gds__prefix_lock(dir, "");
+ iscPrefixLock(dir, "", true);
PathUtils::concatPath(m_baseFileName, dir, fileName);
TraceLogGuard guard(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-01 00:31:23
|
Revision: 59805
http://sourceforge.net/p/firebird/code/59805
Author: firebirds
Date: 2014-07-01 00:31:14 +0000 (Tue, 01 Jul 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-07-01 00:18:05 UTC (rev 59804)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-07-01 00:31:14 UTC (rev 59805)
@@ -1,3 +1,18 @@
+ 2014-06-30 11:46 alexpeshkoff
+ M builds/posix/Makefile.in.client.gfix
+ M builds/posix/Makefile.in.client.util
+ M builds/posix/Makefile.in.embed.gfix
+ M builds/posix/Makefile.in.embed.util
+ M builds/posix/prefix.aix_powerpc_xlc
+ M src/jrd/gds.cpp
+ M src/jrd/isc.cpp
+ M src/jrd/isc_proto.h
+ M src/jrd/isc_sync.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceLog.cpp
+Backported fix for CORE-4475: attempt to create lock files directory fails during cleanup
+
2014-06-19 12:24 alexpeshkoff
M src/common/classes/alloc.cpp
M src/common/classes/alloc.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-01 00:18:05 UTC (rev 59804)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-01 00:31:14 UTC (rev 59805)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26782
+ FORMAL BUILD NUMBER:26783
*/
-#define PRODUCT_VER_STRING "2.5.3.26782"
-#define FILE_VER_STRING "WI-V2.5.3.26782"
-#define LICENSE_VER_STRING "WI-V2.5.3.26782"
-#define FILE_VER_NUMBER 2, 5, 3, 26782
+#define PRODUCT_VER_STRING "2.5.3.26783"
+#define FILE_VER_STRING "WI-V2.5.3.26783"
+#define LICENSE_VER_STRING "WI-V2.5.3.26783"
+#define FILE_VER_NUMBER 2, 5, 3, 26783
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26782"
+#define FB_BUILD_NO "26783"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-01 00:18:05 UTC (rev 59804)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-01 00:31:14 UTC (rev 59805)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26782
+BuildNum=26783
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2014-07-03 07:48:26
|
Revision: 59815
http://sourceforge.net/p/firebird/code/59815
Author: alexpeshkoff
Date: 2014-07-03 07:48:17 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
Fixed regression in 2.5.3 - fails to build on relatively old distros
Modified Paths:
--------------
firebird/branches/B2_5_Release/configure.in
firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp
Modified: firebird/branches/B2_5_Release/configure.in
===================================================================
--- firebird/branches/B2_5_Release/configure.in 2014-07-03 00:28:01 UTC (rev 59814)
+++ firebird/branches/B2_5_Release/configure.in 2014-07-03 07:48:17 UTC (rev 59815)
@@ -839,6 +839,9 @@
AC_SEARCH_LIBS(clock_gettime, rt)
AC_CHECK_FUNCS(clock_gettime)
+dnl Check for fallocate() system call
+AC_CHECK_FUNCS(fallocate)
+
dnl Semaphores
if test "$ac_cv_header_semaphore_h" = "yes"; then
AC_SEARCH_LIBS(sem_init, rt)
Modified: firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp 2014-07-03 00:28:01 UTC (rev 59814)
+++ firebird/branches/B2_5_Release/src/jrd/os/posix/unix.cpp 2014-07-03 07:48:17 UTC (rev 59815)
@@ -297,7 +297,7 @@
*
**************************************/
-#ifdef HAVE_LINUX_FALLOC_H
+#if defined(HAVE_LINUX_FALLOC_H) && defined(HAVE_FALLOCATE)
ULONG leftPages = extPages;
for (jrd_file* file = main_file; file && leftPages; file = file->fil_next)
{
@@ -344,7 +344,7 @@
}
#else
main_file->fil_flags |= FIL_no_fast_extend;
-#endif // HAVE_LINUX_FALLOC_H
+#endif // fallocate present
// not implemented
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-04 00:50:29
|
Revision: 59821
http://sourceforge.net/p/firebird/code/59821
Author: firebirds
Date: 2014-07-04 00:50:22 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-07-04 00:35:34 UTC (rev 59820)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-07-04 00:50:22 UTC (rev 59821)
@@ -1,3 +1,8 @@
+ 2014-07-03 07:48 alexpeshkoff
+ M configure.in
+ M src/jrd/os/posix/unix.cpp
+Fixed regression in 2.5.3 - fails to build on relatively old distros
+
2014-06-30 11:46 alexpeshkoff
M builds/posix/Makefile.in.client.gfix
M builds/posix/Makefile.in.client.util
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-04 00:35:34 UTC (rev 59820)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-04 00:50:22 UTC (rev 59821)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26783
+ FORMAL BUILD NUMBER:26784
*/
-#define PRODUCT_VER_STRING "2.5.3.26783"
-#define FILE_VER_STRING "WI-V2.5.3.26783"
-#define LICENSE_VER_STRING "WI-V2.5.3.26783"
-#define FILE_VER_NUMBER 2, 5, 3, 26783
+#define PRODUCT_VER_STRING "2.5.3.26784"
+#define FILE_VER_STRING "WI-V2.5.3.26784"
+#define LICENSE_VER_STRING "WI-V2.5.3.26784"
+#define FILE_VER_NUMBER 2, 5, 3, 26784
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26783"
+#define FB_BUILD_NO "26784"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-04 00:35:34 UTC (rev 59820)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-04 00:50:22 UTC (rev 59821)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26783
+BuildNum=26784
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-08 00:52:58
|
Revision: 59839
http://sourceforge.net/p/firebird/code/59839
Author: firebirds
Date: 2014-07-08 00:52:54 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-07-07 06:57:04 UTC (rev 59838)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-07-08 00:52:54 UTC (rev 59839)
@@ -1,3 +1,36 @@
+ 2014-07-07 06:57 hvlad
+ M builds/win32/msvc10/gdef.vcxproj
+ M builds/win32/msvc10/gdef.vcxproj.filters
+ M builds/win32/msvc10/gfix.vcxproj
+ M builds/win32/msvc10/gfix.vcxproj.filters
+ M builds/win32/msvc10/gsec.vcxproj
+ M builds/win32/msvc10/gsec.vcxproj.filters
+ M builds/win32/msvc10/gstat.vcxproj
+ M builds/win32/msvc10/gstat.vcxproj.filters
+ M builds/win32/msvc10/nbackup.vcxproj
+ M builds/win32/msvc10/nbackup.vcxproj.filters
+ M builds/win32/msvc10/qli.vcxproj
+ M builds/win32/msvc10/qli.vcxproj.filters
+Fixed MSVC10 build
+
+ 2014-07-07 06:45 hvlad
+ M builds/win32/msvc9/gdef.vcproj
+ M builds/win32/msvc9/gfix.vcproj
+ M builds/win32/msvc9/gsec.vcproj
+ M builds/win32/msvc9/gstat.vcproj
+ M builds/win32/msvc9/nbackup.vcproj
+ M builds/win32/msvc9/qli.vcproj
+Fixed MSVC9 build
+
+ 2014-07-07 06:41 hvlad
+ M builds/win32/msvc8/gdef.vcproj
+ M builds/win32/msvc8/gfix.vcproj
+ M builds/win32/msvc8/gsec.vcproj
+ M builds/win32/msvc8/gstat.vcproj
+ M builds/win32/msvc8/nbackup.vcproj
+ M builds/win32/msvc8/qli.vcproj
+Fixed MSVC8 build
+
2014-07-03 07:48 alexpeshkoff
M configure.in
M src/jrd/os/posix/unix.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-07 06:57:04 UTC (rev 59838)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-08 00:52:54 UTC (rev 59839)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26784
+ FORMAL BUILD NUMBER:26787
*/
-#define PRODUCT_VER_STRING "2.5.3.26784"
-#define FILE_VER_STRING "WI-V2.5.3.26784"
-#define LICENSE_VER_STRING "WI-V2.5.3.26784"
-#define FILE_VER_NUMBER 2, 5, 3, 26784
+#define PRODUCT_VER_STRING "2.5.3.26787"
+#define FILE_VER_STRING "WI-V2.5.3.26787"
+#define LICENSE_VER_STRING "WI-V2.5.3.26787"
+#define FILE_VER_NUMBER 2, 5, 3, 26787
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26784"
+#define FB_BUILD_NO "26787"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-07 06:57:04 UTC (rev 59838)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-08 00:52:54 UTC (rev 59839)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26784
+BuildNum=26787
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-12 00:42:50
|
Revision: 59859
http://sourceforge.net/p/firebird/code/59859
Author: firebirds
Date: 2014-07-12 00:42:42 +0000 (Sat, 12 Jul 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-07-11 20:08:11 UTC (rev 59858)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-07-12 00:42:42 UTC (rev 59859)
@@ -1,3 +1,9 @@
+ 2014-07-11 11:31 dimitr
+ M builds/win32/msvc10/gpre_embed.vcxproj
+ M builds/win32/msvc8/gpre_embed.vcproj
+ M builds/win32/msvc9/gpre_embed.vcproj
+This time really fixed the Windows builds.
+
2014-07-07 06:57 hvlad
M builds/win32/msvc10/gdef.vcxproj
M builds/win32/msvc10/gdef.vcxproj.filters
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-11 20:08:11 UTC (rev 59858)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-12 00:42:42 UTC (rev 59859)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26787
+ FORMAL BUILD NUMBER:26788
*/
-#define PRODUCT_VER_STRING "2.5.3.26787"
-#define FILE_VER_STRING "WI-V2.5.3.26787"
-#define LICENSE_VER_STRING "WI-V2.5.3.26787"
-#define FILE_VER_NUMBER 2, 5, 3, 26787
+#define PRODUCT_VER_STRING "2.5.3.26788"
+#define FILE_VER_STRING "WI-V2.5.3.26788"
+#define LICENSE_VER_STRING "WI-V2.5.3.26788"
+#define FILE_VER_NUMBER 2, 5, 3, 26788
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26787"
+#define FB_BUILD_NO "26788"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-11 20:08:11 UTC (rev 59858)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-12 00:42:42 UTC (rev 59859)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26787
+BuildNum=26788
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-07-30 00:31:30
|
Revision: 59931
http://sourceforge.net/p/firebird/code/59931
Author: firebirds
Date: 2014-07-30 00:31:28 +0000 (Wed, 30 Jul 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-07-30 00:21:11 UTC (rev 59930)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-07-30 00:31:28 UTC (rev 59931)
@@ -1,3 +1,7 @@
+ 2014-07-29 05:35 dimitr
+ M src/lock/lock.cpp
+Trivial fix for CORE-4500: Firebird crashes after unsuccessful remapping of the lock table's shared memory.
+
2014-07-11 11:31 dimitr
M builds/win32/msvc10/gpre_embed.vcxproj
M builds/win32/msvc8/gpre_embed.vcproj
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-30 00:21:11 UTC (rev 59930)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-07-30 00:31:28 UTC (rev 59931)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26788
+ FORMAL BUILD NUMBER:26789
*/
-#define PRODUCT_VER_STRING "2.5.3.26788"
-#define FILE_VER_STRING "WI-V2.5.3.26788"
-#define LICENSE_VER_STRING "WI-V2.5.3.26788"
-#define FILE_VER_NUMBER 2, 5, 3, 26788
+#define PRODUCT_VER_STRING "2.5.3.26789"
+#define FILE_VER_STRING "WI-V2.5.3.26789"
+#define LICENSE_VER_STRING "WI-V2.5.3.26789"
+#define FILE_VER_NUMBER 2, 5, 3, 26789
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26788"
+#define FB_BUILD_NO "26789"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-30 00:21:11 UTC (rev 59930)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-07-30 00:31:28 UTC (rev 59931)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26788
+BuildNum=26789
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-08-13 02:30:42
|
Revision: 59975
http://sourceforge.net/p/firebird/code/59975
Author: firebirds
Date: 2014-08-13 02:30:33 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-08-13 01:16:01 UTC (rev 59974)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-08-13 02:30:33 UTC (rev 59975)
@@ -1,3 +1,7 @@
+ 2014-08-12 12:59 hvlad
+ M src/jrd/DatabaseSnapshot.cpp
+Backport: avoid info duplication when statements in call stack attached to different transactions (for example: monitoring snapshot is created in autonomous transaction)
+
2014-07-29 05:35 dimitr
M src/lock/lock.cpp
Trivial fix for CORE-4500: Firebird crashes after unsuccessful remapping of the lock table's shared memory.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-08-13 01:16:01 UTC (rev 59974)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-08-13 02:30:33 UTC (rev 59975)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26789
+ FORMAL BUILD NUMBER:26790
*/
-#define PRODUCT_VER_STRING "2.5.3.26789"
-#define FILE_VER_STRING "WI-V2.5.3.26789"
-#define LICENSE_VER_STRING "WI-V2.5.3.26789"
-#define FILE_VER_NUMBER 2, 5, 3, 26789
+#define PRODUCT_VER_STRING "2.5.3.26790"
+#define FILE_VER_STRING "WI-V2.5.3.26790"
+#define LICENSE_VER_STRING "WI-V2.5.3.26790"
+#define FILE_VER_NUMBER 2, 5, 3, 26790
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26789"
+#define FB_BUILD_NO "26790"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-08-13 01:16:01 UTC (rev 59974)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-08-13 02:30:33 UTC (rev 59975)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26789
+BuildNum=26790
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-08-26 02:43:37
|
Revision: 59999
http://sourceforge.net/p/firebird/code/59999
Author: firebirds
Date: 2014-08-26 02:43:35 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2014-08-26 01:27:46 UTC (rev 59998)
+++ firebird/branches/B2_5_Release/ChangeLog 2014-08-26 02:43:35 UTC (rev 59999)
@@ -1,3 +1,7 @@
+ 2014-08-25 13:40 dimitr
+ M src/jrd/Optimizer.cpp
+Fixed CORE-4530: DB_KEY based join of two tables may be ineffective.
+
2014-08-12 12:59 hvlad
M src/jrd/DatabaseSnapshot.cpp
Backport: avoid info duplication when statements in call stack attached to different transactions (for example: monitoring snapshot is created in autonomous transaction)
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-08-26 01:27:46 UTC (rev 59998)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-08-26 02:43:35 UTC (rev 59999)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26790
+ FORMAL BUILD NUMBER:26791
*/
-#define PRODUCT_VER_STRING "2.5.3.26790"
-#define FILE_VER_STRING "WI-V2.5.3.26790"
-#define LICENSE_VER_STRING "WI-V2.5.3.26790"
-#define FILE_VER_NUMBER 2, 5, 3, 26790
+#define PRODUCT_VER_STRING "2.5.3.26791"
+#define FILE_VER_STRING "WI-V2.5.3.26791"
+#define LICENSE_VER_STRING "WI-V2.5.3.26791"
+#define FILE_VER_NUMBER 2, 5, 3, 26791
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "3"
-#define FB_BUILD_NO "26790"
+#define FB_BUILD_NO "26791"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-08-26 01:27:46 UTC (rev 59998)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-08-26 02:43:35 UTC (rev 59999)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=3
-BuildNum=26790
+BuildNum=26791
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X