| 
     
      
      
      From: <asf...@us...> - 2010-06-05 02:41:21
       
   | 
Revision: 51209
          http://firebird.svn.sourceforge.net/firebird/?rev=51209&view=rev
Author:   asfernandes
Date:     2010-06-05 02:41:14 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Port CVS changes (includes CORE-2993, CORE-3010, CORE-3011, CORE-3015, CORE-3016, CORE-3017 and CORE-3021)
Modified Paths:
--------------
    firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
    firebird/branches/B2_5_Release/doc/WhatsNew
    firebird/branches/B2_5_Release/src/common/classes/alloc.cpp
    firebird/branches/B2_5_Release/src/jrd/Database.h
    firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/jrd/cch.cpp
    firebird/branches/B2_5_Release/src/jrd/isc.h
    firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h
    firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
    firebird/branches/B2_5_Release/src/jrd/isc_version.h
    firebird/branches/B2_5_Release/src/jrd/jrd.cpp
    firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in	2010-06-05 02:41:14 UTC (rev 51209)
@@ -6,9 +6,6 @@
 # on system startup and shutdown to start the background
 # Firebird database server daemon
 
-# Source function library.
-. /etc/init.d/functions.sh
-
 # To run more instances of firebird:
 #   Copy @prefix@ somewhere
 #   Copy this script under a new name
@@ -49,19 +46,19 @@
 	GUARDIAN=@FB_SBINDIR@/fbguard
 fi
 
-start(){
+start() {
 	ebegin "Starting $FULLNAME"
 	start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $GUARDIAN -- $FB_OPTS
 	eend $?
 }
 
-stop(){
+stop() {
 	ebegin "Stopping $FULLNAME"
 	start-stop-daemon --stop --pidfile $pidfile --oknodo
 	eend $?
 }
 
-restart(){
+restart() {
 	svc_stop
 	sleep 1
 	svc_start
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-05 02:41:14 UTC (rev 51209)
@@ -2,6 +2,39 @@
   * v2.5 Release Candidate 3
   **************************
 
+    * Bugfix CORE-3021
+		Segfault in DEV_BUILD
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3017
+		Files left at Firebird's lock directory 
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3016
+		On disconnect it is possible to see "Fatal lock manager error: invalid lock id (0), errno: 0" 
+		in firebird.log
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-3015
+		Various "Cannot initialize the shared memory region" errors
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-3011
+		Server hangs or crashes while monitoring connections repeatedly attaching and detaching
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix CORE-3010
+		First connect to any database shows MON$MEMORY_USED = 4Gb 
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-3006
         /tmp/firebird and files in it may get 'root' (i.e. GID == 0) group
       Contributor(s):
Modified: firebird/branches/B2_5_Release/src/common/classes/alloc.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/common/classes/alloc.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/common/classes/alloc.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -1371,6 +1371,9 @@
 		MemoryExtent* extent = pool->extents_parent;
 		while (extent) {
 			MemoryExtent* next = extent->mxt_next;
+
+			MemoryBlock* blk = ptrToBlock(extent);
+			parent->increment_usage(blk->mbk_small.mbk_length);
 			parent->deallocate(extent);
 			extent = next;
 		}
@@ -1731,6 +1734,7 @@
 	}
 	else
 	{
+		parent->increment_usage(ext_size);
 		parent->deallocate(extent);
 	}
 }
Modified: firebird/branches/B2_5_Release/src/jrd/Database.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/Database.h	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/Database.h	2010-06-05 02:41:14 UTC (rev 51209)
@@ -107,6 +107,7 @@
 const ULONG DBB_gc_background		= 0x40000L;	// background garbage collection by gc_thread
 const ULONG DBB_no_fs_cache			= 0x80000L;	// Not using file system cache
 const ULONG DBB_destroying			= 0x100000L;	// database destructor is called
+const ULONG DBB_monitor_locking		= 0x200000L;	// monitoring lock is being acquired
 
 //
 // dbb_ast_flags
Modified: firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -101,6 +101,9 @@
 	{ // scope
 		DumpGuard guard(this);
 		cleanup();
+
+		if (base->used == sizeof(Header))
+			ISC_remove_map_file(&handle);
 	}
 
 #ifdef WIN_NT
@@ -387,8 +390,13 @@
 				}
 			}
 
-			// Release the lock and mark dbb as requesting a new one
-			LCK_release(tdbb, lock);
+			// Release the lock, if feasible
+			if (!(dbb->dbb_flags & DBB_monitor_locking))
+			{
+				LCK_release(tdbb, lock);
+			}
+
+			// Mark dbb as requesting a new lock
 			dbb->dbb_ast_flags |= DBB_monitor_off;
 		}
 	}
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-06-05 02:41:14 UTC (rev 51209)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26024
+  FORMAL BUILD NUMBER:26038
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26024"
-#define FILE_VER_STRING "WI-V2.5.0.26024"
-#define LICENSE_VER_STRING "WI-V2.5.0.26024"
-#define FILE_VER_NUMBER 2, 5, 0, 26024
+#define PRODUCT_VER_STRING "2.5.0.26038"
+#define FILE_VER_STRING "WI-V2.5.0.26038"
+#define LICENSE_VER_STRING "WI-V2.5.0.26038"
+#define FILE_VER_NUMBER 2, 5, 0, 26038
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26024"
+#define FB_BUILD_NO "26038"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/jrd/cch.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/cch.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/cch.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -374,6 +374,9 @@
 	{
 		Database::SyncGuard dsGuard(dbb, true);
 
+		if (dbb->dbb_flags & DBB_not_in_use)
+			return 0;
+
 		Lock* const lock = dbb->dbb_lock;
 
 		// Since this routine will be called asynchronously,
Modified: firebird/branches/B2_5_Release/src/jrd/isc.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc.h	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/isc.h	2010-06-05 02:41:14 UTC (rev 51209)
@@ -38,11 +38,19 @@
 #endif
 
 #ifdef LINUX
+
 // This hack fixes CORE-2896 - embedded connections fail on linux.
 // Looks like a lot of linux kernels are buggy when working with PRIO_INHERIT mutexes.
 #undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
+
+#if (SIZEOF_VOID_P < 8) && defined(DEV_BUILD)
+// This hack fixes CORE-3021 - segfault in DEV_BUILD.
+// Release build does not cause visible problems.
+#undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP
 #endif
 
+#endif //LINUX
+
 #ifdef UNIX
 
 #if defined(USE_POSIX_THREADS)
@@ -105,6 +113,7 @@
 	UCHAR *sh_mem_address;
 	ULONG sh_mem_length_mapped;
 	SLONG sh_mem_handle;
+	TEXT	sh_mem_name[MAXPATHLEN];
 };
 
 #endif // UNIX
Modified: firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h	2010-06-05 02:41:14 UTC (rev 51209)
@@ -72,5 +72,6 @@
 void	ISC_unmap_file(ISC_STATUS*, struct sh_mem*);
 
 void	ISC_remove_map_file(const TEXT* filename);
+void	ISC_remove_map_file(const struct sh_mem*);
 
 #endif // JRD_ISC_S_PROTO_H
Modified: firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -1679,14 +1679,21 @@
 
 void ISC_remove_map_file(const TEXT* filename)
 {
+#ifndef WIN_NT
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, filename);
 
 	// We can't do much (specially in dtors) when it fails
 	// therefore do not check for errors - at least it's just /tmp.
 	unlink(expanded_filename);
+#endif // WIN_NT
 }
 
+void ISC_remove_map_file(const struct sh_mem* shmem_data)
+{
+	ISC_remove_map_file(shmem_data->sh_mem_name);
+}
+
 #ifdef UNIX
 
 UCHAR* ISC_map_file(ISC_STATUS* status_vector,
@@ -1822,6 +1829,7 @@
 	shmem_data->sh_mem_address = address;
 	shmem_data->sh_mem_length_mapped = length;
 	shmem_data->sh_mem_handle = fd;
+	strcpy(shmem_data->sh_mem_name, filename);
 
 #ifdef USE_SYS5SEMAPHORE
 	// register mapped file
@@ -1924,20 +1932,23 @@
  *	routine (if given) or punt (leaving the file unmapped).
  *
  **************************************/
-	HANDLE file_handle, event_handle;
+	HANDLE file_handle;
+	HANDLE event_handle = 0;
 	int retry_count = 0;
 
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, filename);
 
 	const bool trunc_flag = (length != 0);
+	bool init_flag = false;
 
 /* retry to attach to mmapped file if the process initializing
  * dies during initialization.
  */
 
   retry:
-	retry_count++;
+	if (retry_count++ > 0) 
+		THREAD_SLEEP(10);
 
 	file_handle = CreateFile(expanded_filename,
 							 GENERIC_READ | GENERIC_WRITE,
@@ -1946,15 +1957,19 @@
 							 OPEN_ALWAYS,
 							 FILE_ATTRIBUTE_NORMAL,
 							 NULL);
+	DWORD err = GetLastError();
 	if (file_handle == INVALID_HANDLE_VALUE)
 	{
-		error(status_vector, "CreateFile", GetLastError());
+		if (err == ERROR_SHARING_VIOLATION)
+			goto retry;
+
+		error(status_vector, "CreateFile", err);
 		return NULL;
 	}
 
 	// Check if file already exists
 
-	const bool file_exists = (GetLastError() == ERROR_ALREADY_EXISTS);
+	const bool file_exists = (err == ERROR_ALREADY_EXISTS);
 
 	// Create an event that can be used to determine if someone has already
 	// initialized shared memory.
@@ -1967,22 +1982,25 @@
 		return NULL;
 	}
 
-	event_handle = CreateEvent(ISC_get_security_desc(), TRUE, FALSE, object_name);
-	if (!event_handle)
+	if (!init_flag)
 	{
-		error(status_vector, "CreateEvent", GetLastError());
-		CloseHandle(file_handle);
-		return NULL;
-	}
+		event_handle = CreateEvent(ISC_get_security_desc(), TRUE, FALSE, object_name);
+		if (!event_handle)
+		{
+			error(status_vector, "CreateEvent", GetLastError());
+			CloseHandle(file_handle);
+			return NULL;
+		}
 
-	const bool init_flag = (GetLastError() != ERROR_ALREADY_EXISTS);
+		init_flag = (GetLastError() != ERROR_ALREADY_EXISTS);
 
-	if (init_flag && !init_routine)
-	{
-		CloseHandle(event_handle);
-		CloseHandle(file_handle);
-		Arg::Gds(isc_unavailable).copyTo(status_vector);
-		return NULL;
+		if (init_flag && !init_routine)
+		{
+			CloseHandle(event_handle);
+			CloseHandle(file_handle);
+			Arg::Gds(isc_unavailable).copyTo(status_vector);
+			return NULL;
+		}
 	}
 
 	if (length == 0)
@@ -2022,7 +2040,7 @@
 			CloseHandle(event_handle);
 			if (retry_count > 10)
 			{
-				error(status_vector, "WaitForSingleObject", GetLastError());
+				error(status_vector, "WaitForSingleObject", 0);
 				return NULL;
 			}
 			goto retry;
@@ -2046,6 +2064,14 @@
 	{
 		const DWORD err = GetLastError();
 
+		if ((err == ERROR_SHARING_VIOLATION) || (err == ERROR_FILE_NOT_FOUND && fdw_create == TRUNCATE_EXISTING))
+		{
+			if (!init_flag) {
+				CloseHandle(event_handle);
+			}
+			goto retry;
+		}
+		
 		if (err == ERROR_USER_MAPPED_FILE && init_flag && file_exists && trunc_flag)
 			Arg::Gds(isc_instance_conflict).copyTo(status_vector);
 		else
@@ -3403,11 +3429,18 @@
 
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, shmem_data->sh_mem_name);
-	if (!DeleteFile(expanded_filename))
-	{
-		error(status_vector, "DeleteFile", GetLastError());
-		return;
-	}
+	
+	// Delete file only if it is not used by anyone else
+	HANDLE hFile = CreateFile(expanded_filename,
+							 DELETE,
+							 0,
+							 NULL,
+							 OPEN_EXISTING,
+							 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
+							 NULL);
+
+	if (hFile != INVALID_HANDLE_VALUE) 
+		CloseHandle(hFile);
 }
 #endif
 
Modified: firebird/branches/B2_5_Release/src/jrd/isc_version.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-06-05 02:41:14 UTC (rev 51209)
@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-T6.3.4.26024"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 26024
+#define ISC_FILE_VER_STRING "WI-T6.3.4.26038"
+#define ISC_FILE_VER_NUMBER 6, 3, 4, 26038
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"
Modified: firebird/branches/B2_5_Release/src/jrd/jrd.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/jrd.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/jrd.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -525,7 +525,8 @@
 static bool			drop_files(const jrd_file*);
 static void			find_intl_charset(thread_db*, Attachment*, const DatabaseOptions*);
 static jrd_tra*		find_transaction(thread_db*, ISC_STATUS);
-static void			init_database_locks(thread_db*);
+static void			init_database_lock(thread_db*);
+static void			init_monitoring_lock(thread_db*);
 static ISC_STATUS	handle_error(ISC_STATUS*, ISC_STATUS);
 static void			run_commit_triggers(thread_db* tdbb, jrd_tra* transaction);
 static void			verify_request_synchronization(jrd_req*& request, SSHORT level);
@@ -1000,8 +1001,8 @@
 		LCK_init(tdbb, LCK_OWNER_attachment);
 		attachment->att_flags |= ATT_lck_init_done;
 
-		// Initialize locks
-		init_database_locks(tdbb);
+		// Initialize the database lock
+		init_database_lock(tdbb);
 
 		INI_init(tdbb);
 		SHUT_init(tdbb);
@@ -1032,6 +1033,9 @@
 		// initialize shadowing as soon as the database is ready for it
 		// but before any real work is done
 		SDW_init(tdbb, options.dpb_activate_shadow, options.dpb_delete_shadow);
+
+		// Turn monitoring on
+		init_monitoring_lock(tdbb);
 	}
 	else
 	{
@@ -2040,8 +2044,8 @@
 	LCK_init(tdbb, LCK_OWNER_attachment);
 	attachment->att_flags |= ATT_lck_init_done;
 
-	// Initialize locks
-	init_database_locks(tdbb);
+	// Initialize the database lock
+	init_database_lock(tdbb);
 
 	INI_init(tdbb);
 	PAG_init(tdbb);
@@ -2116,6 +2120,9 @@
 	VIO_init(tdbb);
 #endif
 
+	// Turn monitoring on
+	init_monitoring_lock(tdbb);
+
     if (options.dpb_set_db_readonly)
     {
         if (!CCH_exclusive (tdbb, LCK_EX, WAIT_PERIOD))
@@ -4103,7 +4110,9 @@
 	if (dbb->dbb_ast_flags & DBB_monitor_off)
 	{
 		dbb->dbb_ast_flags &= ~DBB_monitor_off;
+		dbb->dbb_flags |= DBB_monitor_locking;
 		LCK_lock(tdbb, dbb->dbb_monitor_lock, LCK_SR, LCK_WAIT);
+		dbb->dbb_flags &= ~DBB_monitor_locking;
 
 		// While waiting for return from LCK_lock call above the blocking AST (see 
 		// DatabaseSnapshot::blockingAst) was called and set DBB_monitor_off flag 
@@ -4219,7 +4228,9 @@
 	if (dbb->dbb_ast_flags & DBB_monitor_off)
 	{
 		dbb->dbb_ast_flags &= ~DBB_monitor_off;
+		dbb->dbb_flags |= DBB_monitor_locking;
 		LCK_lock(tdbb, dbb->dbb_monitor_lock, LCK_SR, LCK_WAIT);
+		dbb->dbb_flags &= ~DBB_monitor_locking;
 
 		if (dbb->dbb_ast_flags & DBB_monitor_off)
 			LCK_release(tdbb, dbb->dbb_monitor_lock);
@@ -4915,16 +4926,16 @@
 }
 
 
-static void init_database_locks(thread_db* tdbb)
+static void init_database_lock(thread_db* tdbb)
 {
 /**************************************
  *
- *	i n i t _ d a t a b a s e _ l o c k s
+ *	i n i t _ d a t a b a s e _ l o c k
  *
  **************************************
  *
  * Functional description
- *	Initialize database locks.
+ *	Initialize the database lock.
  *
  **************************************/
 	SET_TDBB(tdbb);
@@ -4977,11 +4988,27 @@
 			}
 		}
 	}
+}
 
+static void init_monitoring_lock(thread_db* tdbb)
+{
+/**************************************
+ *
+ *	i n i t _ m o n i t o r i n g _ l o c k
+ *
+ **************************************
+ *
+ * Functional description
+ *	Initialize the monitoring lock.
+ *
+ **************************************/
+	SET_TDBB(tdbb);
+	Database* const dbb = tdbb->getDatabase();
+
 	// Lock shared by all dbb owners, used to signal other processes
 	// to dump their monitoring data and synchronize operations
 
-	lock = FB_NEW_RPT(*dbb->dbb_permanent, sizeof(SLONG)) Lock();
+	Lock* const lock = FB_NEW_RPT(*dbb->dbb_permanent, sizeof(SLONG)) Lock();
 	dbb->dbb_monitor_lock = lock;
 	lock->lck_type = LCK_monitor;
 	lock->lck_owner_handle = LCK_get_owner_handle(tdbb, lock->lck_type);
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp	2010-06-05 02:41:14 UTC (rev 51209)
@@ -150,6 +150,8 @@
 		{
 			unlink(m_base->cfg_file_name);
 			memset(m_base->cfg_file_name, 0, sizeof(m_base->cfg_file_name));
+
+			ISC_remove_map_file(&m_handle);
 		}
 	}
 
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-06-05 01:54:52 UTC (rev 51208)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-06-05 02:41:14 UTC (rev 51209)
@@ -3,13 +3,13 @@
 # This file is used both to rebuild the header file and to set the
 # environment variables on the config call
 
-BuildVersion="$Id: writeBuildNum.sh,v 1.25898.2.18 2010-05-21 05:19:49 dimitr Exp $"
+BuildVersion="$Id: writeBuildNum.sh,v 1.25898.2.19 2010/05/28 14:38:22 alexpeshkoff Exp $"
 
 BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26024
