summaryrefslogtreecommitdiff
path: root/databases/firebird2-server/files/patch-src%lock%lock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'databases/firebird2-server/files/patch-src%lock%lock.cpp')
-rw-r--r--databases/firebird2-server/files/patch-src%lock%lock.cpp13
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.