diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2006-09-18 15:20:04 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2006-09-18 15:20:04 +0000 |
| commit | 3eeac24355d0de977cf350af1bdfa888aebc282c (patch) | |
| tree | 5d537ad4b12e17d2a074d9e1d207eb471058b506 /databases/firebird2-server/files/patch-src%lock%lock.cpp | |
| parent | Update to 4.0.2091. This version finally works again on FreeBSD \o/ (diff) | |
Add Firebird 2.0.0 (RC4)
Notes
Notes:
svn path=/head/; revision=173329
Diffstat (limited to 'databases/firebird2-server/files/patch-src%lock%lock.cpp')
| -rw-r--r-- | databases/firebird2-server/files/patch-src%lock%lock.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/databases/firebird2-server/files/patch-src%lock%lock.cpp b/databases/firebird2-server/files/patch-src%lock%lock.cpp index 7f550183e379..279324733739 100644 --- a/databases/firebird2-server/files/patch-src%lock%lock.cpp +++ b/databases/firebird2-server/files/patch-src%lock%lock.cpp @@ -1,15 +1,16 @@ ---- src/lock/lock.cpp.orig Mon Mar 29 08:35:49 2004 -+++ src/lock/lock.cpp Wed Jul 27 14:01:51 2005 -@@ -2800,7 +2800,11 @@ +--- src/lock/lock.cpp.orig Fri Feb 3 16:13:23 2006 ++++ src/lock/lock.cpp Wed Aug 16 12:41:32 2006 +@@ -2708,7 +2708,12 @@ #ifdef DEBUG_MANAGER gds__prefix(string, DEBUG_MANAGER); #else - gds__prefix(string, LOCK_MANAGER); + if (! getenv("FIREBIRD")) { -+ strlcpy(string, FB_EXEC_PREFIX "/s" LOCK_MANAGER, MAXPATHLEN); -+ }else { ++ strlcpy(string, FB_EXEC_PREFIX "/", MAXPATHLEN); ++ strlcat(string, LOCK_MANAGER, MAXPATHLEN); ++ } else { + gds__prefix(string, LOCK_MANAGER); + } #endif if (statistics(string, &stat_buf) == -1) { - sprintf (errorstring, "can't start lock manager: %s", string); + // bug() fills the vector with this address, it must be static. |