+BuildNum=26038
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <ale...@us...> - 2010-06-08 11:41:09
       
   | 
Revision: 51228
          http://firebird.svn.sourceforge.net/firebird/?rev=51228&view=rev
Author:   alexpeshkoff
Date:     2010-06-08 11:40:58 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
repeat commit for CORE-3021 in SVN
Modified Paths:
--------------
    firebird/branches/B2_5_Release/builds/make.new/config/install-sh
    firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
    firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.h
    firebird/branches/B2_5_Release/src/jrd/event.cpp
    firebird/branches/B2_5_Release/src/jrd/event_proto.h
    firebird/branches/B2_5_Release/src/jrd/isc.h
    firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h
    firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
    firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
    firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.h
    firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp
    firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.h
    firebird/branches/B2_5_Release/src/lock/lock.cpp
    firebird/branches/B2_5_Release/src/lock/lock_proto.h
Modified: firebird/branches/B2_5_Release/builds/make.new/config/install-sh
===================================================================
--- firebird/branches/B2_5_Release/builds/make.new/config/install-sh	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/builds/make.new/config/install-sh	2010-06-08 11:40:58 UTC (rev 51228)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
Modified: firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -106,12 +106,7 @@
 			ISC_remove_map_file(&handle);
 	}
 
-#ifdef WIN_NT
-	ISC_mutex_fini(&mutex);
-#else
-	ISC_mutex_fini(&base->mutex);
-#endif
-
+	ISC_mutex_fini(mutex);
 	ISC_STATUS_ARRAY statusVector;
 	ISC_unmap_file(statusVector, &handle);
 }
@@ -119,11 +114,8 @@
 
 void DatabaseSnapshot::SharedData::acquire()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(mutex));
+
 	if (base->allocated > handle.sh_mem_length_mapped)
 	{
 #if (defined HAVE_MMAP || defined WIN_NT)
@@ -142,11 +134,7 @@
 
 void DatabaseSnapshot::SharedData::release()
 {
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(mutex));
 }
 
 
@@ -314,20 +302,27 @@
 	fb_assert(shmem);
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&shmem->mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&shmem->winMutex, shmemData->sh_mem_name));
+	shmem->mutex = &shmem->winMutex;
 #endif
 
+	Header* const header = (Header*) shmemData->sh_mem_address;
+
 	if (!initialize)
+	{
+#ifndef WIN_NT
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &shmem->mutex));
+#endif
 		return;
+	}
 
 	// Initialize the shared data header
-	Header* const header = (Header*) shmemData->sh_mem_address;
 	header->version = MONITOR_VERSION;
 	header->used = alignOffset(sizeof(Header));
 	header->allocated = shmemData->sh_mem_length_mapped;
 
 #ifndef WIN_NT
-	checkMutex("init", ISC_mutex_init(&header->mutex));
+	checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &shmem->mutex));
 #endif
 }
 
Modified: firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/DatabaseSnapshot.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -233,8 +233,9 @@
 
 		sh_mem handle;
 #ifdef WIN_NT
-		struct mtx mutex;
+		struct mtx winMutex;
 #endif
+		struct mtx *mutex;
 		Header* base;
 
 		const SLONG process_id;
Modified: firebird/branches/B2_5_Release/src/jrd/event.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/event.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/event.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -61,7 +61,7 @@
 #include <windows.h>
 #define MUTEX		&m_mutex
 #else
-#define MUTEX		&m_header->evh_mutex
+#define MUTEX		m_mutex
 #endif
 
 #define SRQ_BASE                  ((UCHAR*) m_header)
@@ -1114,11 +1114,17 @@
 #endif
 
 	m_sharedFileCreated = initialize;
+	m_header = (evh*) shmem_data->sh_mem_address;
 
 	if (!initialize)
+	{
+#ifndef WIN_NT
+		if ( (mutex_state = ISC_map_mutex(shmem_data, &m_header->evh_mutex, &MUTEX)) )
+			mutex_bugcheck("mutex map", mutex_state);
+#endif
 		return;
+	}
 
-	m_header = (evh*) shmem_data->sh_mem_address;
 	m_header->evh_length = m_shmemData.sh_mem_length_mapped;
 	m_header->evh_version = EVENT_VERSION;
 	m_header->evh_request_id = 0;
@@ -1127,7 +1133,7 @@
 	SRQ_INIT(m_header->evh_events);
 
 #ifndef WIN_NT
-	if ( (mutex_state = ISC_mutex_init(MUTEX)) )
+	if ( (mutex_state = ISC_mutex_init(shmem_data, &m_header->evh_mutex, &MUTEX)) )
 		mutex_bugcheck("mutex init", mutex_state);
 #endif
 
Modified: firebird/branches/B2_5_Release/src/jrd/event_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/event_proto.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/event_proto.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -114,6 +114,8 @@
 
 #ifdef WIN_NT
 	struct mtx m_mutex;
+#else
+	struct mtx* m_mutex;
 #endif
 
 	bool m_sharedFileCreated;
Modified: firebird/branches/B2_5_Release/src/jrd/isc.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/isc.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -43,12 +43,6 @@
 // Looks like a lot of linux kernels are buggy when working with PRIO_INHERIT mutexes.
 #undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
 
-#if (SIZEOF_VOID_P < 8) && defined(DEV_BUILD)
-// This hack fixes CORE-3021 - segfault in DEV_BUILD.
-// Release build does not cause visible problems.
-#undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP
-#endif
-
 #endif //LINUX
 
 #ifdef UNIX
Modified: firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/isc_s_proto.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -45,7 +45,7 @@
 #if defined(WIN_NT)
 int		ISC_mutex_init(struct mtx*, const TEXT*);
 #else
-int		ISC_mutex_init(struct mtx*);
+int		ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped);
 #endif
 
 int		ISC_mutex_lock(struct mtx*);
@@ -58,6 +58,9 @@
 void	ISC_unmap_object(ISC_STATUS*, /*sh_mem*,*/ UCHAR**, ULONG);
 #endif
 
+int		ISC_map_mutex(sh_mem* shmem_data, mtx* mutex, mtx** mapped);
+void	ISC_unmap_mutex(mtx* mutex);
+
 #ifdef UNIX
 void	ISC_exception_post(ULONG, const TEXT*);
 void	ISC_sync_signals_set(void*);
Modified: firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -2219,6 +2219,9 @@
 
 
 #ifdef HAVE_MMAP
+
+#define HAVE_MAP_OBJECT 1
+
 UCHAR* ISC_map_object(ISC_STATUS* status_vector,
 					  sh_mem* shmem_data,
 					  ULONG object_offset,
@@ -2278,7 +2281,6 @@
 
 
 void ISC_unmap_object(ISC_STATUS* status_vector,
-					  //sh_mem* shmem_data,
 					  UCHAR** object_pointer,
 					  ULONG object_length)
 {
@@ -2333,6 +2335,9 @@
 
 
 #ifdef WIN_NT
+
+#define HAVE_MAP_OBJECT 1
+
 UCHAR* ISC_map_object(ISC_STATUS* status_vector,
 					  sh_mem* shmem_data,
 					  ULONG object_offset,
@@ -2376,7 +2381,6 @@
 
 
 void ISC_unmap_object(ISC_STATUS* status_vector,
-					  //sh_mem* shmem_data,
 					  UCHAR** object_pointer,
 					  ULONG /*object_length*/)
 {
@@ -2409,12 +2413,42 @@
 }
 #endif
 
+int ISC_map_mutex(sh_mem* shmem_data, mtx* mutex, mtx** mapped)
+{
+#ifdef HAVE_MAP_OBJECT
+	ISC_STATUS_ARRAY temp;
+	mutex = reinterpret_cast<mtx*>(ISC_map_object(temp, shmem_data,
+			reinterpret_cast<UCHAR*>(mutex) - shmem_data->sh_mem_address, sizeof(mtx)));
+	if (!mutex)
+	{
+		iscLogStatus("ISC_map_mutex()", temp);
+		return -1;
+	}
+#endif // HAVE_MAP_OBJECT
 
+	*mapped = mutex;
+	return 0;
+}
+
+void ISC_unmap_mutex(mtx* mutex)
+{
+#ifdef HAVE_MAP_OBJECT
+	ISC_STATUS_ARRAY temp;
+	ISC_unmap_object(temp, reinterpret_cast<UCHAR**>(&mutex), sizeof(mtx));
+	if (mutex)
+	{
+		iscLogStatus("ISC_unmap_mutex()", temp);
+	}
+#endif // HAVE_MAP_OBJECT
+
+}
+		
+
 #ifdef USE_POSIX_THREADS
 
 #ifdef USE_SYS5SEMAPHORE
 
-int ISC_mutex_init(struct mtx* mutex)
+int ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped)
 {
 /**************************************
  *
@@ -2426,6 +2460,13 @@
  *	Initialize a mutex.
  *
  **************************************/
+
+	if (ISC_map_mutex(shmem_data, mutex, mapped) != 0)
+	{
+		return -1;	// no errno known here...
+	}
+	mutex = *mapped;
+
 	if (!getSem5(mutex))
 	{
 		return FB_FAILURE;
@@ -2456,7 +2497,7 @@
  *	Destroy a mutex.
  *
  **************************************/
-	// no-op for SystemV semaphores
+	ISC_unmap_mutex(mutex);
 }
 
 
@@ -2562,7 +2603,7 @@
 static volatile bool staticBugFlag = false;
 #endif
 
-int ISC_mutex_init(struct mtx* mutex)
+int ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped)
 {
 /**************************************
  *
@@ -2574,6 +2615,13 @@
  *	Initialize a mutex.
  *
  **************************************/
+
+  if (ISC_map_mutex(shmem_data, mutex, mapped) != 0)
+  {
+		return -1;	// no errno known here...
+  }
+  mutex = *mapped;
+
 #ifdef BUGGY_LINUX_MUTEX
   do
   {
@@ -2662,7 +2710,7 @@
  *	Destroy a mutex.
  *
  **************************************/
-	// no-op for posix threads
+	ISC_unmap_mutex(mutex);
 }
 
 
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -179,7 +179,8 @@
 	fb_assert(storage);
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&storage->m_mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&storage->m_winMutex, shmemData->sh_mem_name));
+	storage->m_mutex = &storage->m_winMutex;
 #endif
 
 	ShMemHeader* const header = (ShMemHeader*) shmemData->sh_mem_address;
@@ -195,7 +196,11 @@
 		header->touch_time = 0;
 		memset(header->cfg_file_name, 0, sizeof(header->cfg_file_name));
 #ifndef WIN_NT
-		checkMutex("init", ISC_mutex_init(&header->mutex));
+		checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &storage->m_mutex));
+	}
+	else
+	{
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &storage->m_mutex));
 #endif
 	}
 }
@@ -344,22 +349,13 @@
 
 void ConfigStorage::acquire()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&m_mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&m_base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(m_mutex));
 }
 
 void ConfigStorage::release()
 {
 	checkDirty();
-
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&m_mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&m_base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(m_mutex));
 }
 
 void ConfigStorage::addSession(TraceSession& session)
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceConfigStorage.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -122,8 +122,9 @@
 	sh_mem m_handle;
 	ShMemHeader* m_base;
 #ifdef WIN_NT
-	struct mtx m_mutex;
+	struct mtx m_winMutex;
 #endif
+	struct mtx* m_mutex;
 	int  m_cfg_file;
 	bool m_dirty;
 	Firebird::Semaphore m_touchStartSem;
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -245,7 +245,8 @@
 	TraceLog* log = (TraceLog*) arg;
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&log->m_mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&log->m_winMutex, shmemData->sh_mem_name));
+	log->m_mutex = &log->m_winMutex;
 #endif
 
 	ShMemHeader* const header = (ShMemHeader*) shmemData->sh_mem_address;
@@ -256,27 +257,23 @@
 		header->readFileNum = 0;
 		header->writeFileNum = 0;
 #ifndef WIN_NT
-		checkMutex("init", ISC_mutex_init(&header->mutex));
+		checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &log->m_mutex));
+	}
+	else
+	{
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &log->m_mutex));
 #endif
 	}
 }
 
 void TraceLog::lock()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&m_mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&m_base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(m_mutex));
 }
 
 void TraceLog::unlock()
 {
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&m_mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&m_base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(m_mutex));
 }
 
 } // namespace Jrd
Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceLog.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -67,8 +67,9 @@
 	sh_mem m_handle;
 	ShMemHeader* m_base;
 #ifdef WIN_NT
-	struct mtx m_mutex;
+	struct mtx m_winMutex;
 #endif
+	struct mtx* m_mutex;
 
 	Firebird::PathName m_baseFileName;
 	unsigned int m_fileNum;
Modified: firebird/branches/B2_5_Release/src/lock/lock.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/lock/lock.cpp	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/lock/lock.cpp	2010-06-08 11:40:58 UTC (rev 51228)
@@ -97,7 +97,7 @@
 #include <process.h>
 #define MUTEX		&m_shmemMutex
 #else
-#define MUTEX		&m_header->lhb_mutex
+#define MUTEX		m_lhb_mutex
 #endif
 
 #ifdef DEV_BUILD
@@ -2317,6 +2317,7 @@
  *	to have an exclusive lock on the lock file.
  *
  **************************************/
+
 #ifdef WIN_NT
 	if (ISC_mutex_init(MUTEX, shmem_data->sh_mem_name)) {
 		bug(NULL, "mutex init failed");
@@ -2336,6 +2337,11 @@
 #endif
 
 	if (!initializeMemory) {
+#ifndef WIN_NT
+		if (ISC_map_mutex(shmem_data, &m_header->lhb_mutex, &(MUTEX))) {
+			bug(NULL, "mutex map failed");
+		}
+#endif
 		return;
 	}
 
@@ -2354,7 +2360,7 @@
 	SRQ_INIT(m_header->lhb_free_requests);
 
 #ifndef WIN_NT
-	if (ISC_mutex_init(MUTEX)) {
+	if (ISC_mutex_init(shmem_data, &m_header->lhb_mutex, &(MUTEX))) {
 		bug(NULL, "mutex init failed");
 	}
 #endif
Modified: firebird/branches/B2_5_Release/src/lock/lock_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/lock/lock_proto.h	2010-06-06 22:24:10 UTC (rev 51227)
+++ firebird/branches/B2_5_Release/src/lock/lock_proto.h	2010-06-08 11:40:58 UTC (rev 51228)
@@ -438,6 +438,8 @@
 
 #ifdef WIN_NT
 	struct mtx m_shmemMutex;
+#else
+	struct mtx* m_lhb_mutex;
 #endif
 
 #ifdef USE_SHMEM_EXT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <ale...@us...> - 2010-06-09 08:37:31
       
   | 
Revision: 51233
          http://firebird.svn.sourceforge.net/firebird/?rev=51233&view=rev
Author:   alexpeshkoff
Date:     2010-06-09 08:37:25 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
Paul's changes from CVS - Mac port
Modified Paths:
--------------
    firebird/branches/B2_5_Release/builds/posix/postfix.darwin
    firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386
    firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64
    firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin
Modified: firebird/branches/B2_5_Release/builds/posix/postfix.darwin
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/postfix.darwin	2010-06-08 14:44:45 UTC (rev 51232)
+++ firebird/branches/B2_5_Release/builds/posix/postfix.darwin	2010-06-09 08:37:25 UTC (rev 51233)
@@ -82,7 +82,6 @@
 	cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
-	cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
@@ -149,7 +148,6 @@
 	cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
-	#cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
 	#cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
Modified: firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386	2010-06-08 14:44:45 UTC (rev 51232)
+++ firebird/branches/B2_5_Release/builds/posix/prefix.darwin_i386	2010-06-09 08:37:25 UTC (rev 51233)
@@ -22,27 +22,27 @@
 # 2. dnl the CPU_TYPE
 # 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386)
 # 4. for  CFLAGS, CXXFLAGS. LDFLAGS export '-m32 -arch i386'
-# 5. export MACOSX_DEPLOYMENT_TARGET=10.4 
+# 5. export MACOSX_DEPLOYMENT_TARGET=10.6
 
 DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
 export DYLD_LIBRARY_PATH
 
-MACOSX_DEPLOYMENT_TARGET=10.4
+MACOSX_DEPLOYMENT_TARGET=10.6
 export MACOSX_DEPLOYMENT_TARGET
 
 OS_ServerFiles=inet_server.cpp
 
-PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.4
-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.4
+PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
-EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
-CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 	fbtracemgr
 
 Physical_IO_Module=os/posix/unix.cpp
 PLATFORM_PATH=os/darwin
 
 LINK_OPTS:=-m32
-LD_FLAGS+=-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+LD_FLAGS+=-m32 -arch i386 
 
 include $(ROOT)/gen/darwin.defaults
Modified: firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64	2010-06-08 14:44:45 UTC (rev 51232)
+++ firebird/branches/B2_5_Release/builds/posix/prefix.darwin_x86_64	2010-06-09 08:37:25 UTC (rev 51233)
@@ -22,16 +22,16 @@
 DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
 export DYLD_LIBRARY_PATH
 
-MACOSX_DEPLOYMENT_TARGET=10.5
+MACOSX_DEPLOYMENT_TARGET=10.6
 export MACOSX_DEPLOYMENT_TARGET
 
 OS_ServerFiles=inet_server.cpp
 
-PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.5
-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5
+PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
-EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
-CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 	fbtracemgr
 
 Physical_IO_Module=os/posix/unix.cpp
Modified: firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin
===================================================================
--- firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin	2010-06-08 14:44:45 UTC (rev 51232)
+++ firebird/branches/B2_5_Release/extern/icu/source/config/mh-darwin	2010-06-09 08:37:25 UTC (rev 51233)
@@ -17,9 +17,9 @@
 # Set CFLAGS and CXXFLAGS for relevant MacOS architecture
 # and backwards compatibility. Set accordingly before building.
 
-# Default 64 bit Leopard/Snow Leopard - intel (MacOS 10.5+)
-CFLAGS += -arch x86_64 
-CXXFLAGS += -arch x86_64 
+# Default 64 bit Snow Leopard - intel (MacOS 10.6+)
+CFLAGS += -arch x86_64 -mmacosx-version-min=10.6
+CXXFLAGS += -arch x86_64 -mmacosx-version-min=10.6
 
 # 64 bit powerpc
 #CFLAGS += -arch ppc64  -mmacosx-version-min=10.5
@@ -27,8 +27,8 @@
 
 # 32bit intel default 
 # DARWIN flag added because of problem with putil.c
-#CFLAGS += -arch i386 -mmacosx-version-min=10.4 -DDARWIN
-#CXXFLAGS += -arch i386 -mmacosx-version-min=10.4
+#CFLAGS += -arch i386 -mmacosx-version-min=10.6 -DDARWIN
+#CXXFLAGS += -arch i386 -mmacosx-version-min=10.6
 
 # 32 bit powerpc
 #CFLAGS += -arch ppc -mmacosx-version-min=10.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <di...@us...> - 2010-06-25 09:07:05
       
   | 
Revision: 51283
          http://firebird.svn.sourceforge.net/firebird/?rev=51283&view=rev
Author:   dimitr
Date:     2010-06-25 09:06:55 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
Update.
Modified Paths:
--------------
    firebird/branches/B2_5_Release/doc/WhatsNew
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/jrd/isc_version.h
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-25 06:45:10 UTC (rev 51282)
+++ firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-25 09:06:55 UTC (rev 51283)
@@ -2,35 +2,55 @@
   * v2.5 Release Candidate 3
   **************************
 
+    * Bugfix CORE-3046
+        Assertion after ALTER TABLE
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3038
+        The insert failed because a column definition includes validation
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
+    * Bugfix CORE-3034
+        Bugcheck 300 (can't find shared latch)
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-3021
-		Segfault in DEV_BUILD
+        Segfault in DEV_BUILD
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-3019
+        Startup failure of SuperServer and SuperClassic on Linux Gentoo
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-3017
-		Files left at Firebird's lock directory 
+        Files left at Firebird's lock directory 
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
         Alex Peshkov <peshkoff at mail.ru>
 
     * Bugfix CORE-3016
-		On disconnect it is possible to see "Fatal lock manager error: invalid lock id (0), errno: 0" 
-		in firebird.log
+        On disconnect it is possible to see "Fatal lock manager error: invalid lock id (0), errno: 0" 
+        in firebird.log
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
     * Bugfix CORE-3015
-		Various "Cannot initialize the shared memory region" errors
+        Various "Cannot initialize the shared memory region" errors
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
     * Bugfix CORE-3011
-		Server hangs or crashes while monitoring connections repeatedly attaching and detaching
+        Server hangs or crashes while monitoring connections repeatedly attaching and detaching
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
     * Bugfix CORE-3010
-		First connect to any database shows MON$MEMORY_USED = 4Gb 
+        First connect to any database shows MON$MEMORY_USED = 4Gb 
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
         Vlad Khorsun <hvlad at users.sourceforge.net>
@@ -40,6 +60,11 @@
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-3003
+        Procedure suspend check may cause restore to fail
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
     * Bugfix CORE-3001
         Install fails to create user and group "firebird"
       Contributor(s):
@@ -62,6 +87,11 @@
         Vlad Khorsun <hvlad at users.sourceforge.net>
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Bugfix CORE-2985
+        Altering COMPUTED columns doesn't handle dependencies well
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2984
         GBAK -v srv:db stdout creates a broken backup
       Contributor(s):
@@ -157,6 +187,11 @@
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
+    * Bugfix CORE-2920
+        Incorrect execution of volatile SQL statements inside EXECUTE STATEMENT
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-2919
         Installation script ignores non-standard ports
       Contributor(s):
@@ -192,11 +227,21 @@
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
+    * Bugfix CORE-2900
+        Access violation using aggregate distinct
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2898
         CHAR_TO_UUID and UUID_TO_CHAR work differently in big/little endian architectures
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
+    * Bugfix CORE-2893
+        Expression in a subquery may be treated as invariant and produce incorrect results
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2888
         A memory corruption cause incorrect query evaluation and may crash the server
       Contributor(s):
@@ -242,16 +287,16 @@
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-2859
+        Security database remains locked after replacing database
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-2858
         Possible memory trashing when raising some exceptions to signal failed security checks
       Contributor(s):
         Claudio Valderrama <cvalde at usa.net>
 
-    * Bugfix CORE-2859
-        Security database remains locked after replacing database
-      Contributor(s):
-        Alex Peshkov <peshkoff at mail.ru>
-
     * Bugfix CORE-2856
         Non-NULL key in unique index could be not found when key is removed
       Contributor(s):
@@ -273,6 +318,11 @@
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Bugfix CORE-2845
+        Solaris 10 no longer requires SFIO
+      Contributor(s):
+        Paul Beach <pbeach at ibphoenix.com>
+
     * Bugfix CORE-2844
         Unresolved symbol references when linking fbsvcmgr and fbtracemgr
       Contributor(s):
@@ -294,6 +344,11 @@
         Damyan Ivanov <dmn at debian.org>
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-2756
+        Substring from timestamp - unexpected result
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-2750
         Physical backup cannot restart operations after the explicit difference file has been dropped
       Contributor(s):
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-06-25 06:45:10 UTC (rev 51282)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-06-25 09:06:55 UTC (rev 51283)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26038
+  FORMAL BUILD NUMBER:26050
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26038"
-#define FILE_VER_STRING "WI-V2.5.0.26038"
-#define LICENSE_VER_STRING "WI-V2.5.0.26038"
-#define FILE_VER_NUMBER 2, 5, 0, 26038
+#define PRODUCT_VER_STRING "2.5.0.26050"
+#define FILE_VER_STRING "WI-V2.5.0.26050"
+#define LICENSE_VER_STRING "WI-V2.5.0.26050"
+#define FILE_VER_NUMBER 2, 5, 0, 26050
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26038"
+#define FB_BUILD_NO "26050"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/jrd/isc_version.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-06-25 06:45:10 UTC (rev 51282)
+++ firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-06-25 09:06:55 UTC (rev 51283)
@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-T6.3.4.26038"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 26038
+#define ISC_FILE_VER_STRING "WI-T6.3.4.26050"
+#define ISC_FILE_VER_NUMBER 6, 3, 4, 26050
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-06-25 06:45:10 UTC (rev 51282)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-06-25 09:06:55 UTC (rev 51283)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26038
+BuildNum=26050
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-12 03:18:50
       
   | 
Revision: 51438
          http://firebird.svn.sourceforge.net/firebird/?rev=51438&view=rev
Author:   firebirds
Date:     2010-08-12 03:16:45 +0000 (Thu, 12 Aug 2010)
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	2010-08-12 03:13:26 UTC (rev 51437)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-12 03:16:45 UTC (rev 51438)
@@ -1,87956 +1,98730 @@
-2010-07-14 12:31  alexpeshkoff
+ 2010-08-11 10:50  dimitr 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+   M src/jrd/opt.cpp
+More complete solution for CORE-2822: Error "no current row for fetch operation" when subquery includes a non-trivial derived table.
+It's also expected to fix CORE-3103: Select statement with more non indexed reads in version 2.5RC3 as in version 2.1.3.
+Patch for trunk will follow a bit later.
 
-	* firebird2/src/jrd/trace/: TraceConfigStorage.cpp (1.30.2.8),
-	TraceConfigStorage.h (1.10.2.6):
+ 2010-08-11 07:36  dimitr 
+   M src/common/classes/alloc.cpp
+   M src/common/classes/alloc.h
+Fixed the remaining issue related to CORE-1079: Every attach of fbclient/fbembed library to the host process leaks 64KB of memory.
 
-	Fixed unregistred bug (rc3 vs rc2 regression) - races when closing
-	touchThread
+ 2010-08-09 14:50  dimitr 
+   M doc/sql.extensions/README.builtin_functions.txt
+CORE-3102 (minor documentation mistake)
 
-2010-07-13 09:13  dimitr
+ 2010-08-07 21:29  hvlad 
+   M src/common/classes/ClumpletReader.cpp
+   M src/jrd/extds/ExtDS.cpp
+Backport fix for bug CORE-3100 : Wait mode and lock timeout of external transaction of EXECUTE STATEMENT not matched to corresponding parameters of local transaction 
 
-	* firebird2/src/jrd/isc_version.h (1.10.2.19):
+ 2010-08-07 02:49  asfernandes 
+   M src/dsql/pass1.cpp
+Correction for CORE-3090
 
-	Update.
+ 2010-08-07 01:50  asfernandes 
+   M src/dsql/pass1.cpp
+   M src/jrd/Optimizer.cpp
+Fixed CORE-3090 - Incorrect LEFT JOIN result using table and derived constant subquery
 
-2010-07-13 09:08  dimitr
+ 2010-08-06 15:11  hvlad 
+   M src/jrd/extds/IscDS.cpp
+Fixed bug CORE-3089 : Attempt of execute statement on external datasource failed when datasource is interbase 4.1
 
-	* firebird2/src/jrd/extds/ExtDS.cpp (1.45.2.4):
+ 2010-08-06 02:12  asfernandes 
+   M src/jrd/cmp.cpp
+Fixed CORE-2893 - Regression introduced with fix for CORE-2893 causes double processing of nodes when preparing a statement. Debug build aborts.
 
-	Backported recent Vlad's bugfix.
+ 2010-08-04 15:26  asfernandes 
+   M src/jrd/cmp.cpp
+Fixed CORE-3094 - Parameters doesn't work with NOT IN from a selectable procedure
 
-2010-07-13 08:55  dimitr
+ 2010-08-02 22:43  asfernandes 
+   M src/jrd/SysFunction.cpp
+Backport fix for CORE-3091 - Built-in function POWER(X, Y) does not work when the X argument is negative and the Y value is scaled numeric but integral
 
-	* firebird2/src/jrd/isc_sync.cpp (1.221.2.8):
+ 2010-07-26 11:05  hvlad 
+   M src/jrd/dfw.epp
+Backport fix for bug CORE-3079 : Strong slowing down inserts with EVENT-s in a single transaction
 
-	Mirror the recent Alex's change for Windows. It doesn't seem being
-	strictly required, but let's be safe.
+ 2010-07-16 07:54  alexpeshkoff 
+   M ChangeLog
+Updated ChangeLog
 
-2010-07-09 15:12  alexpeshkoff
+ 2010-07-16 07:20  alexpeshkoff 
+   M src/common/classes/semaphore.h
+   M src/jrd/DatabaseSnapshot.cpp
+   M src/jrd/event.cpp
+   M src/jrd/isc_s_proto.h
+   M src/jrd/isc_sync.cpp
+   M src/lock/lock.cpp
+   M src/lock/print.cpp
+Fixed Mac port
 
-	* firebird2/doc/WhatsNew (1.190.2.26):
+ 2010-07-14 10:27  alexpeshkoff 
+   M src/jrd/trace/TraceConfigStorage.cpp
+   M src/jrd/trace/TraceConfigStorage.h
+Fixed unregistred bug (rc3 vs rc2 regression) - races when closing touchThread
 
-	Updated WhatsNew
+ 2010-07-13 07:18  dimitr 
+   M src/jrd/build_no.h
+   M src/jrd/isc_version.h
+   M src/misc/writeBuildNum.sh
+Update.
 
-2010-07-09 14:03  alexpeshkoff
+ 2010-07-13 07:10  dimitr 
+   M src/jrd/extds/ExtDS.cpp
+Backported recent Vlad's bugfix.
 
-	* firebird2/src/jrd/isc_sync.cpp (1.221.2.7):
+ 2010-07-13 07:05  dimitr 
+   M src/jrd/isc_sync.cpp
+Mirror the recent Alex's change for Windows. It doesn't seem being strictly required, but let's be safe.
 
-	Backported fix for CORE-3067: Objects not unmapped when shared
-	memory is closed
+ 2010-07-09 13:10  alexpeshkoff 
+   M doc/WhatsNew
+Updated WhatsNew
 
-2010-07-08 12:31  dimitr
+ 2010-07-09 11:15  alexpeshkoff 
+   M src/jrd/isc_sync.cpp
+Backported fix for CORE-3067: Objects not unmapped when shared memory is closed
 
-	* firebird2/src/common/classes/fb_pair.h (1.18.2.1):
+ 2010-07-08 10:44  dimitr 
+   M src/common/classes/fb_pair.h
+Fixed the old bug which was left unnoticed until RC3 where Pair<MetaName, MetaName> was used as a key for a b-tree.
+At the first glance, it promises only wrong ordering of items, but in fact it trashes the b-tree internals and crashes the server :-(
+It's unregistered and undocumented, but being a very recent RC3 only regression, let's leave it this way.
+I suppose the intended code should be !(v.first < this->first), but we have the operator == defined, so I used a simpler form.
 
-	Fixed the old bug which was left unnoticed until RC3 where
-	Pair<MetaName, MetaName> was used as a key for a b-tree.  At the
-	first glance, it promises only wrong ordering of items, but in fact
-	it trashes the b-tree internals and crashes the server :-( It's
-	unregistered and undocumented, but being a very recent RC3 only
-	regression, let's leave it this way.  I suppose the intended code
-	should be !(v.first < this->first), but we have the operator ==
-	defined, so I used a simpler form.
+ 2010-07-02 10:43  dimitr 
+   M src/dsql/pass1.cpp
+Fixed CORE-3064: Using the procedure alias inside an explicit plan crashes the server.
 
-2010-07-02 12:31  dimitr
+ 2010-06-26 01:24  asfernandes 
+   M doc/WhatsNew
+Credits
 
-	* firebird2/src/dsql/pass1.cpp (1.458.2.5):
+ 2010-06-25 09:06  dimitr 
+   M doc/WhatsNew
+   M src/jrd/build_no.h
+   M src/jrd/isc_version.h
+   M src/misc/writeBuildNum.sh
+Update.
 
-	Fixed CORE-3064: Using the procedure alias inside an explicit plan
-	crashes the server.
+ 2010-06-23 13:30  hvlad 
+   M src/remote/server.cpp
+Disable hard limit on number of worker threads. Something more smart should be implemented instead.
 
-2010-06-26 03:26  asfernandes
+ 2010-06-18 11:21  asfernandes 
+   M src/jrd/unicode_util.cpp
+Fix problem seen by Vlad where crash happens when our older ICU is found
 
-	* firebird2/doc/WhatsNew (1.190.2.25):
+ 2010-06-16 11:47  asfernandes 
+   M src/jrd/evl.cpp
+Fixed CORE-2900 - "AV - The code attempted to access a virtual address without privilege to do so" using aggregate distinct
 
-	Credits
+ 2010-06-15 12:00  alexpeshkoff 
+   M src/jrd/evl.cpp
+Backported fix for CORE-3046: Assertion after ALTER TABLE
 
-2010-06-25 11:04  dimitr
+ 2010-06-14 11:45  hvlad 
+   M src/jrd/cch.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/jrd.h
+Fixed bug CORE-3034 : Bugchek 300 (can't find shared latch)
 
-	* firebird2/: src/jrd/isc_version.h (1.10.2.18), doc/WhatsNew
-	(1.190.2.24):
+ 2010-06-13 14:57  asfernandes 
+   M src/jrd/cmp.cpp
+Backport fix for CORE-2893 - Expression in a subquery may be treated as invariant and produce incorrect results
 
-	Update.
+ 2010-06-12 19:22  asfernandes 
+   M src/jrd/dfw.epp
+Backported fix for CORE-2985 - The new 2.5 feature to alter COMPUTED columns doesn't handle dependencies well.
 
-2010-06-23 15:28  hvlad
+ 2010-06-12 16:49  asfernandes 
+   M src/common/classes/MetaName.h
+   M src/dsql/metd_proto.h
+   M src/jrd/exe.h
+   M src/jrd/par.cpp
+Backport fix for CORE-3038 - The insert failed because a column definition includes validation.
 
-	* firebird2/src/remote/server.cpp (1.264.2.3):
+ 2010-06-09 08:37  alexpeshkoff 
+   M builds/posix/postfix.darwin
+   M builds/posix/prefix.darwin_i386
+   M builds/posix/prefix.darwin_x86_64
+   M extern/icu/source/config/mh-darwin
+Paul's changes from CVS - Mac port
 
-	Disable hard limit on number of worker threads. Something more
-	smart should be implemented instead.
+ 2010-06-08 13:18  alexpeshkoff 
+   M src/common/classes/semaphore.cpp
+   M src/common/classes/semaphore.h
+Mac port - use dispatch semaphores
 
-2010-06-18 13:24  asfernandes
+ 2010-06-08 11:40  alexpeshkoff 
+   M builds/make.new/config/install-sh
+   M src/jrd/DatabaseSnapshot.cpp
+   M src/jrd/DatabaseSnapshot.h
+   M src/jrd/event.cpp
+   M src/jrd/event_proto.h
+   M src/jrd/isc.h
+   M src/jrd/isc_s_proto.h
+   M src/jrd/isc_sync.cpp
+   M src/jrd/trace/TraceConfigStorage.cpp
+   M src/jrd/trace/TraceConfigStorage.h
+   M src/jrd/trace/TraceLog.cpp
+   M src/jrd/trace/TraceLog.h
+   M src/lock/lock.cpp
+   M src/lock/lock_proto.h
+repeat commit for CORE-3021 in SVN
 
-	* firebird2/src/jrd/unicode_util.cpp (1.53.2.1):
+ 2010-06-05 02:41  asfernandes 
+   M builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
+   M doc/WhatsNew
+   M src/common/classes/alloc.cpp
+   M src/jrd/Database.h
+   M src/jrd/DatabaseSnapshot.cpp
+   M src/jrd/build_no.h
+   M src/jrd/cch.cpp
+   M src/jrd/isc.h
+   M src/jrd/isc_s_proto.h
+   M src/jrd/isc_sync.cpp
+   M src/jrd/isc_version.h
+   M src/jrd/jrd.cpp
+   M src/jrd/trace/TraceConfigStorage.cpp
+   M src/misc/writeBuildNum.sh
+Port CVS changes (includes CORE-2993, CORE-3010, CORE-3011, CORE-3015, CORE-3016, CORE-3017 and CORE-3021)
 
-	Fix problem seen by Vlad where crash happens when our older ICU is
-	found
+ 2010-06-05 00:26  asfernandes 
+   M ChangeLog
+   M Makefile.in
+   M acx_pthread.m4
+   M autogen.sh
+   M binreloc.m4
+   M builds/install/arch-specific/aix/Makefile.in
+   M builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
+   M builds/install/arch-specific/aix/classic/rpmfiles.txt.in
+   M builds/install/arch-specific/aix/classic/rpmheader.txt.in
+   M builds/install/arch-specific/aix/misc/aixLibrary.sh.in
+   M builds/install/arch-specific/aix/misc/firebird.init.d.aix.in
+   M builds/install/arch-specific/aix/misc/postinstall.sh.in
+   M builds/install/arch-specific/aix/misc/postuninstall.sh.in
+   M builds/install/arch-specific/aix/misc/preinstall.sh.in
+   M builds/install/arch-specific/aix/misc/preuninstall.sh.in
+   M builds/install/arch-specific/aix/misc/rc.config.firebird.aix.in
+   M builds/install/arch-specific/aix/misc/tarinstall.sh.in
+   M builds/install/arch-specific/aix/misc/tarmaininstall.sh.in
+   M builds/install/arch-specific/aix/misc/tarmainuninstall.sh.in
+   M builds/install/arch-specific/aix/misc/taruninstall.sh.in
+   M builds/install/arch-specific/darwin/Description.plist
+   M builds/install/arch-specific/darwin/FB.info
+   M builds/install/arch-specific/darwin/Firebird.startupitem/Firebird
+   M builds/install/arch-specific/darwin/Firebird.startupitem/Resources/English.lproj/Localizable.strings
+   M builds/install/arch-specific/darwin/Firebird.startupitem/StartupParameters.plist
+   M builds/install/arch-specific/darwin/FrameworkInfo.plist
+   M builds/install/arch-specific/darwin/Info.plist
+   M builds/install/arch-specific/darwin/License.txt
+   M builds/install/arch-specific/darwin/Makefile.in
+   M builds/install/arch-specific/darwin/PkgInfo
+   M builds/install/arch-specific/darwin/Readme.txt
+   M builds/install/arch-specific/darwin/Welcome.txt
+   M builds/install/arch-specific/darwin/aliases.conf.in
+   M builds/install/arch-specific/darwin/buildno.c
+   M builds/install/arch-specific/darwin/buildsuffix.c
+   M builds/install/arch-specific/darwin/changeMultiConnectMode
+   M builds/install/arch-specific/darwin/fullvers.c
+   M builds/install/arch-specific/darwin/install-script
+   M builds/install/arch-specific/darwin/launchd.org.firebird.gds.plist
+   M builds/install/arch-specific/darwin/majorvers.c
+   M builds/install/arch-specific/darwin/minorvers.c
+   M builds/install/arch-specific/darwin/preinstall-script
+   M builds/install/arch-specific/darwin/preupgrade-script
+   M builds/install/arch-specific/darwin/revno.c
+   M builds/install/arch-specific/freebsd/Makefile.in
+   M builds/install/arch-specific/freebsd/freebsdLibrary.sh.in
+   M builds/install/arch-specific/freebsd/install.sh.in
+   M builds/install/arch-specific/hpux/Makefile.in
+   M builds/install/arch-specific/hpux/classic/firebirdCS.psf.in
+   M builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
+   M builds/install/arch-specific/hpux/classic/postInstall.sh.in
+   M builds/install/arch-specific/hpux/classic/postUninstall.sh.in
+   M builds/install/arch-specific/hpux/classic/preInstall.sh.in
+   M builds/install/arch-specific/hpux/classic/preUninstall.sh.in
+   M builds/install/arch-specific/hpux/classic/tarInstall.sh.in
+   M builds/install/arch-specific/hpux/classic/tarUninstall.sh.in
+   M builds/install/arch-specific/hpux/classic/tarmainInstall.sh.in
+   M builds/install/arch-specific/hpux/classic/tarmainUninstall.sh.in
+   M builds/install/arch-specific/hpux/misc/changedbaPassword.sh.in
+   M builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
+   M builds/install/arch-specific/hpux/misc/createaliasDB.sh.in
+   M builds/install/arch-specific/hpux/misc/firebird.init.d.hpux.in
+   M builds/install/arch-specific/hpux/misc/hpuxLibrary.sh.in
+   M builds/install/arch-specific/hpux/misc/rc.config.firebird.hpux.in
+   M builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
+   M builds/install/arch-specific/hpux/super/postInstall.sh.in
+   M builds/install/arch-specific/hpux/super/postUninstall.sh.in
+   M builds/install/arch-specific/hpux/super/preInstall.sh.in
+   M builds/install/arch-specific/hpux/super/preUninstall.sh.in
+   M builds/install/arch-specific/hpux/super/tarInstall.sh.in
+   M builds/install/arch-specific/hpux/super/tarUninstall.sh.in
+   M builds/install/arch-specific/hpux/super/tarmainInstall.sh.in
+   M builds/install/arch-specific/hpux/super/tarmainUninstall.sh.in
+   M builds/install/arch-specific/linux/Makefile.in
+   M builds/install/arch-specific/linux/classic/rpmfiles.txt.in
+   M builds/install/arch-specific/linux/classic/rpmheader.txt.in
+   M builds/install/arch-specific/linux/misc/README
+   M builds/install/arch-specific/linux/misc/firebird.init.d.debian.in
+   M builds/install/arch-specific/linux/misc/firebird.init.d.generic.in
+   M builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
+   M builds/install/arch-specific/linux/misc/firebird.init.d.mandrake.in
+   M builds/install/arch-specific/linux/misc/firebird.init.d.slackware.in
+   M builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
+   M builds/install/arch-specific/linux/misc/firebird.xinetd.in
+   M builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
+   M builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+   M builds/install/arch-specific/linux/misc/postinstall.sh.in
+   M builds/install/arch-specific/linux/misc/postuninstall.sh.in
+   M builds/install/arch-specific/linux/misc/preinstall.sh.in
+   M builds/install/arch-specific/linux/misc/preuninstall.sh.in
+   M builds/install/arch-specific/linux/misc/rc.config.firebird.in
+   M builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
+   M builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
+   M builds/install/arch-specific/linux/misc/tarinstall.sh.in
+   M builds/install/arch-specific/linux/misc/taruninstall.sh.in
+   M builds/install/arch-specific/linux/super/rpmfiles.txt.in
+   M builds/install/arch-specific/linux/super/rpmheader.txt.in
+   M builds/install/arch-specific/mingw/Makefile.in
+   M builds/install/arch-specific/mingw/super/Readme.txt
+   M builds/install/arch-specific/netbsd/Makefile.in
+   M builds/install/arch-specific/netbsd/install.sh.in
+   M builds/install/arch-specific/solaris/CS/gds_db-tcp.xml
+   M builds/install/arch-specific/solaris/CS/pkginfo.in
+   M builds/install/arch-specific/solaris/CS/postinstall.in
+   M builds/install/arch-specific/solaris/CS/postremove.in
+   M builds/install/arch-specific/solaris/CS/preinstall.in
+   M builds/install/arch-specific/solaris/CS/prototype.icu.in
+   M builds/install/arch-specific/solaris/CS/prototype.in
+   M builds/install/arch-specific/solaris/Makefile.in
+   M builds/install/arch-specific/solaris/SS/gds_db-tcp.xml
+   M builds/install/arch-specific/solaris/SS/pkginfo.in
+   M builds/install/arch-specific/solaris/SS/postinstall.in
+   M builds/install/arch-specific/solaris/SS/postremove.in
+   M builds/install/arch-specific/solaris/SS/preinstall.in
+   M builds/install/arch-specific/solaris/SS/prototype.icu.in
+   M builds/install/arch-specific/solaris/SS/prototype.in
+   M builds/install/arch-specific/solaris/libgcc/pkginfolg.in
+   M builds/install/arch-specific/solaris/libgcc/prototypelg.in
+   M builds/install/arch-specific/solx86/Makefile.in
+   M builds/install/arch-specific/win32/After_Installation.url
+   M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+   M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+   M builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
+   M builds/install/arch-specific/win32/FirebirdInstall_20.iss
+   M builds/install/arch-specific/win32/Readme.txt
+   M builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
+   M builds/install/arch-specific/win32/ba/ProcitajMe.txt
+   M builds/install/arch-specific/win32/ba/custom_messages_ba.inc
+   M builds/install/arch-specific/win32/custom_messages.inc
+   M builds/install/arch-specific/win32/de/custom_messages_de.inc
+   M builds/install/arch-specific/win32/de/installation_liesmich.txt
+   M builds/install/arch-specific/win32/de/liesmich.txt
+   M builds/install/arch-specific/win32/es/custom_messages_es.inc
+   M builds/install/arch-specific/win32/es/leame.txt
+   M builds/install/arch-specific/win32/es/leame_instalacion.txt
+   M builds/install/arch-specific/win32/firebirdsql.org.url
+   M builds/install/arch-specific/win32/fr/custom_messages_fr.inc
+   M builds/install/arch-specific/win32/fr/documents-en-francais.txt
+   M builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
+   M builds/install/arch-specific/win32/fr/lisezmoi.txt
+   M builds/install/arch-specific/win32/hu/custom_messages_hu.inc
+   M builds/install/arch-specific/win32/hu/olvass_el.txt
+   M builds/install/arch-specific/win32/hu/telepitesi_segedlet.txt
+   M builds/install/arch-specific/win32/i18n_readme.txt
+   M builds/install/arch-specific/win32/install_classic.bat
+   M builds/install/arch-specific/win32/install_super.bat
+   M builds/install/arch-specific/win32/install_superclassic.bat
+   M builds/install/arch-specific/win32/installation_readme.txt
+   M builds/install/arch-specific/win32/installation_scripted.txt
+   M builds/install/arch-specific/win32/it/custom_messages_it.inc
+   M builds/install/arch-specific/win32/it/leggimi.txt
+   M builds/install/arch-specific/win32/it/leggimi_installazione.txt
+   M builds/install/arch-specific/win32/pl/custom_messages_pl.inc
+   M builds/install/arch-specific/win32/pl/czytajto.txt
+   M builds/install/arch-specific/win32/pl/instalacja_czytajto.txt
+   M builds/install/arch-specific/win32/pt/custom_messages_pt.inc
+   M builds/install/arch-specific/win32/pt/instalacao_leia-me.txt
+   M builds/install/arch-specific/win32/pt/leia-me.txt
+   M builds/install/arch-specific/win32/readme_snapshot.txt
+   M builds/install/arch-specific/win32/si/custom_messages_si.inc
+   M builds/install/arch-specific/win32/si/instalacija_precitajMe.txt
+   M builds/install/arch-specific/win32/strip_comments.sed
+   M builds/install/arch-specific/win32/uninstall.bat
+   M builds/install/misc/IDPLicense.txt
+   M builds/install/misc/IPLicense.txt
+   M builds/install/misc/aliases.conf.in
+   M builds/install/misc/changeDBAPassword.sh.in
+   M builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
+   M builds/install/misc/changeMultiConnectMode.sh.in
+   M builds/install/misc/changeRunUser.sh.in
+   M builds/install/misc/classicLibrary.sh.in
+   M builds/install/misc/createAliasDB.sh.in
+   M 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
+   M builds/install/misc/firebird.init.d.generic.in
+   M builds/install/misc/firebird.init.d.mandrake.in
+   M builds/install/misc/posixLibrary.sh.in
+   M builds/install/misc/restoreRootRunUser.sh.in
+   M builds/install/misc/superLibrary.sh.in
+   M builds/mac_os_x/CS/CS.pbproj/project.pbxproj
+   M builds/mac_os_x/CS/Helpers.make
+   M builds/mac_os_x/CS/gpre_wrapper.sh
+   M builds/mac_os_x/CS/make_wrapper.sh
+   M builds/mac_os_x/CS/stlport_vars.cpp
+   M builds/mac_os_x/CS/stub.c
+   M builds/make.new/config/install-sh
+   M builds/old_prefixes/README.txt
+   M builds/old_prefixes/prefix.aix
+   M builds/old_prefixes/prefix.aix_ppc
+   M builds/old_prefixes/prefix.darwin
+   M builds/old_prefixes/prefix.freebsd
+   M builds/old_prefixes/prefix.hp10
+   M builds/old_prefixes/prefix.hp9.0
+   M builds/old_prefixes/prefix.linux
+   M builds/old_prefixes/prefix.mu
+   M builds/old_prefixes/prefix.ncr3000
+   M builds/old_prefixes/prefix.netbsd
+   M builds/old_prefixes/prefix.sco
+   M builds/old_prefixes/prefix.sco_ev
+   M builds/old_prefixes/prefix.solaris
+   M builds/old_prefixes/prefix.solaris_mt
+   M builds/old_prefixes/prefix.solx86
+   M builds/old_prefixes/prefix.sun4
+   M builds/old_prefixes/prefix.sun4_acc
+   M builds/old_prefixes/prefix.win_nt
+   M builds/old_prefixes/prefix.win_nts
+   M builds/posix/Makefile.in.boot.gpre
+   M builds/posix/Makefile.in.client.fbudf
+   M builds/posix/Makefile.in.client.gbak
+   M builds/posix/Makefile.in.client.gdef
+   M builds/posix/Makefile.in.client.gfix
+   M builds/posix/Makefile.in.client.gpre
+   M builds/posix/Makefile.in.client.gsec
+   M builds/posix/Makefile.in.client.isql
+   M builds/posix/Makefile.in.client.qli
+   M builds/posix/Makefile.in.client.util
+   M builds/posix/Makefile.in.codes
+   M builds/posix/Makefile.in.embed.fbudf
+   M builds/posix/Makefile.in.embed.gbak
+   M builds/posix/Makefile.in.embed.gdef
+   M builds/posix/Makefile.in.embed.gfix
+   M builds/posix/Makefile.in.embed.gpre
+   M builds/posix/Makefile.in.embed.isql
+   M builds/posix/Makefile.in.embed.qli
+   M builds/posix/Makefile.in.embed.util
+   M builds/posix/Makefile.in.examples
+   M builds/posix/Makefile.in.extern.editline
+   M builds/posix/Makefile.in.extern.icu
+   M builds/posix/Makefile.in.extlib
+   M builds/posix/Makefile.in.fbserver
+   M builds/posix/Makefile.in.fbtrace
+   M builds/posix/Makefile.in.fbutil
+   M builds/posix/Makefile.in.firebird
+   M builds/posix/Makefile.in.inet_server
+   M builds/posix/Makefile.in.intl
+   M builds/posix/Makefile.in.libfbclient
+   M builds/posix/Makefile.in.libfbembed
+   M builds/posix/Makefile.in.libfbstatic
+   M builds/posix/Makefile.in.msgs
+   M builds/posix/Makefile.in.refDatabases
+   M builds/posix/Makefile.in.smp_server
+   M builds/posix/Makefile.in.static.gbak
+   M builds/posix/Makefile.in.static.gpre
+   M builds/posix/Makefile.in.static.isql
+   M builds/posix/darwin.defaults
+   M builds/posix/fbintl.darwin.vers
+   M builds/posix/fbintl.exp
+   M builds/posix/fbintl.hpux.vers
+   M builds/posix/fbintl.vers
+   M builds/posix/fbtrace.darwin.vers
+   M builds/posix/fbtrace.exp
+   M builds/posix/fbtrace.hpux.vers
+   M builds/posix/fbtrace.vers
+   M builds/posix/firebird.darwin.client.vers
+   M builds/posix/firebird.darwin.embed.vers
+   M builds/posix/firebird.exp
+   M builds/posix/firebird.hpux.vers
+   M builds/posix/firebird.vers
+   M builds/posix/ib_util.darwin.vers
+   M builds/posix/ib_util.exp
+   M builds/posix/ib_util.hpux.vers
+   M builds/posix/ib_util.vers
+   M builds/posix/make.defaults
+   M builds/posix/make.platform.solaris.examples
+   M builds/posix/make.rules
+   M builds/posix/make.shared.targets
+   M builds/posix/make.shared.variables
+   M builds/posix/postfix.darwin
+   M builds/posix/prefix.aix_powerpc
+   M builds/posix/prefix.aix_powerpc_xlc
+   M builds/posix/prefix.darwin_i386
+   M builds/posix/prefix.darwin_powerpc
+   M builds/posix/prefix.darwin_ppc64
+   M builds/posix/prefix.darwin_x86_64
+   M builds/posix/prefix.example
+   M builds/posix/prefix.freebsd
+   M builds/posix/prefix.freebsd_amd64
+   M builds/posix/prefix.hpux
+   M builds/posix/prefix.hpux_aCC
+   M builds/posix/prefix.hpux_ia64
+   M builds/posix/prefix.linux
+   M builds/posix/prefix.linux_amd64
+   M builds/posix/prefix.linux_arm
+   M builds/posix/prefix.linux_generic
+   M builds/posix/prefix.linux_ia64
+   M builds/posix/prefix.linux_mips
+   M builds/posix/prefix.linux_mipsel
+   M builds/posix/prefix.linux_powerpc
+   M builds/posix/prefix.linux_s390x
+   M builds/posix/prefix.linux_sparc32
+   M builds/posix/prefix.mingw
+   M builds/posix/prefix.netbsd
+   M builds/posix/prefix.solaris
+   M builds/posix/prefix.solaris-64gcc
+   M builds/posix/prefix.solx86
+   M builds/posix/prefix.solx86gcc
+   M builds/posix/prefix.solx86gcc_64
+   M builds/win32/adjust_vc7_files.cmd
+   M builds/win32/blrtable.bat
+   M builds/win32/clean_all.bat
+   M builds/win32/compile.bat
+   M builds/win32/create_msgs.bat
+   M builds/win32/defs/build.def
+   M builds/win32/defs/burp.def
+   M builds/win32/defs/burp32.def
+   M builds/win32/defs/dsql.def
+   M builds/win32/defs/fbclient.def
+   M builds/win32/defs/fbclient_s.def
+   M builds/win32/defs/fbrmclib.def
+   M builds/win32/defs/gds32.def
+   M builds/win32/defs/ib_udf.def
+   M builds/win32/defs/ib_util.def
+   M builds/win32/defs/intl.def
+   M builds/win32/defs/isql.def
+   M builds/win32/defs/iutls.def
+   M builds/win32/defs/jrd.def
+   M builds/win32/defs/remote.def
+   M builds/win32/defs/utls.def
+   M builds/win32/make_all.bat
+   M builds/win32/make_boot.bat
+   M builds/win32/make_examples.bat
+   M builds/win32/make_icu.bat
+   M builds/win32/msvc7/Firebird2.sln
+   M builds/win32/msvc7/Firebird2Boot.sln
+   M builds/win32/msvc7/Firebird2_Examples.sln
+   M builds/win32/msvc7/alice.vcproj
+   M builds/win32/msvc7/btyacc.vcproj
+   M builds/win32/msvc7/build_msg.vcproj
+   M builds/win32/msvc7/burp.vcproj
+   M builds/win32/msvc7/codes.vcproj
+   M builds/win32/msvc7/common.vcproj
+   M builds/win32/msvc7/common_classic.vcproj
+   M builds/win32/msvc7/common_static.vcproj
+   M builds/win32/msvc7/config.vcproj
+   M builds/win32/msvc7/dsql_server.vcproj
+   M builds/win32/msvc7/dsql_server_classic.vcproj
+   M builds/win32/msvc7/empbuild.vcproj
+   M builds/win32/msvc7/engine.vcproj
+   M builds/win32/msvc7/engine_classic.vcproj
+   M builds/win32/msvc7/engine_embed.vcproj
+   M builds/win32/msvc7/fb2control.vcproj
+   M builds/win32/msvc7/fb_inet_server.vcproj
+   M builds/win32/msvc7/fb_lock_print.vcproj
+   M builds/win32/msvc7/fbclient.vcproj
+   M builds/win32/msvc7/fbclient_static.vcproj
+   M builds/win32/msvc7/fbembed.vcproj
+   M builds/win32/msvc7/fbguard.vcproj
+   M builds/win32/msvc7/fbrmclib.vcproj
+   M builds/win32/msvc7/fbserver.vcproj
+   M builds/win32/msvc7/fbsvcmgr.vcproj
+   M builds/win32/msvc7/fbtrace.vcproj
+   M builds/win32/msvc7/fbtracemgr.vcproj
+   M builds/win32/msvc7/fbudf.vcproj
+   M builds/win32/msvc7/gbak.vcproj
+   M builds/win32/msvc7/gbak_embed.vcproj
+   M builds/win32/msvc7/gdef.vcproj
+   M builds/win32/msvc7/gds32.vcproj
+   M builds/win32/msvc7/gfix.vcproj
+   M builds/win32/msvc7/gpre.vcproj
+   M builds/win32/msvc7/gpre_boot.vcproj
+   M builds/win32/msvc7/gpre_embed.vcproj
+   M builds/win32/msvc7/gpre_static.vcproj
+   M builds/win32/msvc7/gsec.vcproj
+   M builds/win32/msvc7/gsplit.vcproj
+   M builds/win32/msvc7/gstat.vcproj
+   M builds/win32/msvc7/ib_udf.vcproj
+   M builds/win32/msvc7/ib_util.vcproj
+   M builds/win32/msvc7/instclient.vcproj
+   M builds/win32/msvc7/instreg.vcproj
+   M builds/win32/msvc7/instsvc.vcproj
+   M builds/win32/msvc7/intl.vcproj
+   M builds/win32/msvc7/intlbuild.vcproj
+   M builds/win32/msvc7/isql.vcproj
+   M builds/win32/msvc7/isql_embed.vcproj
+   M builds/win32/msvc7/lock.vcproj
+   M builds/win32/msvc7/lock_classic.vcproj
+   M builds/win32/msvc7/nbackup.vcproj
+   M builds/win32/msvc7/qli.vcproj
+   M builds/win32/msvc7/remote.vcproj
+   M builds/win32/msvc7/remote_classic.vcproj
+   M builds/win32/msvc7/utilities.vcproj
+   M builds/win32/msvc7/utilities_embed.vcproj
+   M builds/win32/msvc7/v5_examples.vcproj
+   M builds/win32/msvc8/DllNoEmbedManifest.vsprops
+   M builds/win32/msvc8/Firebird2.sln
+   M builds/win32/msvc8/Firebird2Boot.sln
+   M builds/win32/msvc8/Firebird2_Examples.sln
+   M builds/win32/msvc8/VCCRT_Shared_Body.wxi
+   M builds/win32/msvc8/VCCRT_Shared_Header.wxi
+   M builds/win32/msvc8/VCCRT_Win32.wxi
+   M builds/win32/msvc8/VCCRT_Win32.wxs
+   M builds/win32/msvc8/VCCRT_x64.wxi
+   M builds/win32/msvc8/VCCRT_x64.wxs
+   M builds/win32/msvc8/alice.vcproj
+   M builds/win32/msvc8/asInvoker.manifest
+   M builds/win32/msvc8/asInvokerManifest.vsprops
+   M builds/win32/msvc8/btyacc.vcproj
+   M builds/win32/msvc8/build_msg.vcproj
+   M builds/win32/msvc8/burp.vcproj
+   M builds/win32/msvc8/codes.vcproj
+   M builds/win32/msvc8/common.vcproj
+   M builds/win32/msvc8/common_classic.vcproj
+   M builds/win32/msvc8/common_static.vcproj
+   M builds/win32/msvc8/config.vcproj
+   M builds/win32/msvc8/dsql_server.vcproj
+   M builds/win32/msvc8/dsql_server_classic.vcproj
+   M builds/win32/msvc8/empbuild.vcproj
+   M builds/win32/msvc8/engine.vcproj
+   M builds/win32/msvc8/engine_classic.vcproj
+   M builds/win32/msvc8/engine_embed.vcproj
+   M builds/win32/msvc8/fb2control.vcproj
+   M builds/win32/msvc8/fb_inet_server.vcproj
+   M builds/win32/msvc8/fb_lock_print.vcproj
+   M builds/win32/msvc8/fbclient.vcproj
+   M builds/win32/msvc8/fbclient_static.vcproj
+   M builds/win32/msvc8/fbembed.vcproj
+   M builds/win32/msvc8/fbguard.vcproj
+   M builds/win32/msvc8/fbrmclib.vcproj
+   M builds/win32/msvc8/fbserver.vcproj
+   ...
 
[truncated message content] | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-14 03:17:42
       
   | 
Revision: 51448
          http://firebird.svn.sourceforge.net/firebird/?rev=51448&view=rev
Author:   firebirds
Date:     2010-08-14 03:17:34 +0000 (Sat, 14 Aug 2010)
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	2010-08-14 03:14:17 UTC (rev 51447)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-14 03:17:34 UTC (rev 51448)
@@ -4362,18 +4362,10 @@
    M src/vulcan/RefObject.h
 Set svn:eol-style to native
 
- 2010-05-22 12:59  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-21 15:35  dimitr 
    M doc/WhatsNew
 Update.
 
- 2010-05-21 13:00  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-21 08:24  dimitr 
    M src/common/classes/alloc.cpp
 Fixed unregistered bug: MON$MEMORY_USED for connection/database is bigger than MON$MEMORY_ALLOCATED.
@@ -4385,10 +4377,6 @@
    M src/misc/writeBuildNum.sh
 Update.
 
- 2010-05-20 12:58  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-20 10:36  alexpeshkoff 
    M src/lock/lock.cpp
 Fixed and improved diagnostics when thread failed to start
@@ -4405,10 +4393,6 @@
    M src/utilities/ntrace/TracePluginImpl.cpp
 Improvement CORE-3008 :  Add attachment's CHARACTER SET name into corresponding trace records
 
- 2010-05-19 13:00  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-18 21:57  hvlad 
    M src/jrd/ntrace.h
    M src/jrd/trace/TraceObjects.cpp
@@ -4416,10 +4400,6 @@
    M src/utilities/ntrace/TracePluginImpl.cpp
 Fixed bug CORE-2981 : Error in Trace plugin (use local symbols in query)
 
- 2010-05-18 12:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-18 10:38  alexpeshkoff 
    M src/jrd/os/posix/os_utils.cpp
 Backported fix for CORE-3006: /tmp/firebird and files in it may get 'root' (i.e. GID == 0) group
@@ -4446,10 +4426,6 @@
    M src/jrd/evl_proto.h
 Backport fix for CORE-2826 - Join condition fails for UTF-8 databases
 
- 2010-05-17 13:07  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-17 10:39  alexpeshkoff 
    M autogen.sh
 Backported fix for CORE-2862: configure --with-fbudf breaks build on CentOS
@@ -4470,10 +4446,6 @@
    M src/jrd/par.cpp
 Correction for my prior fix.
 
- 2010-05-11 13:03  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-11 11:57  alexpeshkoff 
    M builds/install/misc/posixLibrary.sh.in
 Fixed CORE-3001: Install fails to create user & group "firebird"
@@ -4483,18 +4455,10 @@
    M src/jrd/jrd_pwd.h
 Misc.
 
- 2010-05-08 12:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-07 15:29  asfernandes 
    M src/dsql/dsql.cpp
 Subtask CORE-2996 - Fix error code incompatibility introduced in fix for CORE-2552
 
- 2010-05-07 12:59  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-07 11:21  hvlad 
    M src/remote/interface.cpp
 Fixed bug CORE-2995 : Same error in status vector reported twice
@@ -4521,10 +4485,6 @@
    M src/utilities/gstat/ppg.cpp
 Backported fix for CORE-2984: gbak -v srv:db stdout creates a broken backup
 
- 2010-05-06 12:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-06 12:26  hvlad 
    M src/jrd/jrd.cpp
 Comments for patch for CORE-2993
@@ -4534,10 +4494,6 @@
    M src/jrd/jrd.cpp
 Fixed bug CORE-2993 : Fatal lock manager error "Invalid lock id (NNN)" while working with monitoring tables on a highly loaded system
 
- 2010-05-05 12:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-05-05 12:33  dimitr 
    M doc/WhatsNew
    M src/jrd/build_no.h
@@ -4550,10 +4506,6 @@
    M src/jrd/pwd.cpp
 Fixed unregistered bug (added by me at RC3 stage): wrong mutex when shutting down security database
 
- 2010-04-29 12:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-29 11:16  hvlad 
    M src/jrd/trace/TraceConfigStorage.cpp
 More explicit error message
@@ -4605,23 +4557,11 @@
    M builds/win32/msvc7/qli.vcproj
 Update MSVC7 build
 
- 2010-04-26 13:00  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-26 12:18  hvlad 
    M src/jrd/btr.cpp
    M src/jrd/btr.h
 Fixed bug CORE-2977 : FB 2.1 incorrectly works with indexed fields of type DATE in OLD ODS (9.1)
 
- 2010-04-22 12:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
- 2010-04-21 12:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-21 12:53  dimitr 
    M doc/WhatsNew
    M src/jrd/build_no.h
@@ -4633,10 +4573,6 @@
    M src/jrd/isc.h
 Backported fix for CORE-2896: Embedded connections done by root (like gbak, gsec, gfix) hang in linux
 
- 2010-04-20 12:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-20 11:08  alexpeshkoff 
    M src/jrd/trace/TraceConfigStorage.cpp
    M src/jrd/trace/TraceConfigStorage.h
@@ -4646,10 +4582,6 @@
    M src/remote/inet_server.cpp
 Fixed use of debugging switch in classic mode
 
- 2010-04-19 12:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-19 11:24  alexpeshkoff 
    M configure.in
    M src/jrd/os/posix/os_utils.cpp
@@ -4668,28 +4600,16 @@
 Fixed bug CORE-2917 : Sever Hangs on I/O error during "open" operation for file "/tmp/firebird/fb_trace_ksVDoc".
 Posix part will follow soon (by Alex).
 
- 2010-04-17 12:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-16 14:01  alexpeshkoff 
    M configure.in
 Patch from Damyan Ivanov to better detect some GNU OSes
 
- 2010-04-16 13:01  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-16 03:51  dimitr 
    M src/jrd/exe.cpp
    M src/jrd/req.h
    M src/jrd/rse.cpp
 Fixed CORE-2965: Incorrect ROW_COUNT value after SINGULAR condition.
 
- 2010-04-14 12:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-14 09:58  dimitr 
    M src/jrd/jrd_pwd.h
    M src/jrd/pwd.cpp
@@ -4707,10 +4627,6 @@
    M src/jrd/met.epp
 Fix for bug CORE-2956 : Problems with requests of procedure's parameters.
 
- 2010-04-13 12:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-13 08:11  dimitr 
    M src/jrd/os/win32/winnt.cpp
 Correction.
@@ -4723,10 +4639,6 @@
    M src/common/classes/TempFile.cpp
 Fixed CORE-2966: Wrong results or unexpected errors while sorting a large data set.
 
- 2010-04-09 12:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-09 08:02  dimitr 
    M src/include/gen/sql_state.h
 Corrections for SQL states.
@@ -4736,42 +4648,22 @@
    M src/msgs/system_errors2.sql
 Corrections for SQL states.
 
- 2010-04-08 12:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-08 04:00  dimitr 
    M src/jrd/dyn.epp
 Removed the wrong assertion. In fact, the buffer can be larger than 64K, despite what the [unused] length argument suggests.
 
- 2010-04-03 12:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-04-02 16:48  alexpeshkoff 
    M builds/install/misc/posixLibrary.sh.in
 misc
 
- 2010-03-31 12:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-31 08:39  alexpeshkoff 
    M configure.in
 Fixed libatomic_ops detection. This should help with linux/hppa build
 
- 2010-03-30 12:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-29 15:24  alexpeshkoff 
    M src/remote/inet_server.cpp
 Backported fix for CORE-2948: Segfault when server is exiting
 
- 2010-03-29 12:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-29 07:39  dimitr 
    M src/jrd/build_no.h
    M src/jrd/isc_version.h
@@ -4788,10 +4680,6 @@
    M src/misc/writeBuildNum.sh
 Update.
 
- 2010-03-27 13:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-26 15:36  hvlad 
    M src/utilities/ntrace/TraceConfiguration.cpp
    M src/utilities/ntrace/TracePluginImpl.cpp
@@ -4805,14 +4693,6 @@
    M src/jrd/SimilarToMatcher.h
 Additional fix for bug CORE-2934 : Memory leak in FB2.5 trace plugin
 
- 2010-03-26 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
- 2010-03-25 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-25 13:50  hvlad 
    M src/dsql/dsql.h
    M src/dsql/pass1.cpp
@@ -4822,10 +4702,6 @@
    M src/lock/lock.cpp
 Fixed CORE-2942: Huge (>10Gb) memory consumption by some fb_inet_server processes
 
- 2010-03-24 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-24 12:50  alexpeshkoff 
    M builds/posix/Makefile.in.fbtrace
 fixed posic build
@@ -4849,36 +4725,20 @@
    M src/utilities/ntrace/TracePluginImpl.cpp
 Fixed bug CORE-2940 : Trace output could contain garbage data left from filtered out statements
 
- 2010-03-23 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-22 22:48  hvlad 
    M src/jrd/btr.cpp
    M src/jrd/ods.h
 Fixed bug CORE-2936 : Wrong page type (expected 7 found N) error
 
- 2010-03-21 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-20 19:12  asfernandes 
    M src/dsql/ddl.cpp
    M src/jrd/dyn_mod.epp
 Fixed CORE-2923 - Problem with dependencies between a procedure and a view using that procedure
 
- 2010-03-19 13:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-19 00:50  asfernandes 
    M src/jrd/dyn_del.epp
 Fixed CORE-2930 - DROP VIEW drops output parameters of used stored procedures
 
- 2010-03-18 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-18 10:33  hvlad 
    M doc/sql.extensions/README.execute_statement2
 Update documentation
@@ -4889,10 +4749,6 @@
    M src/jrd/extds/InternalDS.cpp
 Fixed bug CORE-2907 : Exception handling with EXECUTE STATEMENT
 
- 2010-03-17 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-17 10:08  alexpeshkoff 
    M src/utilities/gsec/security.epp
 Backported fix for CORE-2928: Buffer overflow in gsec
@@ -4901,10 +4757,6 @@
    M src/jrd/os/win32/mod_loader.cpp
 Fixed bug CORE-2628 : FB 2.5-beta2-win32 denied FreeAdhocUDF library functions
 
- 2010-03-16 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-16 10:21  alexpeshkoff 
    M src/jrd/jrd.cpp
    M src/jrd/jrd.h
@@ -4921,10 +4773,6 @@
    M builds/install/arch-specific/linux/Makefile.in
 Backported fix for CORE-2926: "make install" fails on linux
 
- 2010-03-15 14:00  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-15 11:59  alexpeshkoff 
    M builds/install/arch-specific/freebsd/install.sh.in
 freebsd port
@@ -4937,10 +4785,6 @@
    M builds/posix/Makefile.in.embed.util
 Backported fix for CORE-2844: Unresolved symbol references when linking fbsvcmgr and fbtracemgr
 
- 2010-03-13 13:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-13 10:50  dimitr 
    M doc/WhatsNew
 Update.
@@ -4965,10 +4809,6 @@
    M configure.in
 CORE-2921: backported changes from HEAD
 
- 2010-03-12 13:58  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-11 14:58  alexpeshkoff 
    M builds/install/arch-specific/aix/misc/postinstall.sh.in
    M builds/install/arch-specific/hpux/super/postInstall.sh.in
@@ -4977,10 +4817,6 @@
    M builds/install/arch-specific/netbsd/install.sh.in
 Backported fix for CORE-2919: Installation script ignores non-standard ports
 
- 2010-03-11 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-10 18:43  dimitr 
    M src/jrd/fun.epp
 Correction.
@@ -4998,10 +4834,6 @@
    M src/jrd/idx.cpp
 Fixed CORE-2916: Broken error handling in the case of a conversion error happened during index creation.
 
- 2010-03-10 13:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-09 18:55  asfernandes 
    M builds/win32/setenvvar.bat
 Ability to build with VS 2008 Express
@@ -5010,10 +4842,6 @@
    M src/dsql/gen.cpp
 Backport change that fix CORE-2910, found by Dmitry
 
- 2010-03-07 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-06 14:26  hvlad 
    M src/jrd/Database.h
    M src/jrd/cmp.cpp
@@ -5025,10 +4853,6 @@
    M src/jrd/vio.cpp
 Fixed bug CORE-2908 : Engine could crash or raise not expected errors working with ODS 8.x database
 
- 2010-03-05 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-03-05 02:00  asfernandes 
    M src/jrd/SysFunction.cpp
    M src/jrd/os/guid.h
@@ -5039,26 +4863,14 @@
    M src/utilities/nbackup.cpp
 Backport fix for CORE-2898 - CHAR_TO_UUID and UUID_TO_CHAR works different in big/little endian architectures
 
- 2010-03-01 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-28 14:42  asfernandes 
    M src/dsql/pass1.cpp
 Backport fix for CORE-2888 - A memory corruption cause incorrect query evaluation and may crash the server
 
- 2010-02-28 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-27 18:22  asfernandes 
    M src/jrd/cmp.cpp
 Fixed CORE-2886 - Query with "NOT IN <subselect from view>" fails
 
- 2010-02-26 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-26 07:53  dimitr 
    M src/jrd/Optimizer.cpp
    M src/jrd/btr.cpp
@@ -5078,27 +4890,15 @@
    M src/misc/writeBuildNum.sh
 Update.
 
- 2010-02-25 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-25 10:04  dimitr 
    M src/jrd/ini.epp
 Fixed the accidentally broken security on system tables.
 
- 2010-02-23 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-23 07:08  robocop 
    M src/jrd/drq.h
    M src/jrd/dyn_mod.epp
 Backport CORE-2750: Physical backup cannot restart operations after the explicit difference file has been dropped.
 
- 2010-02-22 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-22 10:16  hvlad 
    M src/jrd/vio.cpp
 Fixed bug CORE-2879 : Sweep could raise error : page 0 is of wrong type (expected 6, found 1)
@@ -5111,52 +4911,28 @@
    M configure.in
 freebsd port
 
- 2010-02-19 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-19 10:10  asfernandes 
    M src/jrd/intl.cpp
 Fixed CORE-2875 - String right truncation error when char column longer than 4096 bytes is compared with string constant
 
- 2010-02-17 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-16 14:35  dimitr 
    M src/jrd/opt.cpp
 Fixed CORE-1089: Wrong ordering with views, distinct, left join and order by
 and CORE-2871: Outer ORDER BY clause has no effect.
 
- 2010-02-15 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-14 22:56  hvlad 
    M src/jrd/cch.cpp
 Fixed bug CORE-2867 : SuperClassic leaks semaphores on disconnect
 
- 2010-02-14 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-14 12:14  hvlad 
    M src/remote/inet.cpp
 Fixed bug CORE-2864 : Listener process of Classic Server leak handles.
 The code, removed in rev. 1.296, was and is relevant :)
 
- 2010-02-12 13:58  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-12 11:23  robocop 
    M src/jrd/vio.cpp
 Backport CORE-2858: Possible memory trashing when raising some exceptions to signal failed security checks. Thanks Dmitry.
 
- 2010-02-11 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-11 06:45  robocop 
    M src/jrd/btr.cpp
 Misc.
@@ -5170,51 +4946,27 @@
    M src/jrd/btr.cpp
 Fixed bug CORE-2586 : Non-NULL key in unique index could be not found when key is removed
 
- 2010-02-09 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-08 14:49  hvlad 
    M src/dsql/dsql.cpp
 Fixed bug CORE-2852 : Server crash when executing syntactical wrong SQL statement with an active trace session
 
- 2010-02-08 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-08 13:30  hvlad 
    M src/remote/interface.cpp
 Fixed bug CORE-2851 : problem with fb_cancel_operation
 
- 2010-02-07 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-07 10:29  alexpeshkoff 
    M src/common/fb_exception.cpp
 Fixed copy of cstring in status vector
 
- 2010-02-06 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-06 04:13  robocop 
    M src/jrd/common.h
 Totally misc.
 
- 2010-02-05 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-05 11:04  alexpeshkoff 
    M src/jrd/RecordNumber.h
    M src/jrd/rpb_chain.cpp
 Backported fix for CORE-195: Bugcheck 291
 
- 2010-02-04 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-04 12:44  paulbeach 
    M src/jrd/common.h
 Additional  re. Solaris 256 fd issue In 2.5+ this affects superclassic
@@ -5235,20 +4987,12 @@
    M configure.in
 Applied last patch from CORE-2825, sligtly modified
 
- 2010-02-03 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-03 11:56  alexpeshkoff 
    M builds/posix/prefix.freebsd
    M builds/posix/prefix.freebsd_amd64
    M src/utilities/nbackup.cpp
 Partially applied Damyan's patches from CORE-2825
 
- 2010-02-02 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-02 12:19  alexpeshkoff 
    M src/jrd/cch.cpp
 Corrected fix for CORE-2842 - thanks to Vlad
@@ -5295,10 +5039,6 @@
    M src/remote/xnet.cpp
 Fixed CORE-2836: fb_cancel_operation() incorrectly modifies rdb_status_vector
 
- 2010-02-01 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-02-01 10:38  hvlad 
    M src/utilities/ntrace/fbtrace.conf
 Improvement CORE-2821 : Add indication about log size limit for trace API
@@ -5321,10 +5061,6 @@
 Temporary fix for CORE-2828
 Update major.minor version string that displays in the system-level Control Panel screen
 
- 2010-01-29 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-29 11:34  alexpeshkoff 
    M builds/install/arch-specific/freebsd/install.sh.in
    A builds/posix/prefix.freebsd_amd64
@@ -5341,10 +5077,6 @@
    M doc/WhatsNew
 Update.
 
- 2010-01-28 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-28 08:18  robocop 
    M src/isql/isql.epp
 Backport CORE-2735: isql hangs when trying to show a view based on a procedure.
@@ -5357,10 +5089,6 @@
    M doc/README.trace_services
 Misc.
 
- 2010-01-27 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-27 11:51  hvlad 
    M doc/README.trace_services
 Update documentation
@@ -5381,10 +5109,6 @@
    M src/jrd/pcmet.epp
 Backport: fix misinterpretation of MET_get_dependencies's parameters done years ago with conversion to MetaName class.
 
- 2010-01-26 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-26 09:12  dimitr 
    M src/jrd/build_no.h
    M src/jrd/isc_version.h
@@ -5399,18 +5123,10 @@
    M src/jrd/cch.cpp
 Additional patch for bug CORE- 2824 : Small memory and handles leak at every connect\disconnect
 
- 2010-01-25 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-25 08:42  robocop 
    M src/jrd/dyn_util.epp
 Misc.
 
- 2010-01-24 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-23 16:13  hvlad 
    M src/jrd/Database.cpp
    M src/jrd/ini.epp
@@ -5418,27 +5134,15 @@
    M src/jrd/why.cpp
 Fixed bug CORE-2824 : Small memory and handles leak at every connect\disconnect
 
- 2010-01-23 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-22 14:09  dimitr 
    M src/jrd/Optimizer.cpp
 Fixed CORE-2822: Error "no current row for fetch operation" when subquery includes a non-trivial derived table.
 
- 2010-01-20 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-20 10:21  hvlad 
    M src/jrd/rse.cpp
 Fixed bug CORE-2817 : If stored procedure or trigger contains query with PLAN ORDER it could fail after disconnect of attachment where procedure\trigger executed first time
 and bug CORE-2820 : Small memory leak in query with PLAN ORDER
 
- 2010-01-19 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-19 08:50  hvlad 
    M src/jrd/pag.cpp
 Fixed bug CORE-2185 : PIP page could be marked after it was really changed
@@ -5447,10 +5151,6 @@
    M src/jrd/TempSpace.cpp
 Fixed bug CORE-2184 : Bus error on SPARC
 
- 2010-01-15 13:58  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-15 10:10  dimitr 
    M src/burp/backup.epp
 Fixed a typo.
@@ -5465,27 +5165,11 @@
 Fixed CORE-2811: 'Unsuccessful execution' error when updating a record.
 The first BLR after blr_label must be blr_begin.
 
- 2010-01-06 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2010-01-06 09:05  dimitr 
    M builds/win32/defs/fbclient.def
    M builds/win32/defs/fbclient_s.def
 Added the missing public entrypoint.
 
- 2010-01-02 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
- 2010-01-01 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
- 2009-12-29 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-29 10:56  dimitr 
    M src/utilities/nbackup.cpp
 Support the -D switch on Windows.
@@ -5496,28 +5180,16 @@
    M src/misc/writeBuildNum.sh
 Update.
 
- 2009-12-25 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-24 14:43  asfernandes 
    M src/jrd/Relation.h
    M src/jrd/met.epp
    M src/jrd/tra.cpp
 Fix problem with table reservation and views based in procedures
 
- 2009-12-21 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-21 00:50  asfernandes 
    M src/isql/isql.epp
 Fixed CORE-2735 - isql hangs when trying to show a view based on a procedure
 
- 2009-12-19 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-19 01:55  asfernandes 
    M src/dsql/Parser.cpp
    M src/dsql/ddl.cpp
@@ -5529,18 +5201,10 @@
    M src/dsql/parse.y
 Backported fix for unregistered bug: Query string crashes 2.5RC1
 
- 2009-12-18 13:59  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-18 10:21  asfernandes 
    M src/jrd/dyn_mod.epp
 Fixed unregistered bug: ALTER VIEW drops permissions
 
- 2009-12-17 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-17 13:10  alexpeshkoff 
    M lang_helpers/gds_codes.ftn
    M lang_helpers/gds_codes.pas
@@ -5604,10 +5268,6 @@
    M src/utilities/gsec/gsecswi.h
 correct switch length
 
- 2009-12-16 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-16 13:49  alexpeshkoff 
    M src/common/classes/ClumpletReader.cpp
    M src/include/consts_pub.h
@@ -5651,10 +5311,6 @@
    M src/jrd/trace/TraceLog.cpp
 Backported fix for CORE-2807: Problem with tracing on linux
 
- 2009-12-14 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-14 13:07  robocop 
    M src/dsql/pass1.cpp
 Misc.
@@ -5663,18 +5319,10 @@
    M src/jrd/par.cpp
 Fixed CORE-2806: Views based on procedures can't be created if the proc's output fields participate in an expression.
 
- 2009-12-13 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-12 17:22  hvlad 
    M src/dsql/parse.y
 Backport fix for bug CORE-2797 : Problem with default value of SP parameter
 
- 2009-12-11 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-10 15:35  hvlad 
    M src/dsql/pass1.cpp
 Fixed bug CORE-2783 : AV using recursive query as subquery in SELECT list and ORDER'ing by them
@@ -5686,18 +5334,10 @@
    M src/jrd/par.cpp
 Fixed (hopefully) CORE-2798: Incomplete plan output (lack of view names) when selecting from views containing procedures inside.
 
- 2009-12-08 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-07 16:17  dimitr 
    M src/lock/print.cpp
 Fixed the interactive lock print header for waits. It was showing non-supported columns.
 
- 2009-12-07 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-07 10:33  alexpeshkoff 
    M src/jrd/jrd.cpp
 Fixed issue detected by QA - non-members of group 'firebird' cannot access remote server
@@ -5710,10 +5350,6 @@
    M builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
 Fixed once more issue detected by QA - all scripts except gentoo's were not setting correct access rights on /tmp/firebird
 
- 2009-12-05 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-05 12:52  robocop 
    M src/isql/extract.epp
 Backport CORE-2792: Bad extraction syntax for procedure's parameter based on table's field
@@ -5726,10 +5362,6 @@
    M src/remote/inet.cpp
 Fixed an issue, detected during 2.5.0.RC1 QA - a lot of same messages in the log
 
- 2009-12-04 13:55  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-04 11:44  hvlad 
    M src/remote/server.cpp
 Fixed bug CORE-2670 : FB 2.5 freezes during data pump operations
@@ -5752,20 +5384,12 @@
    M src/jrd/filters.cpp
 Fixed CORE-2785 - Transliteration error with COMMENT statement
 
- 2009-12-03 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-03 03:33  robocop 
    M src/jrd/svc.cpp
    M src/jrd/svc.h
    M src/utilities/ntrace/fbtrace.conf
 Misc.
 
- 2009-12-02 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-01 14:32  hvlad 
    M src/jrd/trace/TraceCmdLine.cpp
 Fixed bug CORE-2781 : AV in fbtracemgr when command line swithes set wrongly
@@ -5781,10 +5405,6 @@
    M src/utilities/fbtracemgr/traceMgrMain.cpp
 Cleanup
 
- 2009-12-01 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-12-01 12:04  alexpeshkoff 
    M src/utilities/fbsvcmgr.cpp
 Backported fix for CORE-2779: User list header is displayed at the end of each returning data call to fbsvcmgr
@@ -5805,10 +5425,6 @@
    M configure.in
 Bacported fix for CORE-2775: Linux packages miss fbtrace.conf
 
- 2009-11-30 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-30 13:05  alexpeshkoff 
    M src/common/fb_exception.cpp
    M src/common/thd.cpp
@@ -5870,18 +5486,10 @@
    M src/jrd/trig.h
 Backported fix for CORE-2765: Use of RDB$ADMIN role does not provide SYSDBA rights in GRANT/REVOKE
 
- 2009-11-29 13:53  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-28 22:28  dimitr 
    M src/jrd/dfw.epp
 Fixed bug in my recent commit.
 
- 2009-11-28 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-28 13:10  dimitr 
    M doc/WhatsNew
    M src/jrd/build_no.h
@@ -5894,10 +5502,6 @@
    M src/remote/xnet.h
 Fixed CORE-2769: Make XNET_CONNECT_TIMEOUT in xnet.h user configurable.
 
- 2009-11-27 13:56  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-27 13:27  dimitr 
    M src/jrd/Relation.h
    M src/jrd/dfw.epp
@@ -5913,10 +5517,6 @@
    M src/jrd/dyn_del.epp
 Backported fix for CORE-2768: ALTERING OR DROPPING PROCEDURE which has type of domain parameter leads to attempt to delete that domain
 
- 2009-11-25 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-25 10:48  hvlad 
    M src/jrd/Relation.cpp
 Fixed bug CORE-2771 : AV at backup of database with GTT
@@ -5952,10 +5552,6 @@
    M src/utilities/ntrace/TracePluginImpl.cpp
 Fixed untracked bug (was not reported for any public version) - trace did not work with non-3.0 icu version
 
- 2009-11-20 13:57  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-19 14:27  asfernandes 
    M lang_helpers/gds_codes.ftn
    M lang_helpers/gds_codes.pas
@@ -5970,35 +5566,19 @@
    M src/msgs/system_errors2.sql
 Backport improvement CORE-2754 - Hint the user about -FIX_FSS_METADATA and -FIX_FSS_DATA when restore fail with malformed string error
 
- 2009-11-19 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-18 18:58  asfernandes 
    M src/jrd/SimilarToMatcher.h
 Backport fix for CORE-2755 - SIMILAR TO works wrongly
 
- 2009-11-17 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-16 14:22  hvlad 
    M doc/README.trace_services
    M src/utilities/ntrace/fbtrace.conf
 Correction of example
 
- 2009-11-16 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-15 18:53  asfernandes 
    M src/common/fb_exception.cpp
 Fix typo
 
- 2009-11-15 13:54  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-15 12:43  alexpeshkoff 
    M src/utilities/gsec/security.epp
 Additions for CORE-2748 - thanks to Adriano and Claudio
@@ -6009,10 +5589,6 @@
    M builds/win32/msvc9/instsvc.vcproj
 Put the correct information for UAC in VC9.
 
- 2009-11-14 19:00  fsg 
-   M ChangeLog
-nightly update B2_5_Release
-
  2009-11-14 07:22  robocop 
    M src/msgs/history2.sql
    M src/utilities/gsec/gsec.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-14 03:14:17 UTC (rev 51447)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-14 03:17:34 UTC (rev 51448)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26068
+  FORMAL BUILD NUMBER:25962
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26068"
-#define FILE_VER_STRING "WI-V2.5.0.26068"
-#define LICENSE_VER_STRING "WI-V2.5.0.26068"
-#define FILE_VER_NUMBER 2, 5, 0, 26068
+#define PRODUCT_VER_STRING "2.5.0.25962"
+#define FILE_VER_STRING "WI-V2.5.0.25962"
+#define LICENSE_VER_STRING "WI-V2.5.0.25962"
+#define FILE_VER_NUMBER 2, 5, 0, 25962
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26068"
+#define FB_BUILD_NO "25962"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-14 03:14:17 UTC (rev 51447)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-14 03:17:34 UTC (rev 51448)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26068
+BuildNum=25962
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-24 03:16:05
       
   | 
Revision: 51463
          http://firebird.svn.sourceforge.net/firebird/?rev=51463&view=rev
Author:   firebirds
Date:     2010-08-24 03:15:58 +0000 (Tue, 24 Aug 2010)
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	2010-08-23 11:39:40 UTC (rev 51462)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-24 03:15:58 UTC (rev 51463)
@@ -1,3 +1,11 @@
+ 2010-08-23 11:39  alexpeshkoff 
+   M src/utilities/gsec/gsec.cpp
+Fixed CORE-3116: gsec outputs list of users to stderr instead stdout
+
+ 2010-08-23 10:06  alexpeshkoff 
+   M src/jrd/sqz.cpp
+Applied suggested by Dmitry Kovalenko fix - it helps avoid AV when buffer is allocated exactly at the end of physical memory segment
+
  2010-08-11 10:50  dimitr 
    M src/jrd/Optimizer.cpp
    M src/jrd/Optimizer.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-23 11:39:40 UTC (rev 51462)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-24 03:15:58 UTC (rev 51463)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:25962
+  FORMAL BUILD NUMBER:25964
 */
 
-#define PRODUCT_VER_STRING "2.5.0.25962"
-#define FILE_VER_STRING "WI-V2.5.0.25962"
-#define LICENSE_VER_STRING "WI-V2.5.0.25962"
-#define FILE_VER_NUMBER 2, 5, 0, 25962
+#define PRODUCT_VER_STRING "2.5.0.25964"
+#define FILE_VER_STRING "WI-V2.5.0.25964"
+#define LICENSE_VER_STRING "WI-V2.5.0.25964"
+#define FILE_VER_NUMBER 2, 5, 0, 25964
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "25962"
+#define FB_BUILD_NO "25964"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-23 11:39:40 UTC (rev 51462)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-24 03:15:58 UTC (rev 51463)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=25962
+BuildNum=25964
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-24 08:39:22
       
   | 
Revision: 51466
          http://firebird.svn.sourceforge.net/firebird/?rev=51466&view=rev
Author:   firebirds
Date:     2010-08-24 08:39:15 +0000 (Tue, 24 Aug 2010)
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	2010-08-24 08:27:22 UTC (rev 51465)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-24 08:39:15 UTC (rev 51466)
@@ -18032,7 +18032,7 @@
  2008-11-29 18:47  asfernandes 
    M src/jrd/DataTypeUtil.cpp
    M src/jrd/DataTypeUtil.h
-Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation).
+Fixed CORE-2019 – UTF-8 conversion error (string truncation).
 
  2008-11-28 18:49  alexpeshkoff 
    M src/common/classes/SafeArg.cpp
@@ -20384,7 +20384,7 @@
 
  2008-07-16 14:16  asfernandes 
    M src/jrd/idx.cpp
-Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint
+Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint
 
  2008-07-16 13:55  asfernandes 
    M src/jrd/Optimizer.cpp
@@ -21392,7 +21392,7 @@
  2008-06-14 02:17  asfernandes 
    M doc/sql.extensions/README.similar_to.txt
    M src/jrd/SimilarToMatcher.h
-1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized.
+1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized.
 2) Improve the documentation after some questions from Claudio.
 
  2008-06-13 14:01  dimitr 
@@ -33660,7 +33660,7 @@
 
  2007-05-09 15:23  asfernandes 
    M doc/sql.extensions/README.list
-Updated LIST documentation - thanks to Maycon Ferra?\195?\167a
+Updated LIST documentation - thanks to Maycon Ferraça
 
  2007-05-09 02:03  asfernandes 
    M src/burp/burp.cpp
@@ -35611,7 +35611,7 @@
 
  2007-03-22 13:07  asfernandes 
    M doc/sql.extensions/README.context_variables2
-Document the new context variable - thanks to Maicon Ferra?\195?\167a
+Document the new context variable - thanks to Maicon Ferraça
 
  2007-03-22 12:53  dimitr 
    M src/dsql/pass1.cpp
@@ -37288,7 +37288,7 @@
 
  2006-12-14 10:30  asfernandes 
    M doc/sql.extensions/README.returning
-Correction - thanks to Maycon Ferra?\195?\167a
+Correction - thanks to Maycon Ferraça
 
  2006-12-14 09:14  dimitr 
    A doc/README.monitoring_tables
@@ -38732,7 +38732,7 @@
 
  2006-10-10 03:53  asfernandes 
    M src/jrd/jrd.cpp
-Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling
+Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling
 
  2006-10-10 03:39  asfernandes 
    M src/jrd/os/posix/isc_ipc.cpp
@@ -39081,7 +39081,7 @@
 
  2006-09-13 12:59  asfernandes 
    M src/dsql/pass1.cpp
-Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel
+Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel
 
  2006-09-12 16:31  asfernandes 
    M src/jrd/opt.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-24 08:27:22 UTC (rev 51465)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-24 08:39:15 UTC (rev 51466)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:25964
+  FORMAL BUILD NUMBER:26070
 */
 
-#define PRODUCT_VER_STRING "2.5.0.25964"
-#define FILE_VER_STRING "WI-V2.5.0.25964"
-#define LICENSE_VER_STRING "WI-V2.5.0.25964"
-#define FILE_VER_NUMBER 2, 5, 0, 25964
+#define PRODUCT_VER_STRING "2.5.0.26070"
+#define FILE_VER_STRING "WI-V2.5.0.26070"
+#define LICENSE_VER_STRING "WI-V2.5.0.26070"
+#define FILE_VER_NUMBER 2, 5, 0, 26070
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "25964"
+#define FB_BUILD_NO "26070"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-24 08:27:22 UTC (rev 51465)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-24 08:39:15 UTC (rev 51466)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=25964
+BuildNum=26070
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-26 03:17:29
       
   | 
Revision: 51484
          http://firebird.svn.sourceforge.net/firebird/?rev=51484&view=rev
Author:   firebirds
Date:     2010-08-26 03:17:23 +0000 (Thu, 26 Aug 2010)
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	2010-08-26 03:14:14 UTC (rev 51483)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-26 03:17:23 UTC (rev 51484)
@@ -1,3 +1,7 @@
+ 2010-08-25 08:00  dimitr 
+   M src/jrd/cmp.cpp
+Fixed a few suspicious places related to the variable cloning.
+
  2010-08-23 11:39  alexpeshkoff 
    M src/utilities/gsec/gsec.cpp
 Fixed CORE-3116: gsec outputs list of users to stderr instead stdout
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-26 03:14:14 UTC (rev 51483)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-26 03:17:23 UTC (rev 51484)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26070
+  FORMAL BUILD NUMBER:26071
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26070"
-#define FILE_VER_STRING "WI-V2.5.0.26070"
-#define LICENSE_VER_STRING "WI-V2.5.0.26070"
-#define FILE_VER_NUMBER 2, 5, 0, 26070
+#define PRODUCT_VER_STRING "2.5.0.26071"
+#define FILE_VER_STRING "WI-V2.5.0.26071"
+#define LICENSE_VER_STRING "WI-V2.5.0.26071"
+#define FILE_VER_NUMBER 2, 5, 0, 26071
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26070"
+#define FB_BUILD_NO "26071"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-26 03:14:14 UTC (rev 51483)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-26 03:17:23 UTC (rev 51484)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26070
+BuildNum=26071
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-08-27 03:18:21
       
   | 
Revision: 51492
          http://firebird.svn.sourceforge.net/firebird/?rev=51492&view=rev
Author:   firebirds
Date:     2010-08-27 03:18:15 +0000 (Fri, 27 Aug 2010)
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	2010-08-27 03:15:10 UTC (rev 51491)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-08-27 03:18:15 UTC (rev 51492)
@@ -1,3 +1,11 @@
+ 2010-08-27 02:51  asfernandes 
+   M src/jrd/jrd.cpp
+Fixed CORE-3109 - [Crash] isc_dql_exec_immed3_m for "create database ..." and NULL transaction
+
+ 2010-08-26 10:52  alexpeshkoff 
+   M src/jrd/why.cpp
+Fixed CORE-3117: After an error in GDS_CLOSE_BLOB() blob handle becomes invalid
+
  2010-08-25 08:00  dimitr 
    M src/jrd/cmp.cpp
 Fixed a few suspicious places related to the variable cloning.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-27 03:15:10 UTC (rev 51491)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-08-27 03:18:15 UTC (rev 51492)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26071
+  FORMAL BUILD NUMBER:26073
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26071"
-#define FILE_VER_STRING "WI-V2.5.0.26071"
-#define LICENSE_VER_STRING "WI-V2.5.0.26071"
-#define FILE_VER_NUMBER 2, 5, 0, 26071
+#define PRODUCT_VER_STRING "2.5.0.26073"
+#define FILE_VER_STRING "WI-V2.5.0.26073"
+#define LICENSE_VER_STRING "WI-V2.5.0.26073"
+#define FILE_VER_NUMBER 2, 5, 0, 26073
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26071"
+#define FB_BUILD_NO "26073"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-27 03:15:10 UTC (rev 51491)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-08-27 03:18:15 UTC (rev 51492)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26071
+BuildNum=26073
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-02 03:17:28
       
   | 
Revision: 51513
          http://firebird.svn.sourceforge.net/firebird/?rev=51513&view=rev
Author:   firebirds
Date:     2010-09-02 03:17:18 +0000 (Thu, 02 Sep 2010)
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	2010-09-02 03:13:54 UTC (rev 51512)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-02 03:17:18 UTC (rev 51513)
@@ -1,3 +1,7 @@
+ 2010-09-01 15:35  asfernandes 
+   M src/jrd/trig.h
+Fixed CORE-3101 - Cannot alter the domain after migrating from older versions
+
  2010-08-27 02:51  asfernandes 
    M src/jrd/jrd.cpp
 Fixed CORE-3109 - [Crash] isc_dql_exec_immed3_m for "create database ..." and NULL transaction
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-02 03:13:54 UTC (rev 51512)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-02 03:17:18 UTC (rev 51513)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26073
+  FORMAL BUILD NUMBER:26074
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26073"
-#define FILE_VER_STRING "WI-V2.5.0.26073"
-#define LICENSE_VER_STRING "WI-V2.5.0.26073"
-#define FILE_VER_NUMBER 2, 5, 0, 26073
+#define PRODUCT_VER_STRING "2.5.0.26074"
+#define FILE_VER_STRING "WI-V2.5.0.26074"
+#define LICENSE_VER_STRING "WI-V2.5.0.26074"
+#define FILE_VER_NUMBER 2, 5, 0, 26074
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26073"
+#define FB_BUILD_NO "26074"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-02 03:13:54 UTC (rev 51512)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-02 03:17:18 UTC (rev 51513)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26073
+BuildNum=26074
 
 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: <di...@us...> - 2010-09-02 15:02:58
       
   | 
Revision: 51515
          http://firebird.svn.sourceforge.net/firebird/?rev=51515&view=rev
Author:   dimitr
Date:     2010-09-02 15:02:47 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/jrd/isc_version.h
Removed Paths:
-------------
    firebird/branches/B2_5_Release/builds/win32/msvc7/gds32.vcproj
    firebird/branches/B2_5_Release/builds/win32/msvc8/gds32.vcproj
    firebird/branches/B2_5_Release/src/jrd/isc_version.rc
Deleted: firebird/branches/B2_5_Release/builds/win32/msvc7/gds32.vcproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc7/gds32.vcproj	2010-09-02 13:47:04 UTC (rev 51514)
+++ firebird/branches/B2_5_Release/builds/win32/msvc7/gds32.vcproj	2010-09-02 15:02:47 UTC (rev 51515)
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gds32"
-	ProjectGUID="{C02A54D0-689F-49B6-8F63-7C73EF42E312}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32"
-				Detect64BitPortabilityProblems="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="JRD files"
-			>
-			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource files"
-			>
-			<File
-				RelativePath="..\..\..\src\jrd\isc_version.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="COMMON files"
-			>
-			<File
-				RelativePath="..\..\..\src\common\classes\alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\common\fb_exception.cpp"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\defs\gds32.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
Deleted: firebird/branches/B2_5_Release/builds/win32/msvc8/gds32.vcproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc8/gds32.vcproj	2010-09-02 13:47:04 UTC (rev 51514)
+++ firebird/branches/B2_5_Release/builds/win32/msvc8/gds32.vcproj	2010-09-02 15:02:47 UTC (rev 51515)
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gds32"
-	ProjectGUID="{C02A54D0-689F-49B6-8F63-7C73EF42E312}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32"
-				Detect64BitPortabilityProblems="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib"
-				OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\defs\gds32.def"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="JRD files"
-			>
-			<File
-				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource files"
-			>
-			<File
-				RelativePath="..\..\..\src\jrd\isc_version.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="COMMON files"
-			>
-			<File
-				RelativePath="..\..\..\src\common\classes\alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\common\fb_exception.cpp"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\defs\gds32.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
Modified: firebird/branches/B2_5_Release/src/jrd/isc_version.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-09-02 13:47:04 UTC (rev 51514)
+++ firebird/branches/B2_5_Release/src/jrd/isc_version.h	2010-09-02 15:02:47 UTC (rev 51515)
@@ -17,7 +17,5 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-T6.3.4.26054"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 26054
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"
Deleted: firebird/branches/B2_5_Release/src/jrd/isc_version.rc
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_version.rc	2010-09-02 13:47:04 UTC (rev 51514)
+++ firebird/branches/B2_5_Release/src/jrd/isc_version.rc	2010-09-02 15:02:47 UTC (rev 51515)
@@ -1,53 +0,0 @@
-/*
- * The contents of this file are subject to the Interbase 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.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, 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 Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- */
-
-#include <winver.h>
-#include "../jrd/build_no.h"
-#include "../jrd/isc_version.h"
-
-VS_VERSION_INFO VERSIONINFO
-FILEFLAGSMASK   VS_FF_PRERELEASE
-FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
-FILEVERSION     ISC_FILE_VER_NUMBER
-PRODUCTVERSION  ISC_FILE_VER_NUMBER
-FILEOS          VOS_NT_WINDOWS32
-
-FILETYPE        VFT_APP
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "Comments", "This product created by the Firebird - All Copyright (c) retained by the individual contributors - original code Copyright (c) 2000 Inprise Corporation and predecessors.\0"
-      VALUE "CompanyName", "Firebird Project\0"
-      VALUE "FileDescription", "Firebird SQL Server\0"
-      VALUE "FileVersion", ISC_FILE_VER_STRING
-      VALUE "InternalName", "Firebird\0"
-      VALUE "LegalCopyright", "All Copyright (c) retained by individual contributors - original code Copyright (c) 2000 Inprise Corporation\0"
-      VALUE "ProductName", "Firebird SQL Server\0"
-      VALUE "ProductVersion", PRODUCT_VER_STRING
-      VALUE "SpecialBuild", FB_BUILD_SUFFIX
-    END
-  END
-
-  BLOCK "VarFileInfo"
-  BEGIN                               /*  Language   |    Translation       */
-    VALUE "Translation", 0x409, 1252  /* U.S. English, Windows Multilingual */
-  END
-END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-03 03:26:12
       
   | 
Revision: 51519
          http://firebird.svn.sourceforge.net/firebird/?rev=51519&view=rev
Author:   firebirds
Date:     2010-09-03 03:26:05 +0000 (Fri, 03 Sep 2010)
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	2010-09-02 18:32:04 UTC (rev 51518)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-03 03:26:05 UTC (rev 51519)
@@ -1,3 +1,19 @@
+ 2010-09-02 18:10  dimitr 
+   M src/jrd/build_no.h
+   M src/misc/writeBuildNum.sh
+Update.
+
+ 2010-09-02 15:02  dimitr 
+   D builds/win32/msvc7/gds32.vcproj
+   D builds/win32/msvc8/gds32.vcproj
+   M src/jrd/isc_version.h
+   D src/jrd/isc_version.rc
+Cleanup.
+
+ 2010-09-02 13:47  dimitr 
+   M doc/WhatsNew
+Update.
+
  2010-09-01 15:35  asfernandes 
    M src/jrd/trig.h
 Fixed CORE-3101 - Cannot alter the domain after migrating from older versions
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-02 18:32:04 UTC (rev 51518)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-03 03:26:05 UTC (rev 51519)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26074
+  FORMAL BUILD NUMBER:26077
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26074"
-#define FILE_VER_STRING "WI-V2.5.0.26074"
-#define LICENSE_VER_STRING "WI-V2.5.0.26074"
-#define FILE_VER_NUMBER 2, 5, 0, 26074
+#define PRODUCT_VER_STRING "2.5.0.26077"
+#define FILE_VER_STRING "WI-V2.5.0.26077"
+#define LICENSE_VER_STRING "WI-V2.5.0.26077"
+#define FILE_VER_NUMBER 2, 5, 0, 26077
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26074"
+#define FB_BUILD_NO "26077"
 #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	2010-09-02 18:32:04 UTC (rev 51518)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-03 03:26:05 UTC (rev 51519)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26074
+BuildNum=26077
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-04 03:20:52
       
   | 
Revision: 51522
          http://firebird.svn.sourceforge.net/firebird/?rev=51522&view=rev
Author:   firebirds
Date:     2010-09-04 03:20:44 +0000 (Sat, 04 Sep 2010)
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	2010-09-03 12:43:20 UTC (rev 51521)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-04 03:20:44 UTC (rev 51522)
@@ -1,3 +1,12 @@
+ 2010-09-03 12:43  paul_reeves 
+   M builds/install/arch-specific/win32/installation_readme.txt
+Remove reference to RC
+
+ 2010-09-03 12:35  paul_reeves 
+   M builds/install/arch-specific/win32/Readme.txt
+Use correct link to browse tracker.
+Remove reference to RC
+
  2010-09-02 18:10  dimitr 
    M src/jrd/build_no.h
    M src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-03 12:43:20 UTC (rev 51521)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-04 03:20:44 UTC (rev 51522)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26077
+  FORMAL BUILD NUMBER:26079
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26077"
-#define FILE_VER_STRING "WI-V2.5.0.26077"
-#define LICENSE_VER_STRING "WI-V2.5.0.26077"
-#define FILE_VER_NUMBER 2, 5, 0, 26077
+#define PRODUCT_VER_STRING "2.5.0.26079"
+#define FILE_VER_STRING "WI-V2.5.0.26079"
+#define LICENSE_VER_STRING "WI-V2.5.0.26079"
+#define FILE_VER_NUMBER 2, 5, 0, 26079
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26077"
+#define FB_BUILD_NO "26079"
 #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	2010-09-03 12:43:20 UTC (rev 51521)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-04 03:20:44 UTC (rev 51522)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26077
+BuildNum=26079
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-10 03:17:53
       
   | 
Revision: 51544
          http://firebird.svn.sourceforge.net/firebird/?rev=51544&view=rev
Author:   firebirds
Date:     2010-09-10 03:17:47 +0000 (Fri, 10 Sep 2010)
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	2010-09-10 03:14:38 UTC (rev 51543)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-10 03:17:47 UTC (rev 51544)
@@ -1,3 +1,15 @@
+ 2010-09-10 01:59  asfernandes 
+   M doc/sql.extensions/README.update_or_insert
+Fixed doc. mismatch reported by Paul Vinkenoog
+
+ 2010-09-09 10:53  alexpeshkoff 
+   M src/misc/src_bundle.sh
+Make it cvs/svn independent
+
+ 2010-09-09 10:16  alexpeshkoff 
+   M src/misc/writeBuildNum.sh
+Fixed package version generation for release builds
+
  2010-09-03 12:43  paul_reeves 
    M builds/install/arch-specific/win32/installation_readme.txt
 Remove reference to RC
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-10 03:14:38 UTC (rev 51543)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-10 03:17:47 UTC (rev 51544)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26079
+  FORMAL BUILD NUMBER:26082
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26079"
-#define FILE_VER_STRING "WI-V2.5.0.26079"
-#define LICENSE_VER_STRING "WI-V2.5.0.26079"
-#define FILE_VER_NUMBER 2, 5, 0, 26079
+#define PRODUCT_VER_STRING "2.5.0.26082"
+#define FILE_VER_STRING "WI-V2.5.0.26082"
+#define LICENSE_VER_STRING "WI-V2.5.0.26082"
+#define FILE_VER_NUMBER 2, 5, 0, 26082
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26079"
+#define FB_BUILD_NO "26082"
 #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	2010-09-10 03:14:38 UTC (rev 51543)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-10 03:17:47 UTC (rev 51544)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26079
+BuildNum=26082
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-14 03:16:45
       
   | 
Revision: 51554
          http://firebird.svn.sourceforge.net/firebird/?rev=51554&view=rev
Author:   firebirds
Date:     2010-09-14 03:16:39 +0000 (Tue, 14 Sep 2010)
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	2010-09-14 03:06:00 UTC (rev 51553)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-14 03:16:39 UTC (rev 51554)
@@ -1,3 +1,7 @@
+ 2010-09-13 15:00  dimitr 
+   M src/intl/collations/win1257_lv.h
+Fixed CORE-3131: WIN1257_LV (Latvian) collation is wrong for 4 letters: A E I U. 
+
  2010-09-10 01:59  asfernandes 
    M doc/sql.extensions/README.update_or_insert
 Fixed doc. mismatch reported by Paul Vinkenoog
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-14 03:06:00 UTC (rev 51553)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-14 03:16:39 UTC (rev 51554)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26082
+  FORMAL BUILD NUMBER:26083
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26082"
-#define FILE_VER_STRING "WI-V2.5.0.26082"
-#define LICENSE_VER_STRING "WI-V2.5.0.26082"
-#define FILE_VER_NUMBER 2, 5, 0, 26082
+#define PRODUCT_VER_STRING "2.5.0.26083"
+#define FILE_VER_STRING "WI-V2.5.0.26083"
+#define LICENSE_VER_STRING "WI-V2.5.0.26083"
+#define FILE_VER_NUMBER 2, 5, 0, 26083
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26082"
+#define FB_BUILD_NO "26083"
 #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	2010-09-14 03:06:00 UTC (rev 51553)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-14 03:16:39 UTC (rev 51554)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26082
+BuildNum=26083
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-15 03:31:10
       
   | 
Revision: 51559
          http://firebird.svn.sourceforge.net/firebird/?rev=51559&view=rev
Author:   firebirds
Date:     2010-09-15 03:31:03 +0000 (Wed, 15 Sep 2010)
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	2010-09-15 03:18:23 UTC (rev 51558)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-15 03:31:03 UTC (rev 51559)
@@ -1,3 +1,7 @@
+ 2010-09-14 06:49  alexpeshkoff 
+   M doc/README.UserSql
+Fixed documentation
+
  2010-09-13 15:00  dimitr 
    M src/intl/collations/win1257_lv.h
 Fixed CORE-3131: WIN1257_LV (Latvian) collation is wrong for 4 letters: A E I U. 
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-15 03:18:23 UTC (rev 51558)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-15 03:31:03 UTC (rev 51559)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26083
+  FORMAL BUILD NUMBER:26084
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26083"
-#define FILE_VER_STRING "WI-V2.5.0.26083"
-#define LICENSE_VER_STRING "WI-V2.5.0.26083"
-#define FILE_VER_NUMBER 2, 5, 0, 26083
+#define PRODUCT_VER_STRING "2.5.0.26084"
+#define FILE_VER_STRING "WI-V2.5.0.26084"
+#define LICENSE_VER_STRING "WI-V2.5.0.26084"
+#define FILE_VER_NUMBER 2, 5, 0, 26084
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26083"
+#define FB_BUILD_NO "26084"
 #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	2010-09-15 03:18:23 UTC (rev 51558)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-15 03:31:03 UTC (rev 51559)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26083
+BuildNum=26084
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-19 03:16:43
       
   | 
Revision: 51576
          http://firebird.svn.sourceforge.net/firebird/?rev=51576&view=rev
Author:   firebirds
Date:     2010-09-19 03:16:36 +0000 (Sun, 19 Sep 2010)
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	2010-09-19 03:13:18 UTC (rev 51575)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-19 03:16:36 UTC (rev 51576)
@@ -1,3 +1,7 @@
+ 2010-09-18 06:52  dimitr 
+   M src/jrd/vio.cpp
+Fixed CORE-3137: Partial rollback is possible for a selectable procedure modifying data.
+
  2010-09-14 06:49  alexpeshkoff 
    M doc/README.UserSql
 Fixed documentation
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-19 03:13:18 UTC (rev 51575)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-19 03:16:36 UTC (rev 51576)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26084
+  FORMAL BUILD NUMBER:26085
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26084"
-#define FILE_VER_STRING "WI-V2.5.0.26084"
-#define LICENSE_VER_STRING "WI-V2.5.0.26084"
-#define FILE_VER_NUMBER 2, 5, 0, 26084
+#define PRODUCT_VER_STRING "2.5.0.26085"
+#define FILE_VER_STRING "WI-V2.5.0.26085"
+#define LICENSE_VER_STRING "WI-V2.5.0.26085"
+#define FILE_VER_NUMBER 2, 5, 0, 26085
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26084"
+#define FB_BUILD_NO "26085"
 #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	2010-09-19 03:13:18 UTC (rev 51575)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-19 03:16:36 UTC (rev 51576)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26084
+BuildNum=26085
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-23 03:22:23
       
   | 
Revision: 51585
          http://firebird.svn.sourceforge.net/firebird/?rev=51585&view=rev
Author:   firebirds
Date:     2010-09-23 03:22:16 +0000 (Thu, 23 Sep 2010)
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	2010-09-22 06:06:36 UTC (rev 51584)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-23 03:22:16 UTC (rev 51585)
@@ -1,3 +1,7 @@
+ 2010-09-22 06:06  alexpeshkoff 
+   M src/utilities/gstat/dba.epp
+Fixed CORE-3143: Segmentation fault may occur when user interrupts gstat
+
  2010-09-18 06:52  dimitr 
    M src/jrd/vio.cpp
 Fixed CORE-3137: Partial rollback is possible for a selectable procedure modifying data.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-22 06:06:36 UTC (rev 51584)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-23 03:22:16 UTC (rev 51585)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26085
+  FORMAL BUILD NUMBER:26086
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26085"
-#define FILE_VER_STRING "WI-V2.5.0.26085"
-#define LICENSE_VER_STRING "WI-V2.5.0.26085"
-#define FILE_VER_NUMBER 2, 5, 0, 26085
+#define PRODUCT_VER_STRING "2.5.0.26086"
+#define FILE_VER_STRING "WI-V2.5.0.26086"
+#define LICENSE_VER_STRING "WI-V2.5.0.26086"
+#define FILE_VER_NUMBER 2, 5, 0, 26086
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26085"
+#define FB_BUILD_NO "26086"
 #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	2010-09-22 06:06:36 UTC (rev 51584)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-23 03:22:16 UTC (rev 51585)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26085
+BuildNum=26086
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-25 03:18:05
       
   | 
Revision: 51605
          http://firebird.svn.sourceforge.net/firebird/?rev=51605&view=rev
Author:   firebirds
Date:     2010-09-25 03:17:59 +0000 (Sat, 25 Sep 2010)
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	2010-09-25 03:14:43 UTC (rev 51604)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-25 03:17:59 UTC (rev 51605)
@@ -1,3 +1,11 @@
+ 2010-09-24 11:34  dimitr 
+   M src/jrd/gds.cpp
+Fixed unregistered error in the BLR printer output.
+
+ 2010-09-24 09:33  dimitr 
+   M doc/README.user.embedded
+Correction.
+
  2010-09-22 06:06  alexpeshkoff 
    M src/utilities/gstat/dba.epp
 Fixed CORE-3143: Segmentation fault may occur when user interrupts gstat
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-25 03:14:43 UTC (rev 51604)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-25 03:17:59 UTC (rev 51605)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26086
+  FORMAL BUILD NUMBER:26088
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26086"
-#define FILE_VER_STRING "WI-V2.5.0.26086"
-#define LICENSE_VER_STRING "WI-V2.5.0.26086"
-#define FILE_VER_NUMBER 2, 5, 0, 26086
+#define PRODUCT_VER_STRING "2.5.0.26088"
+#define FILE_VER_STRING "WI-V2.5.0.26088"
+#define LICENSE_VER_STRING "WI-V2.5.0.26088"
+#define FILE_VER_NUMBER 2, 5, 0, 26088
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26086"
+#define FB_BUILD_NO "26088"
 #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	2010-09-25 03:14:43 UTC (rev 51604)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-25 03:17:59 UTC (rev 51605)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26086
+BuildNum=26088
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-09-26 03:18:02
       
   | 
Revision: 51613
          http://firebird.svn.sourceforge.net/firebird/?rev=51613&view=rev
Author:   firebirds
Date:     2010-09-26 03:17:56 +0000 (Sun, 26 Sep 2010)
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	2010-09-26 03:14:45 UTC (rev 51612)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-09-26 03:17:56 UTC (rev 51613)
@@ -1,3 +1,7 @@
+ 2010-09-25 20:12  asfernandes 
+   M src/jrd/cmp.cpp
+Fixed CORE-3141 - The last column in a view is returning as a null value even when its not
+
  2010-09-24 11:34  dimitr 
    M src/jrd/gds.cpp
 Fixed unregistered error in the BLR printer output.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-26 03:14:45 UTC (rev 51612)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-09-26 03:17:56 UTC (rev 51613)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26088
+  FORMAL BUILD NUMBER:26089
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26088"
-#define FILE_VER_STRING "WI-V2.5.0.26088"
-#define LICENSE_VER_STRING "WI-V2.5.0.26088"
-#define FILE_VER_NUMBER 2, 5, 0, 26088
+#define PRODUCT_VER_STRING "2.5.0.26089"
+#define FILE_VER_STRING "WI-V2.5.0.26089"
+#define LICENSE_VER_STRING "WI-V2.5.0.26089"
+#define FILE_VER_NUMBER 2, 5, 0, 26089
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26088"
+#define FB_BUILD_NO "26089"
 #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	2010-09-26 03:14:45 UTC (rev 51612)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-09-26 03:17:56 UTC (rev 51613)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26088
+BuildNum=26089
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-10-05 03:17:03
       
   | 
Revision: 51627
          http://firebird.svn.sourceforge.net/firebird/?rev=51627&view=rev
Author:   firebirds
Date:     2010-10-05 03:16:56 +0000 (Tue, 05 Oct 2010)
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	2010-10-05 03:13:47 UTC (rev 51626)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-10-05 03:16:56 UTC (rev 51627)
@@ -1,3 +1,12 @@
+ 2010-10-04 14:58  alexpeshkoff 
+   M src/extlib/ib_udf.cpp
+Fix for CORE-3156: Problems using UDFs on Mac
+
+ 2010-10-04 13:07  alexpeshkoff 
+   M src/extlib/fbudf/fbudf.h
+   M src/extlib/ib_udf.h
+Fix for CORE-3156: Problems using UDFs on Mac
+
  2010-09-25 20:12  asfernandes 
    M src/jrd/cmp.cpp
 Fixed CORE-3141 - The last column in a view is returning as a null value even when its not
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-05 03:13:47 UTC (rev 51626)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-05 03:16:56 UTC (rev 51627)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26089
+  FORMAL BUILD NUMBER:26091
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26089"
-#define FILE_VER_STRING "WI-V2.5.0.26089"
-#define LICENSE_VER_STRING "WI-V2.5.0.26089"
-#define FILE_VER_NUMBER 2, 5, 0, 26089
+#define PRODUCT_VER_STRING "2.5.0.26091"
+#define FILE_VER_STRING "WI-V2.5.0.26091"
+#define LICENSE_VER_STRING "WI-V2.5.0.26091"
+#define FILE_VER_NUMBER 2, 5, 0, 26091
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26089"
+#define FB_BUILD_NO "26091"
 #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	2010-10-05 03:13:47 UTC (rev 51626)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-10-05 03:16:56 UTC (rev 51627)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26089
+BuildNum=26091
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-10-06 03:23:56
       
   | 
Revision: 51633
          http://firebird.svn.sourceforge.net/firebird/?rev=51633&view=rev
Author:   firebirds
Date:     2010-10-06 03:23:50 +0000 (Wed, 06 Oct 2010)
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	2010-10-06 03:14:27 UTC (rev 51632)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-10-06 03:23:50 UTC (rev 51633)
@@ -1,3 +1,11 @@
+ 2010-10-05 13:13  alexpeshkoff 
+   M doc/README.UserSql
+Make it better understandable to people - thanks to Claudio
+
+ 2010-10-05 12:17  alexpeshkoff 
+   M builds/posix/darwin.defaults
+Fixed CORE-3156: Problems using UDFs on Mac
+
  2010-10-04 14:58  alexpeshkoff 
    M src/extlib/ib_udf.cpp
 Fix for CORE-3156: Problems using UDFs on Mac
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-06 03:14:27 UTC (rev 51632)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-06 03:23:50 UTC (rev 51633)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26091
+  FORMAL BUILD NUMBER:26093
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26091"
-#define FILE_VER_STRING "WI-V2.5.0.26091"
-#define LICENSE_VER_STRING "WI-V2.5.0.26091"
-#define FILE_VER_NUMBER 2, 5, 0, 26091
+#define PRODUCT_VER_STRING "2.5.0.26093"
+#define FILE_VER_STRING "WI-V2.5.0.26093"
+#define LICENSE_VER_STRING "WI-V2.5.0.26093"
+#define FILE_VER_NUMBER 2, 5, 0, 26093
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26091"
+#define FB_BUILD_NO "26093"
 #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	2010-10-06 03:14:27 UTC (rev 51632)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-10-06 03:23:50 UTC (rev 51633)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26091
+BuildNum=26093
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-10-07 03:16:54
       
   | 
Revision: 51637
          http://firebird.svn.sourceforge.net/firebird/?rev=51637&view=rev
Author:   firebirds
Date:     2010-10-07 03:16:47 +0000 (Thu, 07 Oct 2010)
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	2010-10-07 03:13:17 UTC (rev 51636)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-10-07 03:16:47 UTC (rev 51637)
@@ -1,3 +1,7 @@
+ 2010-10-06 15:39  asfernandes 
+   M src/dsql/pass1.cpp
+Fixed CORE-3164 - Parameterized requests involving blob fields fails when connected using charset UTF8
+
  2010-10-05 13:13  alexpeshkoff 
    M doc/README.UserSql
 Make it better understandable to people - thanks to Claudio
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-07 03:13:17 UTC (rev 51636)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-07 03:16:47 UTC (rev 51637)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26093
+  FORMAL BUILD NUMBER:26094
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26093"
-#define FILE_VER_STRING "WI-V2.5.0.26093"
-#define LICENSE_VER_STRING "WI-V2.5.0.26093"
-#define FILE_VER_NUMBER 2, 5, 0, 26093
+#define PRODUCT_VER_STRING "2.5.0.26094"
+#define FILE_VER_STRING "WI-V2.5.0.26094"
+#define LICENSE_VER_STRING "WI-V2.5.0.26094"
+#define FILE_VER_NUMBER 2, 5, 0, 26094
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26093"
+#define FB_BUILD_NO "26094"
 #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	2010-10-07 03:13:17 UTC (rev 51636)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-10-07 03:16:47 UTC (rev 51637)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26093
+BuildNum=26094
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
     
      
      
      From: <fir...@us...> - 2010-10-08 03:23:23
       
   | 
Revision: 51641
          http://firebird.svn.sourceforge.net/firebird/?rev=51641&view=rev
Author:   firebirds
Date:     2010-10-08 03:23:16 +0000 (Fri, 08 Oct 2010)
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	2010-10-08 03:13:58 UTC (rev 51640)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-10-08 03:23:16 UTC (rev 51641)
@@ -1,3 +1,7 @@
+ 2010-10-07 16:14  hvlad 
+   M src/utilities/ntrace/TracePluginImpl.cpp
+Backport fix for bug CORE-3168: exclude_filter doesn't work for <services></section> section of the Trace facility
+
  2010-10-06 15:39  asfernandes 
    M src/dsql/pass1.cpp
 Fixed CORE-3164 - Parameterized requests involving blob fields fails when connected using charset UTF8
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-08 03:13:58 UTC (rev 51640)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-10-08 03:23:16 UTC (rev 51641)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26094
+  FORMAL BUILD NUMBER:26095
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26094"
-#define FILE_VER_STRING "WI-V2.5.0.26094"
-#define LICENSE_VER_STRING "WI-V2.5.0.26094"
-#define FILE_VER_NUMBER 2, 5, 0, 26094
+#define PRODUCT_VER_STRING "2.5.0.26095"
+#define FILE_VER_STRING "WI-V2.5.0.26095"
+#define LICENSE_VER_STRING "WI-V2.5.0.26095"
+#define FILE_VER_NUMBER 2, 5, 0, 26095
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26094"
+#define FB_BUILD_NO "26095"
 #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	2010-10-08 03:13:58 UTC (rev 51640)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-10-08 03:23:16 UTC (rev 51641)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26094
+BuildNum=26095
 
 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.
 |