Thread: [Firebird-checkins] SF.net SVN: firebird:[54576] firebird/branches/B2_5_Release (Page 11)

A powerful, cross platform, SQL database system

Brought to you by: alexpeshkoff, asfernandes, awharrison, cincura_net, and 5 others

firebird-checkins

[Firebird-checkins] SF.net SVN: firebird:[54576] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-01 03:28:50

Revision: 54576
          http://firebird.svn.sourceforge.net/firebird/?rev=54576&view=rev
Author:   firebirds
Date:     2012-06-01 03:28:44 +0000 (Fri, 01 Jun 2012)
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	2012-06-01 03:21:00 UTC (rev 54575)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-01 03:28:44 UTC (rev 54576)
@@ -1,3 +1,7 @@
+ 2012-05-31 11:01  alexpeshkoff 
+   M src/common/classes/semaphore.cpp
+Backported fix for 32-bit build
+
  2012-05-29 20:25  mkubecek 
    M src/isql/isql.epp
 isql: fix output if charset is different from locale

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-01 03:21:00 UTC (rev 54575)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-01 03:28:44 UTC (rev 54576)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26491
+  FORMAL BUILD NUMBER:26492
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26491"
-#define FILE_VER_STRING "WI-V2.5.2.26491"
-#define LICENSE_VER_STRING "WI-V2.5.2.26491"
-#define FILE_VER_NUMBER 2, 5, 2, 26491
+#define PRODUCT_VER_STRING "2.5.2.26492"
+#define FILE_VER_STRING "WI-V2.5.2.26492"
+#define LICENSE_VER_STRING "WI-V2.5.2.26492"
+#define FILE_VER_NUMBER 2, 5, 2, 26492
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26491"
+#define FB_BUILD_NO "26492"
 #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	2012-06-01 03:21:00 UTC (rev 54575)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-01 03:28:44 UTC (rev 54576)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26491
+BuildNum=26492
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54604] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-05 03:47:53

Revision: 54604
          http://firebird.svn.sourceforge.net/firebird/?rev=54604&view=rev
Author:   firebirds
Date:     2012-06-05 03:47:46 +0000 (Tue, 05 Jun 2012)
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	2012-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-05 03:47:46 UTC (rev 54604)
@@ -1,3 +1,17 @@
+ 2012-06-04 16:53  alexpeshkoff 
+   M src/utilities/fbsvcmgr.cpp
+   M src/utilities/fbtracemgr/traceMgrMain.cpp
+Fixed CORE-3769: The message 'Unknown tag (4) in isc_svc_query() results' appears when fbtracemgr is interrupted by Ctrl-C
+
+ 2012-06-04 08:57  dimitr 
+   M src/jrd/btr.cpp
+   M src/jrd/btr.h
+   M src/jrd/dfw.epp
+   M src/jrd/ini.epp
+   M src/jrd/ods.h
+   M src/jrd/pcmet.epp
+Rolled back the ODS level solution for CORE-2709 as it causes cross-version compatibility issues (CORE-3853) as well as functional regressions (CORE-3675). Another solution is likely to be committed instead.
+
  2012-05-31 11:01  alexpeshkoff 
    M src/common/classes/semaphore.cpp
 Backported fix for 32-bit build

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-05 03:47:46 UTC (rev 54604)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26492
+  FORMAL BUILD NUMBER:26494
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26492"
-#define FILE_VER_STRING "WI-V2.5.2.26492"
-#define LICENSE_VER_STRING "WI-V2.5.2.26492"
-#define FILE_VER_NUMBER 2, 5, 2, 26492
+#define PRODUCT_VER_STRING "2.5.2.26494"
+#define FILE_VER_STRING "WI-V2.5.2.26494"
+#define LICENSE_VER_STRING "WI-V2.5.2.26494"
+#define FILE_VER_NUMBER 2, 5, 2, 26494
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26492"
+#define FB_BUILD_NO "26494"
 #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	2012-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-05 03:47:46 UTC (rev 54604)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26492
+BuildNum=26494
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54621] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-11 03:42:39

Revision: 54621
          http://firebird.svn.sourceforge.net/firebird/?rev=54621&view=rev
Author:   firebirds
Date:     2012-06-11 03:42:33 +0000 (Mon, 11 Jun 2012)
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	2012-06-10 13:22:59 UTC (rev 54620)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-11 03:42:33 UTC (rev 54621)
@@ -1,3 +1,11 @@
+ 2012-06-10 13:22  dimitr 
+   M src/jrd/Optimizer.cpp
+Optimizer level solution for CORE-2790/CORE-3449.
+
+ 2012-06-10 12:35  dimitr 
+   M doc/WhatsNew
+Updated the docs.
+
  2012-06-04 16:53  alexpeshkoff 
    M src/utilities/fbsvcmgr.cpp
    M src/utilities/fbtracemgr/traceMgrMain.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-10 13:22:59 UTC (rev 54620)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-11 03:42:33 UTC (rev 54621)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26494
+  FORMAL BUILD NUMBER:26496
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26494"
-#define FILE_VER_STRING "WI-V2.5.2.26494"
-#define LICENSE_VER_STRING "WI-V2.5.2.26494"
-#define FILE_VER_NUMBER 2, 5, 2, 26494
+#define PRODUCT_VER_STRING "2.5.2.26496"
+#define FILE_VER_STRING "WI-V2.5.2.26496"
+#define LICENSE_VER_STRING "WI-V2.5.2.26496"
+#define FILE_VER_NUMBER 2, 5, 2, 26496
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26494"
+#define FB_BUILD_NO "26496"
 #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	2012-06-10 13:22:59 UTC (rev 54620)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-11 03:42:33 UTC (rev 54621)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26494
+BuildNum=26496
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54644] firebird/branches/B2_5_Release

From: <ale...@us...> - 2012-06-20 11:56:44

Revision: 54644
          http://firebird.svn.sourceforge.net/firebird/?rev=54644&view=rev
Author:   alexpeshkoff
Date:     2012-06-20 11:56:36 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Backported implementation of CORE-2666: Make it possible to use API to do remote backups/restores

Modified Paths:
--------------
    firebird/branches/B2_5_Release/doc/README.services_extension
    firebird/branches/B2_5_Release/src/burp/burp.cpp
    firebird/branches/B2_5_Release/src/burp/burp.h
    firebird/branches/B2_5_Release/src/burp/mvol.cpp
    firebird/branches/B2_5_Release/src/burp/spit.cpp
    firebird/branches/B2_5_Release/src/burp/spit.h
    firebird/branches/B2_5_Release/src/burp/std_desc.h
    firebird/branches/B2_5_Release/src/common/UtilSvc.cpp
    firebird/branches/B2_5_Release/src/common/UtilSvc.h
    firebird/branches/B2_5_Release/src/include/consts_pub.h
    firebird/branches/B2_5_Release/src/include/gen/msgs.h
    firebird/branches/B2_5_Release/src/jrd/svc.cpp
    firebird/branches/B2_5_Release/src/jrd/svc.h
    firebird/branches/B2_5_Release/src/lock/lock.cpp
    firebird/branches/B2_5_Release/src/msgs/messages2.sql
    firebird/branches/B2_5_Release/src/utilities/fbsvcmgr.cpp

Modified: firebird/branches/B2_5_Release/doc/README.services_extension
===================================================================
--- firebird/branches/B2_5_Release/doc/README.services_extension	2012-06-20 11:47:30 UTC (rev 54643)
+++ firebird/branches/B2_5_Release/doc/README.services_extension	2012-06-20 11:56:36 UTC (rev 54644)
@@ -31,6 +31,7 @@
  Return to normal state:
   fbsvcmgr service_mgr action_properties dbname employee prp_online_mode prp_sm_normal
 
+
 2) Services API extension - nbackup support.
 (Alex Peshkov, pes...@ma..., 2008)
 
@@ -82,7 +83,7 @@
 
 Stop trace session
 	action
-		isc_action_svc_trace_stop     
+		isc_action_svc_trace_stop
 
 	parameter(s)
 		isc_spb_trc_id : trace session ID, integer, mandatory
@@ -96,7 +97,7 @@
 
 Suspend trace session
 	action
-		isc_action_svc_trace_suspend  
+		isc_action_svc_trace_suspend
 
 	parameter(s)
 		isc_spb_trc_id : trace session ID, integer, mandatory
@@ -109,7 +110,7 @@
 
 Resume trace session
 	action
-		isc_action_svc_trace_resume   
+		isc_action_svc_trace_resume
 
 	parameter(s)
 		isc_spb_trc_id : trace session ID, integer, mandatory
@@ -122,7 +123,7 @@
 
 List of existing trace sessions
 	action
-		isc_action_svc_trace_list     
+		isc_action_svc_trace_list
 
 	parameter(s)
 		none
@@ -134,7 +135,7 @@
 			-   user:  <string>
 			-   date:  YYYY-MM-DD HH:NN:SS
 			-   flags: <string>
-		
+
 		"name" is trace session name and not printed if empty.
 		"user" is creator user name
 		"date" is session start date and time
@@ -149,4 +150,45 @@
 	Output of every service is obtained as usually using isc_service_query call
 with isc_info_svc_line or isc_info_svc_to_eof information items.
 
-See also README.trace_services
\ No newline at end of file
+See also README.trace_services
+
+
+4) Services API extension - running gbak at server side with .fbk at the client.
+(Alex Peshkov, pes...@ma..., 2011-2012)
+
+This way of doing backups is specially efficient when one needs to perform
+backup/restore operation for database, located on ther server accessed using
+internet, due to serious performance instrease.
+
+The simplest way to use this feature is fbsvcmgr. To backup database run
+approximately the following:
+fbsvcmgr remotehost:service_mgr -user sysdba -password XXX \
+	action_backup -dbname some.fdb -bkp_file stdout >some.fbk
+
+and to restore it:
+fbsvcmgr remotehost:service_mgr -user sysdba -password XXX \
+	action_restore -dbname some.fdb -bkp_file stdin <some.fbk
+
+Please notice - you can't use "verbose" switch when performing backup because
+data channel from server to client is used to deliver blocks of fbk files. You
+will get appropriate error message if you try to do it. When restoring database
+verbose mode may be used without limitations.
+
+If you want to perform backup/restore from your own program, you should use
+services API for it. Backup is very simple - just pass "stdout" as backup file
+name to server and use isc_info_svc_to_eof in isc_service_query() call. Data,
+returned by repeating calls to isc_service_query() (certainly with
+isc_info_svc_to_eof tag) is a stream, representing image of backup file. Restore
+is a bit more tricky. Client sends new spb parameter isc_info_svc_stdin to server
+in isc_service_query(). If service needs some data in stdin, it returns
+isc_info_svc_stdin in query results, followed by 4-bytes value - number of bytes
+server is ready to accept from client. (0 value means no more data is needed right
+now.) The main trick is that client should NOT send more data than requested by
+server - this causes an error "Size of data is more than requested". The data is
+sent in next isc_service_query() call in the send_items block, using
+isc_info_svc_line tag in tradition form: isc_info_svc_line, 2 bytes length, data.
+When server needs next portion, it once more returns non-zero isc_info_svc_stdin
+value from isc_service_query().
+
+A sample of how services API should be used for remote backup and restore can be
+found in source code of fbsvcmgr.

Modified: firebird/branches/B2_5_Release/src/burp/burp.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/burp/burp.cpp	2012-06-20 11:47:30 UTC (rev 54643)
+++ firebird/branches/B2_5_Release/src/burp/burp.cpp	2012-06-20 11:56:36 UTC (rev 54644)
@@ -1127,12 +1127,17 @@
 	// Close the gbak file handles if they still open
 	for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
 	{
-		if (file->fil_fd != INVALID_HANDLE_VALUE)
-			close_platf(file->fil_fd);
-		if (exit_code != FINI_OK &&
-			(tdgbl->action->act_action == ACT_backup_split || tdgbl->action->act_action == ACT_backup))
+		if (file->fil_fd != GBAK_STDIN_DESC() && file->fil_fd != GBAK_STDOUT_DESC())
 		{
-			unlink_platf(file->fil_name.c_str());
+			if (file->fil_fd != INVALID_HANDLE_VALUE)
+			{
+				close_platf(file->fil_fd);
+			}
+			if (exit_code != FINI_OK &&
+				(tdgbl->action->act_action == ACT_backup_split || tdgbl->action->act_action == ACT_backup))
+			{
+				unlink_platf(file->fil_name.c_str());
+			}
 		}
 	}
 
@@ -1682,10 +1687,10 @@
 			}
 			if (fil->fil_name == "stdout")
 			{
-				if (tdgbl->action->act_total >= 2 || fil->fil_next)
+				if (tdgbl->action->act_total >= 2 || fil->fil_next || sw_verbose)
 				{
 					BURP_error(266, true);
-					// msg 266 standard output is not supported when using split operation
+					// msg 266 standard output is not supported when using split operation or in verbose mode
 					flag = QUIT;
 					break;
 				}
@@ -1697,6 +1702,7 @@
 #endif
 				tdgbl->uSvc->setDataMode(true);
 				fil->fil_fd = GBAK_STDOUT_DESC();
+				tdgbl->stdIoMode = true;
 				break;
 			}
 			else
@@ -1801,10 +1807,13 @@
 	{
 		fil->fil_fd = GBAK_STDIN_DESC();
 		tdgbl->file_desc = fil->fil_fd;
+		tdgbl->stdIoMode = true;
 		tdgbl->gbl_sw_files = fil->fil_next;
 	}
 	else
 	{
+		tdgbl->stdIoMode = false;
+
 		// open first file
 #ifdef WIN_NT
 		if ((fil->fil_fd = MVOL_open(fil->fil_name.c_str(), MODE_READ, OPEN_EXISTING)) ==

Modified: firebird/branches/B2_5_Release/src/burp/burp.h
===================================================================
--- firebird/branches/B2_5_Release/src/burp/burp.h	2012-06-20 11:47:30 UTC (rev 54643)
+++ firebird/branches/B2_5_Release/src/burp/burp.h	2012-06-20 11:56:36 UTC (rev 54644)
@@ -815,7 +815,8 @@
 		  defaultCollations(*getDefaultMemoryPool()),
 		  flag_on_line(true),
 		  uSvc(us),
-		  firstMap(true)
+		  firstMap(true),
+		  stdIoMode(false)
 	{
 		// this is VERY dirty hack to keep current behaviour
 		memset (&gbl_database_file_name, 0,
@@ -977,6 +978,7 @@
 	bool flag_on_line;	// indicates whether we will bring the database on-line
 	Firebird::UtilSvc* uSvc;
 	bool firstMap;      // this is the first time we entered get_mapping()
+	bool stdIoMode;		// stdin or stdout is used as backup file
 };
 
 // CVC: This aux routine declared here to not force inclusion of burp.h with burp_proto.h
@@ -988,17 +990,8 @@
 											indices */
 
 // I/O definitions
+const int GBAK_IO_BUFFER_SIZE = SVC_IO_BUFFER_SIZE;
 
-#ifndef IO_BUFFER_SIZE
-#ifdef BUFSIZ
-const int GBAK_IO_BUFFER_SIZE = (16 * (BUFSIZ));
-#else
-const int GBAK_IO_BUFFER_SIZE = (16 * (1024));
-#endif
-#else
-const int GBAK_IO_BUFFER_SIZE = (16 * (IO_BUFFER_SIZE));
-#endif
-
 /* Burp will always write a backup in multiples of the following number
  * of bytes.  The initial value is the smallest which ensures that writes
  * to fixed-block SCSI tapes such as QIC-150 will work.  The value should

Modified: firebird/branches/B2_5_Release/src/burp/mvol.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/burp/mvol.cpp	2012-06-20 11:47:30 UTC (rev 54643)
+++ firebird/branches/B2_5_Release/src/burp/mvol.cpp	2012-06-20 11:56:36 UTC (rev 54644)
@@ -100,6 +100,7 @@
 static bool  read_header(DESC, ULONG*, USHORT*, bool);
 static bool  write_header(DESC, ULONG, bool);
 static DESC	 next_volume(DESC, ULONG, bool);
+static void	 mvol_read(int*, UCHAR**);
 
 
 //____________________________________________________________
@@ -109,15 +110,16 @@
 {
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	if (strcmp(tdgbl->mvol_old_file, "stdin") != 0)
+	if (!tdgbl->stdIoMode)
 	{
 		close_platf(tdgbl->file_desc);
+	}
 
-		for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+	for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+	{
+		if (file->fil_fd == tdgbl->file_desc) 
 		{
-			if (file->fil_fd == tdgbl->file_desc) {
-				file->fil_fd = INVALID_HANDLE_VALUE;
-			}
+			file->fil_fd = INVALID_HANDLE_VALUE;
 		}
 	}
 
@@ -139,15 +141,19 @@
 
 	MVOL_write(rec_end, io_cnt, io_ptr);
 	flush_platf(tdgbl->file_desc);
-	if (strcmp(tdgbl->mvol_old_file, "stdout") != 0)
+
+	if (!tdgbl->stdIoMode)
 	{
 		close_platf(tdgbl->file_desc);
-		for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+	}
+	for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+	{
+		if (file->fil_fd == tdgbl->file_desc)
 		{
-			if (file->fil_fd == tdgbl->file_desc)
-				file->fil_fd = INVALID_HANDLE_VALUE;
+			file->fil_fd = INVALID_HANDLE_VALUE;
 		}
 	}
+
 	tdgbl->file_desc = INVALID_HANDLE_VALUE;
 	BURP_free(tdgbl->mvol_io_header);
 	tdgbl->mvol_io_header = NULL;
@@ -260,12 +266,48 @@
 }
 
 
+//____________________________________________________________
+//
+// Read a buffer's worth of data. (common)
+//
+int MVOL_read(int* cnt, UCHAR** ptr)
+{
+	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
+
+	if (tdgbl->stdIoMode && tdgbl->uSvc->isService())
+	{
+		tdgbl->uSvc->started();
+		tdgbl->mvol_io_cnt = tdgbl->uSvc->getBytes(tdgbl->mvol_io_buffer, tdgbl->mvol_io_buffer_size);
+		if (!tdgbl->mvol_io_cnt)
+		{
+			BURP_error_redirect(0, 220);
+			// msg 220 Unexpected I/O error while reading from backup file
+		}
+		tdgbl->mvol_io_ptr = tdgbl->mvol_io_buffer;
+	}
+	else
+	{
+		mvol_read(cnt, ptr);
+	}
+
+	tdgbl->mvol_cumul_count += tdgbl->mvol_io_cnt;
+	file_not_empty();
+
+	if (ptr)
+		*ptr = tdgbl->mvol_io_ptr + 1;
+	if (cnt)
+		*cnt = tdgbl->mvol_io_cnt - 1;
+
+	return *tdgbl->mvol_io_ptr;
+}
+
+
 #ifndef WIN_NT
 //____________________________________________________________
 //
 // Read a buffer's worth of data. (non-WIN_NT)
 //
-int MVOL_read(int* cnt, UCHAR** ptr)
+static void mvol_read(int* cnt, UCHAR** ptr)
 {
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
@@ -300,14 +342,6 @@
 			}
 		}
 	}
-
-	tdgbl->mvol_cumul_count += tdgbl->mvol_io_cnt;
-	file_not_empty();
-
-	*ptr = tdgbl->mvol_io_ptr + 1;
-	*cnt = tdgbl->mvol_io_cnt - 1;
-
-	return *tdgbl->mvol_io_ptr;
 }
 
 
@@ -316,7 +350,7 @@
 //
 // Read a buffer's worth of data. (WIN_NT)
 //
-int MVOL_read(int* cnt, UCHAR** ptr)
+static void mvol_read(int* cnt, UCHAR** ptr)
 {
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
@@ -348,14 +382,6 @@
 				// msg 50 unexpected end of file on backup file
 		}
 	}
-
-	tdgbl->mvol_cumul_count += tdgbl->mvol_io_cnt;
-	file_not_empty();
-
-	*ptr = tdgbl->mvol_io_ptr + 1;
-	*cnt = tdgbl->mvol_io_cnt - 1;
-
-	return *tdgbl->mvol_io_ptr;
 }
 #endif // !WIN_NT
 
@@ -512,169 +538,178 @@
 	const ULONG size_to_write = BURP_UP_TO_BLOCK(*io_ptr - tdgbl->mvol_io_buffer);
 	ULONG left = size_to_write;
 
-	for (ptr = tdgbl->mvol_io_buffer; left > 0; ptr += cnt, left -= cnt)
+	if (tdgbl->stdIoMode && tdgbl->uSvc->isService())
 	{
-		if (tdgbl->action->act_action == ACT_backup_split)
+		tdgbl->uSvc->started();
+		tdgbl->uSvc->putBytes(tdgbl->mvol_io_buffer, left);
+		left = 0;
+	}
+	else
+	{
+		for (ptr = tdgbl->mvol_io_buffer; left > 0; ptr += cnt, left -= cnt)
 		{
-			// Write to the current file till fil_length > 0, otherwise
-			// switch to the next one
-			if (tdgbl->action->act_file->fil_length == 0)
+			if (tdgbl->action->act_action == ACT_backup_split)
 			{
-				if (tdgbl->action->act_file->fil_next)
+				// Write to the current file till fil_lingth > 0, otherwise
+				// switch to the next one
+				if (tdgbl->action->act_file->fil_length == 0)
 				{
-					close_platf(tdgbl->file_desc);
-					for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+					if (tdgbl->action->act_file->fil_next)
 					{
-						if (file->fil_fd == tdgbl->file_desc)
-							file->fil_fd = INVALID_HANDLE_VALUE;
+						close_platf(tdgbl->file_desc);
+						for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+						{
+							if (file->fil_fd == tdgbl->file_desc)
+								file->fil_fd = INVALID_HANDLE_VALUE;
+						}
+						tdgbl->action->act_file->fil_fd = INVALID_HANDLE_VALUE;
+						tdgbl->action->act_file = tdgbl->action->act_file->fil_next;
+						tdgbl->file_desc = tdgbl->action->act_file->fil_fd;
 					}
-					tdgbl->action->act_file->fil_fd = INVALID_HANDLE_VALUE;
-					tdgbl->action->act_file = tdgbl->action->act_file->fil_next;
-					tdgbl->file_desc = tdgbl->action->act_file->fil_fd;
+					else
+					{
+						// This is a last file. Keep writing in a hope that there is
+						// enough free disk space ...
+						tdgbl->action->act_file->fil_length = MAX_LENGTH;
+					}
 				}
-				else
-				{
-					// This is a last file. Keep writing in a hope that there is
-					// enough free disk space ...
-					tdgbl->action->act_file->fil_length = MAX_LENGTH;
-				}
 			}
-		}
 
-		const size_t nBytesToWrite =
-			(tdgbl->action->act_action == ACT_backup_split &&
-				tdgbl->action->act_file->fil_length < left) ?
-			 		tdgbl->action->act_file->fil_length : left;
+			const size_t nBytesToWrite =
+				(tdgbl->action->act_action == ACT_backup_split &&
+					tdgbl->action->act_file->fil_length < left) ?
+				 		tdgbl->action->act_file->fil_length : left;
 
 #ifndef WIN_NT
-		cnt = write(tdgbl->file_desc, ptr, nBytesToWrite);
+			cnt = write(tdgbl->file_desc, ptr, nBytesToWrite);
 #else
 
-		DWORD ret = 0;
-		if (!WriteFile(tdgbl->file_desc, ptr, (DWORD) nBytesToWrite, &cnt, NULL))
-		{
-			ret = GetLastError();
-		}
+			DWORD ret = 0;
+			if (!WriteFile(tdgbl->file_desc, ptr, (DWORD) nBytesToWrite, &cnt, NULL))
+			{
+				ret = GetLastError();
+			}
 #endif // !WIN_NT
-		tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
-		if (cnt > 0)
-		{
-			tdgbl->mvol_cumul_count += cnt;
-			file_not_empty();
-			if (tdgbl->action->act_action == ACT_backup_split)
+			tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
+			if (cnt > 0)
 			{
-				if (tdgbl->action->act_file->fil_length < left)
-					tdgbl->action->act_file->fil_length = 0;
-				else
-					tdgbl->action->act_file->fil_length -= left;
+				tdgbl->mvol_cumul_count += cnt;
+				file_not_empty();
+				if (tdgbl->action->act_action == ACT_backup_split)
+				{
+					if (tdgbl->action->act_file->fil_length < left)
+						tdgbl->action->act_file->fil_length = 0;
+					else
+						tdgbl->action->act_file->fil_length -= left;
+				}
 			}
-		}
-		else
-		{
-			if (!cnt ||
+			else
+			{
+				if (!cnt ||
 #ifndef WIN_NT
-				errno == ENOSPC || errno == EIO || errno == ENXIO ||
-				errno == EFBIG)
+					errno == ENOSPC || errno == EIO || errno == ENXIO ||
+					errno == EFBIG)
 #else
-				ret == ERROR_DISK_FULL || ret == ERROR_HANDLE_DISK_FULL)
+					ret == ERROR_DISK_FULL || ret == ERROR_HANDLE_DISK_FULL)
 #endif // !WIN_NT
-			{
-				if (tdgbl->action->act_action == ACT_backup_split)
 				{
-					// Close the current file and switch to the next one.
-					// If there is no more specified files left then
-					// issue an error and give up
-					if (tdgbl->action->act_file->fil_next)
+					if (tdgbl->action->act_action == ACT_backup_split)
 					{
-						close_platf(tdgbl->file_desc);
-						for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+						// Close the current file and switch to the next one.
+						// If there is no more specified files left then
+						// issue an error and give up
+						if (tdgbl->action->act_file->fil_next)
 						{
-							if (file->fil_fd == tdgbl->file_desc)
-								file->fil_fd = INVALID_HANDLE_VALUE;
+							close_platf(tdgbl->file_desc);
+							for (burp_fil* file = tdgbl->gbl_sw_backup_files; file; file = file->fil_next)
+							{
+								if (file->fil_fd == tdgbl->file_desc)
+									file->fil_fd = INVALID_HANDLE_VALUE;
+							}
+
+							tdgbl->action->act_file->fil_fd = INVALID_HANDLE_VALUE;
+							BURP_print(false, 272, SafeArg() <<
+										tdgbl->action->act_file->fil_name.c_str() <<
+										tdgbl->action->act_file->fil_length <<
+										tdgbl->action->act_file->fil_next->fil_name.c_str());
+							// msg 272 Warning -- free disk space exhausted for file %s,
+							// the rest of the bytes (%d) will be written to file %s
+							tdgbl->action->act_file->fil_next->fil_length +=
+								tdgbl->action->act_file->fil_length;
+							tdgbl->action->act_file = tdgbl->action->act_file->fil_next;
+							tdgbl->file_desc = tdgbl->action->act_file->fil_fd;
 						}
+						else
+						{
+							BURP_error(270, true);
+							// msg 270 free disk space exhausted
+						}
+						cnt = 0;
+						continue;
+					}
 
-						tdgbl->action->act_file->fil_fd = INVALID_HANDLE_VALUE;
-						BURP_print(true, 272, SafeArg() <<
-									tdgbl->action->act_file->fil_name.c_str() <<
-									tdgbl->action->act_file->fil_length <<
-									tdgbl->action->act_file->fil_next->fil_name.c_str());
-						// msg 272 Warning -- free disk space exhausted for file %s,
-						// the rest of the bytes (%d) will be written to file %s
-						tdgbl->action->act_file->fil_next->fil_length +=
-							tdgbl->action->act_file->fil_length;
-						tdgbl->action->act_file = tdgbl->action->act_file->fil_next;
-						tdgbl->file_desc = tdgbl->action->act_file->fil_fd;
-					}
-					else
+					if (tdgbl->uSvc->isService())
 					{
 						BURP_error(270, true);
 						// msg 270 free disk space exhausted
 					}
-					cnt = 0;
-					continue;
-				}
 
-				if (tdgbl->uSvc->isService())
-				{
-					BURP_error(270, true);
-					// msg 270 free disk space exhausted
-				}
+					// Note: there is an assumption here, that if header data is being
+					// written, it is really being rewritten, so at least all the
+					// header data will be written
 
-				// Note: there is an assumption here, that if header data is being
-				// written, it is really being rewritten, so at least all the
-				// header data will be written
+					if (left != size_to_write)
+					{
+						// Wrote some, move remainder up in buffer.
 
-				if (left != size_to_write)
-				{
-					// Wrote some, move remainder up in buffer.
-
-					// NOTE: We should NOT use memcpy here.  We're moving overlapped
-					// data and memcpy does not guanantee the order the data
-					// is moved in
-					memcpy(tdgbl->mvol_io_data, ptr, left);
+						// NOTE: We should NOT use memcpy here.  We're moving overlapped
+						// data and memcpy does not guanantee the order the data
+						// is moved in
+						memcpy(tdgbl->mvol_io_data, ptr, left);
+					}
+					left += tdgbl->mvol_io_data - tdgbl->mvol_io_header;
+					bool full_buffer;
+					if (left >=  tdgbl->mvol_io_buffer_size)
+						full_buffer = true;
+					else
+						full_buffer = false;
+					tdgbl->file_desc = next_volume(tdgbl->file_desc, MODE_WRITE, full_buffer);
+					if (full_buffer)
+					{
+						left -= tdgbl->mvol_io_buffer_size;
+						memcpy(tdgbl->mvol_io_data,
+							   tdgbl->mvol_io_header + tdgbl->mvol_io_buffer_size,
+							   left);
+						tdgbl->mvol_cumul_count += tdgbl->mvol_io_buffer_size;
+						tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
+					}
+					else
+						tdgbl->mvol_io_buffer = tdgbl->mvol_io_header;
+					break;
 				}
-				left += tdgbl->mvol_io_data - tdgbl->mvol_io_header;
-				bool full_buffer;
-				if (left >=  tdgbl->mvol_io_buffer_size)
-					full_buffer = true;
-				else
-					full_buffer = false;
-				tdgbl->file_desc = next_volume(tdgbl->file_desc, MODE_WRITE, full_buffer);
-				if (full_buffer)
+				else if (!SYSCALL_INTERRUPTED(errno))
 				{
-					left -= tdgbl->mvol_io_buffer_size;
-					memcpy(tdgbl->mvol_io_data,
-						   tdgbl->mvol_io_header + tdgbl->mvol_io_buffer_size,
-						   left);
-					tdgbl->mvol_cumul_count += tdgbl->mvol_io_buffer_size;
-					tdgbl->mvol_io_buffer = tdgbl->mvol_io_data;
+					BURP_error_redirect(0, 221);
+					// msg 221 Unexpected I/O error while writing to backup file
 				}
-				else
-					tdgbl->mvol_io_buffer = tdgbl->mvol_io_header;
-				break;
 			}
-			else if (!SYSCALL_INTERRUPTED(errno))
-			{
-				BURP_error_redirect(0, 221);
-				// msg 221 Unexpected I/O error while writing to backup file
+			if (left < cnt) {	// this is impossible, but...
+				cnt = left;
 			}
-		}
-		if (left < cnt) {	// this is impossible, but...
-			cnt = left;
-		}
 
-	} // for
+		} // for
 
 #ifdef DEBUG
-	{
-		int dbg_cnt;
-		if (debug_on)
 		{
-			for (dbg_cnt = 0; dbg_cnt < cnt; dbg_cnt++)
-				printf("%d,\n", *(ptr + dbg_cnt));
+			int dbg_cnt;
+			if (debug_on)
+			{
+				for (dbg_cnt = 0; dbg_cnt < cnt; dbg_cnt++)
+					printf("%d,\n", *(ptr + dbg_cnt));
+			}
 		}
+#endif
 	}
-#endif
 
 	// After the first block of first volume is written (using a default block size)
 	// change the block size to one that reflects the user's blocking factor.  By
@@ -956,27 +991,27 @@
 		if (strlen(tdgbl->mvol_old_file) > 0)
 		{
 			BURP_msg_get(225, msg, SafeArg() << (tdgbl->mvol_volume_count - 1) << tdgbl->mvol_old_file);
-			fprintf(term_out, msg);
+			fprintf(term_out, "%s", msg);
 			BURP_msg_get(226, msg);
 			// \tPress return to reopen that file, or type a new\n\tname
 			// followed by return to open a different file.\n
-			fprintf(term_out, msg);
+			fprintf(term_out, "%s", msg);
 		}
 		else	// First volume
 		{
 			BURP_msg_get(227, msg);
 			// Type a file name to open and hit return
-			fprintf(term_out, msg);
+			fprintf(term_out, "%s", msg);
 		}
 		BURP_msg_get(228, msg);	// "  Name: "
-		fprintf(term_out, msg);
+		fprintf(term_out, "%s", msg);
 
 		fflush(term_out);
 		if (fgets(name, length, term_in) == NULL)
 		{
 			BURP_msg_get(229, msg);
 			// \n\nERROR: Backup incomplete\n
-			fprintf(term_out, msg);
+			fprintf(term_out, "%s", msg);
 			BURP_exit_local(FINI_ERROR, tdgbl);
 		}
 
@@ -1073,13 +1108,21 @@
 
 	// Headers are a version number, and a volume number
 
+	if (tdgbl->stdIoMode && tdgbl->uSvc->isService())
+	{
+		tdgbl->uSvc->started();
+		tdgbl->mvol_io_cnt = tdgbl->uSvc->getBytes(tdgbl->mvol_io_buffer, tdgbl->mvol_io_buffer_size);
+	}
+	else
+	{
 #ifndef WIN_NT
-	tdgbl->mvol_io_cnt = read(handle, tdgbl->mvol_io_buffer, tdgbl->mvol_actual_buffer_size);
+		tdgbl->mvol_io_cnt = read(handle, tdgbl->mvol_io_buffer, tdgbl->mvol_actual_buffer_size);
 #else
-	DWORD bytesRead = 0;
-	ReadFile(handle, tdgbl->mvol_io_buffer, tdgbl->mvol_actual_buffer_size, &bytesRead, NULL);
-	tdgbl->mvol_io_cnt = bytesRead;
+		DWORD bytesRead = 0;
+		ReadFile(handle, tdgbl->mvol_io_buffer, tdgbl->mvol_actual_buffer_size, &bytesRead, NULL);
+		tdgbl->mvol_io_cnt = bytesRead;
 #endif
+	}
 	if (!tdgbl->mvol_io_cnt)
 		BURP_error_redirect(0, 45); // maybe there's a better message
 
@@ -1140,7 +1183,7 @@
 			{
 				BURP_msg_get(230, msg, SafeArg() << tdgbl->gbl_backup_start_time << buffer);
 				// Expected backup start time %s, found %s\n
-				printf(msg);
+				printf("%s", msg);
 				return false;
 			}
 			break;
@@ -1174,7 +1217,7 @@
 			{
 				BURP_msg_get(231, msg, SafeArg() << tdgbl->gbl_database_file_name << buffer);
 				// Expected backup database %s, found %s\n
-				printf(msg);
+				printf("%s", msg);
 				return false;
 			}
 			if (init_flag)
@@ -1203,7 +1246,7 @@
 			{
 				BURP_msg_get(232, msg, SafeArg() << tdgbl->mvol_volume_count << temp);
 				// Expected volume number %d, found volume %d\n
-				printf(msg);
+				printf("%s", msg);
 				return false;
 			}
 			break;

Modified: firebird/branches/B2_5_Release/src/burp/spit.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/burp/spit.cpp	2012-06-20 11:47:30 UTC (rev 54643)
+++ firebird/branches/B2_5_Release/src/burp/spit.cpp	2012-06-20 11:56:36 UTC (rev 54644)
@@ -46,7 +46,9 @@
 #  include <time.h>
 # endif
 #endif
+//#include "../burp/burp.h"
 #include "../burp/spit.h"
+#include "../burp/std_desc.h"
 #include "../burp/burpswi.h"
 
 #ifdef HAVE_UNISTD_H
@@ -61,6 +63,53 @@
 static const int mode_write	= O_WRONLY | O_CREAT;
 static const int mask		= 0666;
 
+static DESC open_platf(const char* name, int writeFlag)
+{
+#ifdef WIN_NT
+	return CreateFile(name, writeFlag ? GENERIC_WRITE : GENERIC_READ, 0, NULL, 
+		writeFlag ? CREATE_ALWAYS : OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+#else
+	return open(name, writeFlag ? mode_write : mode_read, mask);
+#endif
+}
+
+static int read_platf(DESC file, void* buf, int count)
+{
+#ifdef WIN_NT
+	DWORD act;
+	if (!ReadFile(file, buf, count, &act, NULL))
+	{
+		return -1;
+	}
+	return act;
+#else
+	return read(file, buf, count);
+#endif
+}
+
+static int write_platf(DESC file, const void* buf, int count)
+{
+#ifdef WIN_NT
+	DWORD act;
+	if (!WriteFile(file, buf, count, &act, NULL))
+	{
+		return -1;
+	}
+	return act;
+#else
+	return write(file, buf, count);
+#endif
+}
+
+static void close_platf(DESC file)
+{
+#ifdef WIN_NT
+	CloseHandle(file);
+#else
+	close(file);
+#endif
+}
+
 // Definitions for GSPLIT
 enum gsplit_option
 {
@@ -279,7 +328,7 @@
 	switch (sw_replace)
 	{
 	case IN_SW_SPIT_SP:
-		input_file_desc = GBAK_STDIN_DESC;
+		input_file_desc = GBAK_STDIN_DESC();
 		ret_cd = gen_multy_bakup_files(file_list, input_file_desc, file_num);
 		if (ret_cd == FB_FAILURE) {
 			fprintf(stderr, "%s: progam fails to generate multi-volumn back-up files\n", prog_name);
@@ -598,8 +647,8 @@
 			file_size = fl_ptr->b_fil_size - header_rec_len;
 			file_name = fl_ptr->b_fil_name;
 
-			output_fl_desc = open(file_name, mode_write, mask);
-			if (output_fl_desc == -1) {
+			output_fl_desc = open_platf(file_name, 1);
+			if (output_fl_desc == INVALID_HANDLE_VALUE) {
 				free(io_buffer);
 				fprintf(stderr, "can not open back up file %s\n", file_name);
 				return FB_FAILURE;
@@ -665,8 +714,8 @@
 							file_size = fl_ptr->b_fil_size - header_rec_len;
 							file_name = fl_ptr->b_fil_name;
 
-							output_fl_desc = open(file_name, mode_write, mask);
-							if (output_fl_desc == -1) {
+							output_fl_desc = open_platf(file_name, 1);
+							if (output_fl_desc == INVALID_HANDLE_VALUE) {
 								free(io_buffer);
 								fprintf(stderr, "can not open back up file %s\n", file_name);
 								return FB_FAILURE;
@@ -767,21 +816,21 @@
 
 	if (*byte_read + io_size > file_size) {
 		last_read_size = (SLONG) (file_size - *byte_read);
-		read_cnt = read(input_file_desc, *io_buffer, last_read_size);
+		read_cnt = read_platf(input_file_desc, *io_buffer, last_read_size);
 	}
 	else
-		read_cnt = read(input_file_desc, *io_buffer, io_size);
+		read_cnt = read_platf(input_file_desc, *io_buffer, io_size);
 
 	switch (read_cnt)
 	{
 	case 0:					// no more data to be read
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		*end_of_input = true;
 		*byte_read = *byte_read + read_cnt;
 		return FB_SUCCESS;
 
 	case -1:					// read failed
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		fprintf(stderr,  "fail to read input from stdin, errno = %d\n", errno);
 		return FB_FAILURE;
 
@@ -790,12 +839,12 @@
 		break;
 	}
 
-	const SLONG write_cnt = write(output_fl_desc, *io_buffer, read_cnt);
+	const SLONG write_cnt = write_platf(output_fl_desc, *io_buffer, read_cnt);
 
 	switch (write_cnt)
 	{
 	case -1:					// write failed
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		return FB_FAILURE;
 
 	default:
@@ -803,7 +852,7 @@
 			return FB_SUCCESS;
 
 		// write less data than it reads in
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		*byte_write = write_cnt;
 		return FILE_IS_FULL;
 	}
@@ -832,17 +881,17 @@
 *********************************************************************
 */
 
-	const SLONG read_cnt = read(input_file_desc, *io_buffer, io_size);
+	const SLONG read_cnt = read_platf(input_file_desc, *io_buffer, io_size);
 
 	switch (read_cnt)
 	{
 	case 0:					// no more data to be read
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		*end_of_input = true;
 		return FB_SUCCESS;
 
 	case -1:					// read failed
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		fprintf(stderr, "problem when reading input file, errno = %d\n", errno);
 		return FB_FAILURE;
 
@@ -850,12 +899,12 @@
 		break;
 	}
 
-	const SLONG write_cnt = write(output_fl_desc, *io_buffer, read_cnt);
+	const SLONG write_cnt = write_platf(output_fl_desc, *io_buffer, read_cnt);
 
 	switch (write_cnt)
 	{
 	case -1:					// write failed
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		return FB_FAILURE;
 
 	default:
@@ -863,7 +912,7 @@
 			return FB_SUCCESS;
 
 		fprintf(stderr, "There is no enough space to write to back up file %s\n", file_name);
-		close(output_fl_desc);
+		close_platf(output_fl_desc);
 		return FB_FAILURE;
 	}
 }
@@ -888,7 +937,7 @@
 *********************************************************************...
 
[truncated message content]

[Firebird-checkins] SF.net SVN: firebird:[54647] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-21 04:48:17

Revision: 54647
          http://firebird.svn.sourceforge.net/firebird/?rev=54647&view=rev
Author:   firebirds
Date:     2012-06-21 04:48:11 +0000 (Thu, 21 Jun 2012)
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	2012-06-21 04:27:30 UTC (rev 54646)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-21 04:48:11 UTC (rev 54647)
@@ -1,3 +1,30 @@
+ 2012-06-20 18:57  hvlad 
+   M src/jrd/cch.cpp
+Backported fix from v3 : backup state lock should be released at latch timeout, else lock state accounting becomes inconsistent.
+
+ 2012-06-20 11:56  alexpeshkoff 
+   M doc/README.services_extension
+   M src/burp/burp.cpp
+   M src/burp/burp.h
+   M src/burp/mvol.cpp
+   M src/burp/spit.cpp
+   M src/burp/spit.h
+   M src/burp/std_desc.h
+   M src/common/UtilSvc.cpp
+   M src/common/UtilSvc.h
+   M src/include/consts_pub.h
+   M src/include/gen/msgs.h
+   M src/jrd/svc.cpp
+   M src/jrd/svc.h
+   M src/lock/lock.cpp
+   M src/msgs/messages2.sql
+   M src/utilities/fbsvcmgr.cpp
+Backported implementation of CORE-2666: Make it possible to use API to do remote backups/restores
+
+ 2012-06-20 09:32  paulbeach 
+   M builds/posix/postfix.darwin
+Copy libfbclient.dylib to Firebird SuperServer Framework Libraries to support the ODBC driver
+
  2012-06-10 13:22  dimitr 
    M src/jrd/Optimizer.cpp
 Optimizer level solution for CORE-2790/CORE-3449.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-21 04:27:30 UTC (rev 54646)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-21 04:48:11 UTC (rev 54647)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26496
+  FORMAL BUILD NUMBER:26499
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26496"
-#define FILE_VER_STRING "WI-V2.5.2.26496"
-#define LICENSE_VER_STRING "WI-V2.5.2.26496"
-#define FILE_VER_NUMBER 2, 5, 2, 26496
+#define PRODUCT_VER_STRING "2.5.2.26499"
+#define FILE_VER_STRING "WI-V2.5.2.26499"
+#define LICENSE_VER_STRING "WI-V2.5.2.26499"
+#define FILE_VER_NUMBER 2, 5, 2, 26499
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26496"
+#define FB_BUILD_NO "26499"
 #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	2012-06-21 04:27:30 UTC (rev 54646)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-21 04:48:11 UTC (rev 54647)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26496
+BuildNum=26499
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54658] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-22 04:39:28

Revision: 54658
          http://firebird.svn.sourceforge.net/firebird/?rev=54658&view=rev
Author:   firebirds
Date:     2012-06-22 04:39:21 +0000 (Fri, 22 Jun 2012)
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	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-22 04:39:21 UTC (rev 54658)
@@ -1,3 +1,12 @@
+ 2012-06-21 12:16  dimitr 
+   M src/jrd/cch.cpp
+   M src/jrd/nbak.h
+Fixed the second part of CORE-3873: Server crashes while switching to the shadow if the disk I/O fault happens while flushing the cache.
+
+ 2012-06-21 11:17  dimitr 
+   M src/jrd/sdw.cpp
+The first part of the fix for CORE-3873: Server crashes while switching to the shadow if the disk I/O fault happens while flushing the cache.
+
  2012-06-20 18:57  hvlad 
    M src/jrd/cch.cpp
 Backported fix from v3 : backup state lock should be released at latch timeout, else lock state accounting becomes inconsistent.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-22 04:39:21 UTC (rev 54658)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26499
+  FORMAL BUILD NUMBER:26501
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26499"
-#define FILE_VER_STRING "WI-V2.5.2.26499"
-#define LICENSE_VER_STRING "WI-V2.5.2.26499"
-#define FILE_VER_NUMBER 2, 5, 2, 26499
+#define PRODUCT_VER_STRING "2.5.2.26501"
+#define FILE_VER_STRING "WI-V2.5.2.26501"
+#define LICENSE_VER_STRING "WI-V2.5.2.26501"
+#define FILE_VER_NUMBER 2, 5, 2, 26501
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26499"
+#define FB_BUILD_NO "26501"
 #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	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-22 04:39:21 UTC (rev 54658)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26499
+BuildNum=26501
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54665] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-25 04:38:52

Revision: 54665
          http://firebird.svn.sourceforge.net/firebird/?rev=54665&view=rev
Author:   firebirds
Date:     2012-06-25 04:38:41 +0000 (Mon, 25 Jun 2012)
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	2012-06-25 04:21:47 UTC (rev 54664)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-25 04:38:41 UTC (rev 54665)
@@ -1,3 +1,8 @@
+ 2012-06-24 09:13  hvlad 
+   M src/config/AdminException.cpp
+   M src/config/InputStream.cpp
+Fixed bug CORE-3860 : Trace API: Faulty database filter crashes server
+
  2012-06-21 12:16  dimitr 
    M src/jrd/cch.cpp
    M src/jrd/nbak.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-25 04:21:47 UTC (rev 54664)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-25 04:38:41 UTC (rev 54665)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26501
+  FORMAL BUILD NUMBER:26502
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26501"
-#define FILE_VER_STRING "WI-V2.5.2.26501"
-#define LICENSE_VER_STRING "WI-V2.5.2.26501"
-#define FILE_VER_NUMBER 2, 5, 2, 26501
+#define PRODUCT_VER_STRING "2.5.2.26502"
+#define FILE_VER_STRING "WI-V2.5.2.26502"
+#define LICENSE_VER_STRING "WI-V2.5.2.26502"
+#define FILE_VER_NUMBER 2, 5, 2, 26502
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26501"
+#define FB_BUILD_NO "26502"
 #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	2012-06-25 04:21:47 UTC (rev 54664)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-25 04:38:41 UTC (rev 54665)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26501
+BuildNum=26502
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54678] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-28 04:39:39

Revision: 54678
          http://firebird.svn.sourceforge.net/firebird/?rev=54678&view=rev
Author:   firebirds
Date:     2012-06-28 04:39:32 +0000 (Thu, 28 Jun 2012)
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	2012-06-28 04:21:30 UTC (rev 54677)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-28 04:39:32 UTC (rev 54678)
@@ -1,3 +1,7 @@
+ 2012-06-27 11:54  alexpeshkoff 
+   M src/jrd/isc_file.cpp
+Backported fix for posix of CORE-3875: GBak does not check correctly parameters and backups random database with -B ":"
+
  2012-06-24 09:13  hvlad 
    M src/config/AdminException.cpp
    M src/config/InputStream.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-28 04:21:30 UTC (rev 54677)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-28 04:39:32 UTC (rev 54678)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26502
+  FORMAL BUILD NUMBER:26503
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26502"
-#define FILE_VER_STRING "WI-V2.5.2.26502"
-#define LICENSE_VER_STRING "WI-V2.5.2.26502"
-#define FILE_VER_NUMBER 2, 5, 2, 26502
+#define PRODUCT_VER_STRING "2.5.2.26503"
+#define FILE_VER_STRING "WI-V2.5.2.26503"
+#define LICENSE_VER_STRING "WI-V2.5.2.26503"
+#define FILE_VER_NUMBER 2, 5, 2, 26503
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26502"
+#define FB_BUILD_NO "26503"
 #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	2012-06-28 04:21:30 UTC (rev 54677)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-28 04:39:32 UTC (rev 54678)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26502
+BuildNum=26503
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54694] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-29 04:33:51

Revision: 54694
          http://firebird.svn.sourceforge.net/firebird/?rev=54694&view=rev
Author:   firebirds
Date:     2012-06-29 04:33:44 +0000 (Fri, 29 Jun 2012)
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	2012-06-29 04:23:39 UTC (rev 54693)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-29 04:33:44 UTC (rev 54694)
@@ -1,3 +1,34 @@
+ 2012-06-28 10:53  hvlad 
+   M src/jrd/tra.cpp
+Improvement CORE-2668 : Write note into log when automatic sweep is started
+
+ 2012-06-28 08:29  hvlad 
+   M src/utilities/ntrace/TracePluginImpl.cpp
+Missed piece (CORE-3656)
+
+ 2012-06-28 08:07  hvlad 
+   M src/jrd/ntrace.h
+   M src/jrd/tra.cpp
+   M src/jrd/trace/TraceJrdHelpers.h
+   M src/jrd/trace/TraceManager.cpp
+   M src/jrd/trace/TraceManager.h
+   M src/jrd/trace/TraceObjects.h
+   M src/jrd/vio.cpp
+   M src/jrd/vio_proto.h
+   M src/utilities/ntrace/TracePluginImpl.cpp
+   M src/utilities/ntrace/TracePluginImpl.h
+   M src/utilities/ntrace/fbtrace.conf
+   M src/utilities/ntrace/paramtable.h
+Improvement CORE-3656 : Support for sweep information in Trace API
+
+ 2012-06-28 07:27  dimitr 
+   M doc/WhatsNew
+Updated the docs. A couple of the documented changes are still pending, to be committed today.
+
+ 2012-06-28 07:20  hvlad 
+   M src/lock/print.cpp
+Improvement CORE-3879 : Make fb_lock_print a bit more handy
+
  2012-06-27 11:54  alexpeshkoff 
    M src/jrd/isc_file.cpp
 Backported fix for posix of CORE-3875: GBak does not check correctly parameters and backups random database with -B ":"

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-29 04:23:39 UTC (rev 54693)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-29 04:33:44 UTC (rev 54694)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26503
+  FORMAL BUILD NUMBER:26508
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26503"
-#define FILE_VER_STRING "WI-V2.5.2.26503"
-#define LICENSE_VER_STRING "WI-V2.5.2.26503"
-#define FILE_VER_NUMBER 2, 5, 2, 26503
+#define PRODUCT_VER_STRING "2.5.2.26508"
+#define FILE_VER_STRING "WI-V2.5.2.26508"
+#define LICENSE_VER_STRING "WI-V2.5.2.26508"
+#define FILE_VER_NUMBER 2, 5, 2, 26508
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26503"
+#define FB_BUILD_NO "26508"
 #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	2012-06-29 04:23:39 UTC (rev 54693)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-29 04:33:44 UTC (rev 54694)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26503
+BuildNum=26508
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54700] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-06-30 04:50:36

Revision: 54700
          http://firebird.svn.sourceforge.net/firebird/?rev=54700&view=rev
Author:   firebirds
Date:     2012-06-30 04:50:30 +0000 (Sat, 30 Jun 2012)
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	2012-06-30 04:29:35 UTC (rev 54699)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-30 04:50:30 UTC (rev 54700)
@@ -1,3 +1,12 @@
+ 2012-06-29 16:29  hvlad 
+   M src/jrd/vio.cpp
+Enabled per-table runtime stats for sweeper (necessary for CORE-3656). 
+I don't think it will have noticeable performance penalty on current HW.
+
+ 2012-06-29 07:14  alexpeshkoff 
+   M src/jrd/svc.cpp
+Removed unused var - thanks to Adriano
+
  2012-06-28 10:53  hvlad 
    M src/jrd/tra.cpp
 Improvement CORE-2668 : Write note into log when automatic sweep is started

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-30 04:29:35 UTC (rev 54699)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-30 04:50:30 UTC (rev 54700)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26508
+  FORMAL BUILD NUMBER:26510
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26508"
-#define FILE_VER_STRING "WI-V2.5.2.26508"
-#define LICENSE_VER_STRING "WI-V2.5.2.26508"
-#define FILE_VER_NUMBER 2, 5, 2, 26508
+#define PRODUCT_VER_STRING "2.5.2.26510"
+#define FILE_VER_STRING "WI-V2.5.2.26510"
+#define LICENSE_VER_STRING "WI-V2.5.2.26510"
+#define FILE_VER_NUMBER 2, 5, 2, 26510
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26508"
+#define FB_BUILD_NO "26510"
 #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	2012-06-30 04:29:35 UTC (rev 54699)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-30 04:50:30 UTC (rev 54700)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26508
+BuildNum=26510
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54703] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-06 04:38:03

Revision: 54703
          http://firebird.svn.sourceforge.net/firebird/?rev=54703&view=rev
Author:   firebirds
Date:     2012-07-06 04:37:56 +0000 (Fri, 06 Jul 2012)
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	2012-07-05 09:49:23 UTC (rev 54702)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-06 04:37:56 UTC (rev 54703)
@@ -1,3 +1,7 @@
+ 2012-07-05 09:49  hvlad 
+   M src/jrd/trace/TraceDSQLHelpers.h
+Fixed bug CORE-3884 : Server crashes on preparing empty query when trace is enabled
+
  2012-06-29 16:29  hvlad 
    M src/jrd/vio.cpp
 Enabled per-table runtime stats for sweeper (necessary for CORE-3656). 

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-05 09:49:23 UTC (rev 54702)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-06 04:37:56 UTC (rev 54703)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26510
+  FORMAL BUILD NUMBER:26511
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26510"
-#define FILE_VER_STRING "WI-V2.5.2.26510"
-#define LICENSE_VER_STRING "WI-V2.5.2.26510"
-#define FILE_VER_NUMBER 2, 5, 2, 26510
+#define PRODUCT_VER_STRING "2.5.2.26511"
+#define FILE_VER_STRING "WI-V2.5.2.26511"
+#define LICENSE_VER_STRING "WI-V2.5.2.26511"
+#define FILE_VER_NUMBER 2, 5, 2, 26511
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26510"
+#define FB_BUILD_NO "26511"
 #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	2012-07-05 09:49:23 UTC (rev 54702)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-06 04:37:56 UTC (rev 54703)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26510
+BuildNum=26511
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54704] firebird/branches/B2_5_Release

From: <asf...@us...> - 2012-07-10 16:00:39

Revision: 54704
          http://firebird.svn.sourceforge.net/firebird/?rev=54704&view=rev
Author:   asfernandes
Date:     2012-07-10 16:00:27 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Rework on CORE-3238 - Makes GEN_UUID return a compliant RFC-4122 binary UUID.
Fixed CORE-3887 - CHAR_TO_UUID and UUID_TO_CHAR works different in big/little endian architectures - problem similar to CORE-2898.

Modified Paths:
--------------
    firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
    firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
    firebird/branches/B2_5_Release/src/jrd/os/guid.h
    firebird/branches/B2_5_Release/src/jrd/trace/TraceService.cpp
    firebird/branches/B2_5_Release/src/utilities/gstat/ppg.cpp
    firebird/branches/B2_5_Release/src/utilities/nbackup.cpp

Modified: firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
===================================================================
--- firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt	2012-07-10 16:00:27 UTC (rev 54704)
@@ -246,38 +246,18 @@
 Format:
     CHAR_TO_UUID( <string> )
 
-Notes:
-    If you have not used this function before, its usage is discouraged. CHAR_TO_UUID2 supersedes it.
+Important (for big-endian servers):
+    It has been discovered that before Firebird 2.5.2, CHAR_TO_UUID and UUID_TO_CHAR works
+    incorrectly in big-endian servers. In these machines, bytes/characters are swapped and goes in
+    wrong positions when converting. This bug was fixed in 2.5.2 and 3.0, but that means these
+    functions now returns different values (for the same input parameter) than before.
 
 Example:
     select char_to_uuid('93519227-8D50-4E47-81AA-8F6678C096A1') from rdb$database;
 
-See also: GEN_UUID, CHAR_TO_UUID2, UUID_TO_CHAR and UUID_TO_CHAR2
+See also: GEN_UUID and UUID_TO_CHAR
 
 
--------------
-CHAR_TO_UUID2
--------------
-
-Function:
-    Converts the CHAR(32) ASCII representation of an UUID
-    (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx) to the CHAR(16) OCTETS
-    representation (optimized for storage).
-
-Format:
-    CHAR_TO_UUID2( <string> )
-
-Notes:
-    This function supersedes CHAR_TO_UUID. The difference between them is that CHAR_TO_UUID does a
-    byte-by-byte conversion of the ASCII string to the OCTETS one, while CHAR_TO_UUID2 converts
-    a RFC-4122 compliant ASCII UUID to a compliant OCTETS string.
-
-Example:
-    select char_to_uuid2('93519227-8D50-4E47-81AA-8F6678C096A1') from rdb$database;
-
-See also: GEN_UUID, UUID_TO_CHAR2
-
-
 ---
 COS
 ---
@@ -431,17 +411,17 @@
 Format:
     GEN_UUID()
 
-Notes:
-    In Firebird 2.5.0 and 2.5.1, GEN_UUID was returning completely random strings. This is not
-    compliant with the RFC-4122 (UUID specification).
-    In Firebird 2.5.2 and 3.0 this was fixed. Now GEN_UUID returns a compliant UUID version 4
+Important:
+    Before Firebird 2.5.2, GEN_UUID was returning completely random strings. This is not compliant
+    with the RFC-4122 (UUID specification).
+    This was fixed in Firebird 2.5.2 and 3.0. Now GEN_UUID returns a compliant UUID version 4
     string, where some bits are reserved and the others are random. The string format of a compliant
     UUID is XXXXXXXX-XXXX-4XXX-YXXX-XXXXXXXXXXXX, where 4 is fixed (version) and Y is 8, 9, A or B.
 
 Example:
     insert into records (id) value (gen_uuid());
 
-See also: CHAR_TO_UUID, UUID_TO_CHAR, CHAR_TO_UUID2, UUID_TO_CHAR2
+See also: CHAR_TO_UUID and UUID_TO_CHAR
 
 
 ----
@@ -869,33 +849,13 @@
 Format:
     UUID_TO_CHAR( <string> )
 
-Notes:
-    If you have not used this function before, its usage is discouraged. UUID_TO_CHAR2 supersedes it.
+Important (for big-endian servers):
+    It has been discovered that before Firebird 2.5.2, CHAR_TO_UUID and UUID_TO_CHAR works
+    incorrectly in big-endian servers. In these machines, bytes/characters are swapped and goes in
+    wrong positions when converting. This bug was fixed in 2.5.2 and 3.0, but that means these
+    functions now returns different values (for the same input parameter) than before.
 
 Example:
     select uuid_to_char(gen_uuid()) from rdb$database;
 
-See also: GEN_UUID, UUID_TO_CHAR2, CHAR_TO_UUID and CHAR_TO_UUID2
-
-
--------------
-UUID_TO_CHAR2
--------------
-
-Function:
-    Converts a CHAR(16) OCTETS UUID (that's returned by GEN_UUID) to the
-    CHAR(32) ASCII representation (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).
-
-Format:
-    UUID_TO_CHAR2( <string> )
-
-Notes:
-    This function supersedes UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a
-    byte-by-byte conversion of the OCTETS string to the ASCII one, while UUID_TO_CHAR2 converts
-    a RFC-4122 compliant OCTETS UUID to a compliant ASCII string. Also, UUID_TO_CHAR returns
-    upper-cased string and UUID_TO_CHAR2 returns lower-cased string.
-
-Example:
-    select uuid_to_char2(gen_uuid()) from rdb$database;
-
-See also: GEN_UUID, CHAR_TO_UUID2
+See also: GEN_UUID and CHAR_TO_UUID

Modified: firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp	2012-07-10 16:00:27 UTC (rev 54704)
@@ -68,9 +68,7 @@
 	funLPad,
 	funRPad,
 	funLnat,
-	funLog10,
-	funUuidBroken,
-	funUuidRfc
+	funLog10
 };
 
 enum TrigonFunction
@@ -1433,40 +1431,19 @@
 	buffer[38] = '\0';
 	memcpy(buffer + 1, data, GUID_BODY_SIZE);
 
-	FB_GUID guid;
+	USHORT bytes[16];
+	sscanf(buffer, GUID_NEW_FORMAT,
+		&bytes[0], &bytes[1], &bytes[2], &bytes[3],
+		&bytes[4], &bytes[5], &bytes[6], &bytes[7],
+		&bytes[8], &bytes[9], &bytes[10], &bytes[11],
+		&bytes[12], &bytes[13], &bytes[14], &bytes[15]);
 
-	switch ((Function)(IPTR) function->misc)
-	{
-		case funUuidBroken:
-			StringToGuid(&guid, buffer, false);
-			break;
+	UCHAR resultData[16];
+	for (unsigned i = 0; i < 16; ++i)
+		resultData[i] = (UCHAR) bytes[i];
 
-		case funUuidRfc:
-		{
-			USHORT bytes[16];
-			sscanf(buffer, GUID_NEW_FORMAT_LOWER,
-				&bytes[0], &bytes[1], &bytes[2], &bytes[3],
-				&bytes[4], &bytes[5], &bytes[6], &bytes[7],
-				&bytes[8], &bytes[9], &bytes[10], &bytes[11],
-				&bytes[12], &bytes[13], &bytes[14], &bytes[15]);
-
-			guid.data1 = (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3];
-			guid.data2 = (bytes[4] << 8) | bytes[5];
-			guid.data3 = (bytes[6] << 8) | bytes[7];
-			guid.data4[0] = bytes[8];
-			guid.data4[1] = bytes[9];
-			guid.data4[2] = bytes[10];
-			guid.data4[3] = bytes[11];
-			guid.data4[4] = bytes[12];
-			guid.data4[5] = bytes[13];
-			guid.data4[6] = bytes[14];
-			guid.data4[7] = bytes[15];
-			break;
-		}
-	}
-
 	dsc result;
-	result.makeText(16, ttype_binary, reinterpret_cast<UCHAR*>(guid.data));
+	result.makeText(16, ttype_binary, resultData);
 	EVL_make_value(tdbb, &result, impure);
 
 	return &impure->vlu_desc;
@@ -1999,8 +1976,26 @@
 
 	GenerateGuid(&guid);
 
+	UCHAR data[16];
+	data[0] = (guid.data1 >> 24) & 0xFF;
+	data[1] = (guid.data1 >> 16) & 0xFF;
+	data[2] = (guid.data1 >> 8) & 0xFF;
+	data[3] = guid.data1 & 0xFF;
+	data[4] = (guid.data2 >> 8) & 0xFF;
+	data[5] = guid.data2 & 0xFF;
+	data[6] = (guid.data3 >> 8) & 0xFF;
+	data[7] = guid.data3 & 0xFF;
+	data[8] = guid.data4[0];
+	data[9] = guid.data4[1];
+	data[10] = guid.data4[2];
+	data[11] = guid.data4[3];
+	data[12] = guid.data4[4];
+	data[13] = guid.data4[5];
+	data[14] = guid.data4[6];
+	data[15] = guid.data4[7];
+
 	dsc result;
-	result.makeText(16, ttype_binary, reinterpret_cast<UCHAR*>(guid.data));
+	result.makeText(16, ttype_binary, data);
 	EVL_make_value(tdbb, &result, impure);
 
 	return &impure->vlu_desc;
@@ -3319,28 +3314,13 @@
 										Arg::Str(function->name));
 	}
 
-	const FB_GUID* guid = reinterpret_cast<const FB_GUID*>(data);
 	char buffer[GUID_BUFF_SIZE];
+	sprintf(buffer, GUID_NEW_FORMAT,
+		USHORT(data[0]), USHORT(data[1]), USHORT(data[2]), USHORT(data[3]), USHORT(data[4]),
+		USHORT(data[5]), USHORT(data[6]), USHORT(data[7]), USHORT(data[8]), USHORT(data[9]),
+		USHORT(data[10]), USHORT(data[11]), USHORT(data[12]), USHORT(data[13]), USHORT(data[14]),
+		USHORT(data[15]));
 
-	switch ((Function)(IPTR) function->misc)
-	{
-		case funUuidBroken:
-			GuidToString(buffer, guid, false);
-			break;
-
-		case funUuidRfc:
-			sprintf(buffer, GUID_NEW_FORMAT_LOWER,
-				USHORT((guid->data1 >> 24) & 0xFF), USHORT((guid->data1 >> 16) & 0xFF),
-				USHORT((guid->data1 >> 8) & 0xFF), USHORT(guid->data1 & 0xFF),
-				USHORT((guid->data2 >> 8) & 0xFF), USHORT(guid->data2 & 0xFF),
-				USHORT((guid->data3 >> 8) & 0xFF), USHORT(guid->data3 & 0xFF),
-				USHORT(guid->data4[0]), USHORT(guid->data4[1]),
-				USHORT(guid->data4[2]), USHORT(guid->data4[3]),
-				USHORT(guid->data4[4]), USHORT(guid->data4[5]),
-				USHORT(guid->data4[6]), USHORT(guid->data4[7]));
-			break;
-	}
-
 	dsc result;
 	result.makeText(GUID_BODY_SIZE, ttype_ascii, reinterpret_cast<UCHAR*>(buffer) + 1);
 	EVL_make_value(tdbb, &result, impure);
@@ -3374,8 +3354,7 @@
 		{"BIN_XOR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinXor},
 		{"CEIL", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
 		{"CEILING", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
-		{"CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, (void*) funUuidBroken},
-		{"CHAR_TO_UUID2", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, (void*) funUuidRfc},
+		{"CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, NULL},
 		{"COS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCos},
 		{"COSH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCosh},
 		{"COT", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCot},
@@ -3410,8 +3389,7 @@
 		{"TAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfTan},
 		{"TANH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfTanh},
 		{"TRUNC", 1, 2, setParamsRoundTrunc, makeTrunc, evlTrunc, NULL},
-		{"UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, (void*) funUuidBroken},
-		{"UUID_TO_CHAR2", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, (void*) funUuidRfc},
+		{"UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, NULL},
 		{"", 0, 0, NULL, NULL, NULL, NULL}
 	};
 

Modified: firebird/branches/B2_5_Release/src/jrd/os/guid.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/guid.h	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/src/jrd/os/guid.h	2012-07-10 16:00:27 UTC (rev 54704)
@@ -39,10 +39,8 @@
 
 const char* const GUID_LEGACY_FORMAT =
 	"{%04hX%04hX-%04hX-%04hX-%04hX-%04hX%04hX%04hX}";
-const char* const GUID_NEW_FORMAT_UPPER =
+const char* const GUID_NEW_FORMAT =
 	"{%02hX%02hX%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX%02hX%02hX%02hX%02hX}";
-const char* const GUID_NEW_FORMAT_LOWER =
-	"{%02hx%02hx%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx%02hx%02hx%02hx%02hx}";
 
 struct FB_GUID
 {
@@ -63,56 +61,21 @@
 void GenerateRandomBytes(void* buffer, size_t size);
 void GenerateGuid(FB_GUID* guid);
 
-// These functions receive buffers of at least GUID_BUFF_SIZE length
+// These functions receive buffers of at least GUID_BUFF_SIZE length.
+// Warning: they are BROKEN in little-endian and should not be used on new code.
 
-inline void GuidToString(char* buffer, const FB_GUID* guid, bool legacy)
+inline void GuidToString(char* buffer, const FB_GUID* guid)
 {
-	if (legacy)	// nbackup guid
-	{
-		sprintf(buffer, GUID_LEGACY_FORMAT,
-			guid->data[0], guid->data[1], guid->data[2], guid->data[3],
-			guid->data[4], guid->data[5], guid->data[6], guid->data[7]);
-	}
-	else
-	{
-		sprintf(buffer, GUID_NEW_FORMAT_UPPER,
-			USHORT(guid->data[0] & 0xFF), USHORT(guid->data[0] >> 8),
-			USHORT(guid->data[1] & 0xFF), USHORT(guid->data[1] >> 8),
-			USHORT(guid->data[2] & 0xFF), USHORT(guid->data[2] >> 8),
-			USHORT(guid->data[3] & 0xFF), USHORT(guid->data[3] >> 8),
-			USHORT(guid->data[4] & 0xFF), USHORT(guid->data[4] >> 8),
-			USHORT(guid->data[5] & 0xFF), USHORT(guid->data[5] >> 8),
-			USHORT(guid->data[6] & 0xFF), USHORT(guid->data[6] >> 8),
-			USHORT(guid->data[7] & 0xFF), USHORT(guid->data[7] >> 8));
-	}
+	sprintf(buffer, GUID_LEGACY_FORMAT,
+		guid->data[0], guid->data[1], guid->data[2], guid->data[3],
+		guid->data[4], guid->data[5], guid->data[6], guid->data[7]);
 }
 
-inline void StringToGuid(FB_GUID* guid, const char* buffer, bool legacy)
+inline void StringToGuid(FB_GUID* guid, const char* buffer)
 {
-	if (legacy)	// nbackup guid
-	{
-		sscanf(buffer, GUID_LEGACY_FORMAT,
-			&guid->data[0], &guid->data[1], &guid->data[2], &guid->data[3],
-			&guid->data[4], &guid->data[5], &guid->data[6], &guid->data[7]);
-	}
-	else
-	{
-		USHORT bytes[16];
-		sscanf(buffer, GUID_NEW_FORMAT_UPPER,
-			&bytes[0], &bytes[1], &bytes[2], &bytes[3],
-			&bytes[4], &bytes[5], &bytes[6], &bytes[7],
-			&bytes[8], &bytes[9], &bytes[10], &bytes[11],
-			&bytes[12], &bytes[13], &bytes[14], &bytes[15]);
-
-		guid->data[0] = bytes[0] | (bytes[1] << 8);
-		guid->data[1] = bytes[2] | (bytes[3] << 8);
-		guid->data[2] = bytes[4] | (bytes[5] << 8);
-		guid->data[3] = bytes[6] | (bytes[7] << 8);
-		guid->data[4] = bytes[8] | (bytes[9] << 8);
-		guid->data[5] = bytes[10] | (bytes[11] << 8);
-		guid->data[6] = bytes[12] | (bytes[13] << 8);
-		guid->data[7] = bytes[14] | (bytes[15] << 8);
-	}
+	sscanf(buffer, GUID_LEGACY_FORMAT,
+		&guid->data[0], &guid->data[1], &guid->data[2], &guid->data[3],
+		&guid->data[4], &guid->data[5], &guid->data[6], &guid->data[7]);
 }
 
 #endif

Modified: firebird/branches/B2_5_Release/src/jrd/trace/TraceService.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/trace/TraceService.cpp	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/src/jrd/trace/TraceService.cpp	2012-07-10 16:00:27 UTC (rev 54704)
@@ -107,7 +107,7 @@
 			GenerateGuid(&guid);
 
 			char* buff = session.ses_logfile.getBuffer(GUID_BUFF_SIZE);
-			GuidToString(buff, &guid, true);
+			GuidToString(buff, &guid);
 
 			session.ses_logfile.insert(0, "fb_trace.");
 		}

Modified: firebird/branches/B2_5_Release/src/utilities/gstat/ppg.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/utilities/gstat/ppg.cpp	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/src/utilities/gstat/ppg.cpp	2012-07-10 16:00:27 UTC (rev 54704)
@@ -251,7 +251,7 @@
 		case HDR_backup_guid:
 		{
 			char buff[GUID_BUFF_SIZE];
-			GuidToString(buff, reinterpret_cast<const FB_GUID*>(p + 2), true);
+			GuidToString(buff, reinterpret_cast<const FB_GUID*>(p + 2));
 			uSvc->printf(false, "\tDatabase backup GUID:\t%s\n", buff);
 			break;
 		}

Modified: firebird/branches/B2_5_Release/src/utilities/nbackup.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/utilities/nbackup.cpp	2012-07-06 04:37:56 UTC (rev 54703)
+++ firebird/branches/B2_5_Release/src/utilities/nbackup.cpp	2012-07-10 16:00:27 UTC (rev 54704)
@@ -890,7 +890,7 @@
 			bh.version = 1;
 			bh.level = level;
 			bh.backup_guid = backup_guid;
-			StringToGuid(&bh.prev_guid, prev_guid, true);
+			StringToGuid(&bh.prev_guid, prev_guid);
 			bh.page_size = header->hdr_page_size;
 			bh.backup_scn = backup_scn;
 			bh.prev_scn = prev_scn;
@@ -990,7 +990,7 @@
 		in_sqlda->sqlvar[0].sqldata = (char*)&level;
 		in_sqlda->sqlvar[0].sqlind = &null_flag;
 		char temp[GUID_BUFF_SIZE];
-		GuidToString(temp, &backup_guid, true);
+		GuidToString(temp, &backup_guid);
 		in_sqlda->sqlvar[1].sqldata = temp;
 		in_sqlda->sqlvar[1].sqlind = &null_flag;
 		in_sqlda->sqlvar[2].sqldata = (char*)&backup_scn;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Firebird-checkins] SF.net SVN: firebird:[54710] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-11 05:07:11

Revision: 54710
          http://firebird.svn.sourceforge.net/firebird/?rev=54710&view=rev
Author:   firebirds
Date:     2012-07-11 05:07:03 +0000 (Wed, 11 Jul 2012)
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	2012-07-11 04:34:13 UTC (rev 54709)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-11 05:07:03 UTC (rev 54710)
@@ -1,3 +1,22 @@
+ 2012-07-11 01:38  asfernandes 
+   M src/dsql/keywords.cpp
+   M src/dsql/parse.y
+More changes related to CORE-3238 and CORE-3887.
+
+ 2012-07-10 16:09  asfernandes 
+   M doc/WhatsNew
+Update.
+
+ 2012-07-10 16:00  asfernandes 
+   M doc/sql.extensions/README.builtin_functions.txt
+   M src/jrd/SysFunction.cpp
+   M src/jrd/os/guid.h
+   M src/jrd/trace/TraceService.cpp
+   M src/utilities/gstat/ppg.cpp
+   M src/utilities/nbackup.cpp
+Rework on CORE-3238 - Makes GEN_UUID return a compliant RFC-4122 binary UUID.
+Fixed CORE-3887 - CHAR_TO_UUID and UUID_TO_CHAR works different in big/little endian architectures - problem similar to CORE-2898.
+
  2012-07-05 09:49  hvlad 
    M src/jrd/trace/TraceDSQLHelpers.h
 Fixed bug CORE-3884 : Server crashes on preparing empty query when trace is enabled

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-11 04:34:13 UTC (rev 54709)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-11 05:07:03 UTC (rev 54710)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26511
+  FORMAL BUILD NUMBER:26514
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26511"
-#define FILE_VER_STRING "WI-V2.5.2.26511"
-#define LICENSE_VER_STRING "WI-V2.5.2.26511"
-#define FILE_VER_NUMBER 2, 5, 2, 26511
+#define PRODUCT_VER_STRING "2.5.2.26514"
+#define FILE_VER_STRING "WI-V2.5.2.26514"
+#define LICENSE_VER_STRING "WI-V2.5.2.26514"
+#define FILE_VER_NUMBER 2, 5, 2, 26514
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26511"
+#define FB_BUILD_NO "26514"
 #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	2012-07-11 04:34:13 UTC (rev 54709)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-11 05:07:03 UTC (rev 54710)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26511
+BuildNum=26514
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54715] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-12 04:49:45

Revision: 54715
          http://firebird.svn.sourceforge.net/firebird/?rev=54715&view=rev
Author:   firebirds
Date:     2012-07-12 04:49:38 +0000 (Thu, 12 Jul 2012)
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	2012-07-12 04:29:39 UTC (rev 54714)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-12 04:49:38 UTC (rev 54715)
@@ -1,3 +1,7 @@
+ 2012-07-11 05:20  dimitr 
+   M doc/WhatsNew
+Updated the docs.
+
  2012-07-11 01:38  asfernandes 
    M src/dsql/keywords.cpp
    M src/dsql/parse.y

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-12 04:29:39 UTC (rev 54714)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-12 04:49:38 UTC (rev 54715)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26514
+  FORMAL BUILD NUMBER:26515
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26514"
-#define FILE_VER_STRING "WI-V2.5.2.26514"
-#define LICENSE_VER_STRING "WI-V2.5.2.26514"
-#define FILE_VER_NUMBER 2, 5, 2, 26514
+#define PRODUCT_VER_STRING "2.5.2.26515"
+#define FILE_VER_STRING "WI-V2.5.2.26515"
+#define LICENSE_VER_STRING "WI-V2.5.2.26515"
+#define FILE_VER_NUMBER 2, 5, 2, 26515
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26514"
+#define FB_BUILD_NO "26515"
 #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	2012-07-12 04:29:39 UTC (rev 54714)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-12 04:49:38 UTC (rev 54715)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26514
+BuildNum=26515
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54719] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-13 04:41:06

Revision: 54719
          http://firebird.svn.sourceforge.net/firebird/?rev=54719&view=rev
Author:   firebirds
Date:     2012-07-13 04:40:59 +0000 (Fri, 13 Jul 2012)
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	2012-07-13 04:30:40 UTC (rev 54718)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-13 04:40:59 UTC (rev 54719)
@@ -1,3 +1,7 @@
+ 2012-07-12 06:33  robocop 
+   M doc/README.services_extension
+Misc.
+
  2012-07-11 05:20  dimitr 
    M doc/WhatsNew
 Updated the docs.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-13 04:30:40 UTC (rev 54718)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-13 04:40:59 UTC (rev 54719)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26515
+  FORMAL BUILD NUMBER:26516
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26515"
-#define FILE_VER_STRING "WI-V2.5.2.26515"
-#define LICENSE_VER_STRING "WI-V2.5.2.26515"
-#define FILE_VER_NUMBER 2, 5, 2, 26515
+#define PRODUCT_VER_STRING "2.5.2.26516"
+#define FILE_VER_STRING "WI-V2.5.2.26516"
+#define LICENSE_VER_STRING "WI-V2.5.2.26516"
+#define FILE_VER_NUMBER 2, 5, 2, 26516
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26515"
+#define FB_BUILD_NO "26516"
 #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	2012-07-13 04:30:40 UTC (rev 54718)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-13 04:40:59 UTC (rev 54719)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26515
+BuildNum=26516
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54727] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-17 04:31:21

Revision: 54727
          http://firebird.svn.sourceforge.net/firebird/?rev=54727&view=rev
Author:   firebirds
Date:     2012-07-17 04:31:15 +0000 (Tue, 17 Jul 2012)
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	2012-07-17 04:19:36 UTC (rev 54726)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-17 04:31:15 UTC (rev 54727)
@@ -1,3 +1,7 @@
+ 2012-07-16 10:43  alexpeshkoff 
+   M src/utilities/fbsvcmgr.cpp
+Removed debugging code
+
  2012-07-12 06:33  robocop 
    M doc/README.services_extension
 Misc.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-17 04:19:36 UTC (rev 54726)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-17 04:31:15 UTC (rev 54727)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26516
+  FORMAL BUILD NUMBER:26517
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26516"
-#define FILE_VER_STRING "WI-V2.5.2.26516"
-#define LICENSE_VER_STRING "WI-V2.5.2.26516"
-#define FILE_VER_NUMBER 2, 5, 2, 26516
+#define PRODUCT_VER_STRING "2.5.2.26517"
+#define FILE_VER_STRING "WI-V2.5.2.26517"
+#define LICENSE_VER_STRING "WI-V2.5.2.26517"
+#define FILE_VER_NUMBER 2, 5, 2, 26517
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26516"
+#define FB_BUILD_NO "26517"
 #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	2012-07-17 04:19:36 UTC (rev 54726)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-17 04:31:15 UTC (rev 54727)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26516
+BuildNum=26517
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54742] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-24 04:51:00

Revision: 54742
          http://firebird.svn.sourceforge.net/firebird/?rev=54742&view=rev
Author:   firebirds
Date:     2012-07-24 04:50:53 +0000 (Tue, 24 Jul 2012)
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	2012-07-24 04:28:46 UTC (rev 54741)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-24 04:50:53 UTC (rev 54742)
@@ -1,3 +1,8 @@
+ 2012-07-23 09:20  hvlad 
+   M src/jrd/exe.cpp
+   M src/jrd/tra.h
+Fixed bug CORE-3895 : High memory usage when PSQL code SELECT's from stored procedure which modified some data
+
  2012-07-16 10:43  alexpeshkoff 
    M src/utilities/fbsvcmgr.cpp
 Removed debugging code

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-24 04:28:46 UTC (rev 54741)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-24 04:50:53 UTC (rev 54742)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26517
+  FORMAL BUILD NUMBER:26518
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26517"
-#define FILE_VER_STRING "WI-V2.5.2.26517"
-#define LICENSE_VER_STRING "WI-V2.5.2.26517"
-#define FILE_VER_NUMBER 2, 5, 2, 26517
+#define PRODUCT_VER_STRING "2.5.2.26518"
+#define FILE_VER_STRING "WI-V2.5.2.26518"
+#define LICENSE_VER_STRING "WI-V2.5.2.26518"
+#define FILE_VER_NUMBER 2, 5, 2, 26518
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26517"
+#define FB_BUILD_NO "26518"
 #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	2012-07-24 04:28:46 UTC (rev 54741)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-24 04:50:53 UTC (rev 54742)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26517
+BuildNum=26518
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54747] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-26 04:50:11

Revision: 54747
          http://firebird.svn.sourceforge.net/firebird/?rev=54747&view=rev
Author:   firebirds
Date:     2012-07-26 04:50:05 +0000 (Thu, 26 Jul 2012)
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	2012-07-25 11:11:55 UTC (rev 54746)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-26 04:50:05 UTC (rev 54747)
@@ -1,3 +1,8 @@
+ 2012-07-25 11:11  alexpeshkoff 
+   M src/common/classes/semaphore.cpp
+   M src/common/fb_exception.cpp
+Mac port
+
  2012-07-23 09:20  hvlad 
    M src/jrd/exe.cpp
    M src/jrd/tra.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-25 11:11:55 UTC (rev 54746)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-26 04:50:05 UTC (rev 54747)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26518
+  FORMAL BUILD NUMBER:26519
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26518"
-#define FILE_VER_STRING "WI-V2.5.2.26518"
-#define LICENSE_VER_STRING "WI-V2.5.2.26518"
-#define FILE_VER_NUMBER 2, 5, 2, 26518
+#define PRODUCT_VER_STRING "2.5.2.26519"
+#define FILE_VER_STRING "WI-V2.5.2.26519"
+#define LICENSE_VER_STRING "WI-V2.5.2.26519"
+#define FILE_VER_NUMBER 2, 5, 2, 26519
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26518"
+#define FB_BUILD_NO "26519"
 #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	2012-07-25 11:11:55 UTC (rev 54746)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-26 04:50:05 UTC (rev 54747)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26518
+BuildNum=26519
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[54760] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-07-29 04:22:21

Revision: 54760
          http://firebird.svn.sourceforge.net/firebird/?rev=54760&view=rev
Author:   firebirds
Date:     2012-07-29 04:22:14 +0000 (Sun, 29 Jul 2012)
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	2012-07-29 00:24:00 UTC (rev 54759)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-07-29 04:22:14 UTC (rev 54760)
@@ -1,3 +1,7 @@
+ 2012-07-29 00:21  robocop 
+   M doc/sql.extensions/README.builtin_functions.txt
+Misc.
+
  2012-07-25 11:11  alexpeshkoff 
    M src/common/classes/semaphore.cpp
    M src/common/fb_exception.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-29 00:24:00 UTC (rev 54759)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-07-29 04:22:14 UTC (rev 54760)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26519
+  FORMAL BUILD NUMBER:26520
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26519"
-#define FILE_VER_STRING "WI-V2.5.2.26519"
-#define LICENSE_VER_STRING "WI-V2.5.2.26519"
-#define FILE_VER_NUMBER 2, 5, 2, 26519
+#define PRODUCT_VER_STRING "2.5.2.26520"
+#define FILE_VER_STRING "WI-V2.5.2.26520"
+#define LICENSE_VER_STRING "WI-V2.5.2.26520"
+#define FILE_VER_NUMBER 2, 5, 2, 26520
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26519"
+#define FB_BUILD_NO "26520"
 #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	2012-07-29 00:24:00 UTC (rev 54759)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-07-29 04:22:14 UTC (rev 54760)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26519
+BuildNum=26520
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57020] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-09 04:44:39

Revision: 57020
          http://firebird.svn.sourceforge.net/firebird/?rev=57020&view=rev
Author:   firebirds
Date:     2012-08-09 04:44:33 +0000 (Thu, 09 Aug 2012)
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	2012-08-09 04:26:23 UTC (rev 57019)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-09 04:44:33 UTC (rev 57020)
@@ -1,3 +1,7 @@
+ 2012-08-08 14:38  paulbeach 
+   M builds/posix/prefix.darwin_x86_64
+Fix CORE-3740 - optimisation bug in GCC
+
  2012-07-29 00:21  robocop 
    M doc/sql.extensions/README.builtin_functions.txt
 Misc.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-09 04:26:23 UTC (rev 57019)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-09 04:44:33 UTC (rev 57020)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26520
+  FORMAL BUILD NUMBER:26521
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26520"
-#define FILE_VER_STRING "WI-V2.5.2.26520"
-#define LICENSE_VER_STRING "WI-V2.5.2.26520"
-#define FILE_VER_NUMBER 2, 5, 2, 26520
+#define PRODUCT_VER_STRING "2.5.2.26521"
+#define FILE_VER_STRING "WI-V2.5.2.26521"
+#define LICENSE_VER_STRING "WI-V2.5.2.26521"
+#define FILE_VER_NUMBER 2, 5, 2, 26521
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26520"
+#define FB_BUILD_NO "26521"
 #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	2012-08-09 04:26:23 UTC (rev 57019)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-09 04:44:33 UTC (rev 57020)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26520
+BuildNum=26521
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57026] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-11 04:41:17

Revision: 57026
          http://firebird.svn.sourceforge.net/firebird/?rev=57026&view=rev
Author:   firebirds
Date:     2012-08-11 04:41:10 +0000 (Sat, 11 Aug 2012)
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	2012-08-11 04:22:11 UTC (rev 57025)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-11 04:41:10 UTC (rev 57026)
@@ -1,3 +1,9 @@
+ 2012-08-11 02:39  robocop 
+   M src/jrd/trace/TraceJrdHelpers.h
+   M src/msgs/facilities2.sql
+   M src/msgs/history2.sql
+Misc.
+
  2012-08-08 14:38  paulbeach 
    M builds/posix/prefix.darwin_x86_64
 Fix CORE-3740 - optimisation bug in GCC

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-11 04:22:11 UTC (rev 57025)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-11 04:41:10 UTC (rev 57026)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26521
+  FORMAL BUILD NUMBER:26522
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26521"
-#define FILE_VER_STRING "WI-V2.5.2.26521"
-#define LICENSE_VER_STRING "WI-V2.5.2.26521"
-#define FILE_VER_NUMBER 2, 5, 2, 26521
+#define PRODUCT_VER_STRING "2.5.2.26522"
+#define FILE_VER_STRING "WI-V2.5.2.26522"
+#define LICENSE_VER_STRING "WI-V2.5.2.26522"
+#define FILE_VER_NUMBER 2, 5, 2, 26522
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26521"
+#define FB_BUILD_NO "26522"
 #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	2012-08-11 04:22:11 UTC (rev 57025)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-11 04:41:10 UTC (rev 57026)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26521
+BuildNum=26522
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57045] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-17 04:51:03

Revision: 57045
          http://firebird.svn.sourceforge.net/firebird/?rev=57045&view=rev
Author:   firebirds
Date:     2012-08-17 04:50:55 +0000 (Fri, 17 Aug 2012)
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	2012-08-17 04:31:48 UTC (rev 57044)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-17 04:50:55 UTC (rev 57045)
@@ -1,3 +1,22 @@
+ 2012-08-15 15:22  dimitr 
+   M src/jrd/nbak.h
+Corrected the arguments. Luckily, their binary values are the same.
+
+ 2012-08-14 10:37  alexpeshkoff 
+   M src/jrd/isc.h
+   M src/jrd/isc_sync.cpp
+Fixed CORE-3786: Firebird 2.5.1 Classic (32-bit) Hangs on MacOSX 10.7 (Lion) on DB create after reboot
+
+ 2012-08-14 08:09  paulbeach 
+   M builds/posix/darwin.defaults
+   A builds/posix/empty.darwin.vers
+   A builds/posix/firebird.darwin.vers
+Allow build for 2.5.2 on MacOS
+
+ 2012-08-13 16:49  dimitr 
+   M src/common/classes/stack.h
+Fixed the server crash in Stack::assign().
+
  2012-08-11 02:39  robocop 
    M src/jrd/trace/TraceJrdHelpers.h
    M src/msgs/facilities2.sql

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-17 04:31:48 UTC (rev 57044)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-17 04:50:55 UTC (rev 57045)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26522
+  FORMAL BUILD NUMBER:26526
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26522"
-#define FILE_VER_STRING "WI-V2.5.2.26522"
-#define LICENSE_VER_STRING "WI-V2.5.2.26522"
-#define FILE_VER_NUMBER 2, 5, 2, 26522
+#define PRODUCT_VER_STRING "2.5.2.26526"
+#define FILE_VER_STRING "WI-V2.5.2.26526"
+#define LICENSE_VER_STRING "WI-V2.5.2.26526"
+#define FILE_VER_NUMBER 2, 5, 2, 26526
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26522"
+#define FB_BUILD_NO "26526"
 #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	2012-08-17 04:31:48 UTC (rev 57044)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-17 04:50:55 UTC (rev 57045)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26522
+BuildNum=26526
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57054] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-21 03:55:16

Revision: 57054
          http://firebird.svn.sourceforge.net/firebird/?rev=57054&view=rev
Author:   firebirds
Date:     2012-08-21 03:55:10 +0000 (Tue, 21 Aug 2012)
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	2012-08-21 03:36:19 UTC (rev 57053)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-21 03:55:10 UTC (rev 57054)
@@ -1,3 +1,7 @@
+ 2012-08-21 00:53  asfernandes 
+   M src/dsql/gen.cpp
+Backport fix for CORE-3902 - Derived fields may not be optimized via an index.
+
  2012-08-15 15:22  dimitr 
    M src/jrd/nbak.h
 Corrected the arguments. Luckily, their binary values are the same.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-21 03:36:19 UTC (rev 57053)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-21 03:55:10 UTC (rev 57054)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26526
+  FORMAL BUILD NUMBER:26527
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26526"
-#define FILE_VER_STRING "WI-V2.5.2.26526"
-#define LICENSE_VER_STRING "WI-V2.5.2.26526"
-#define FILE_VER_NUMBER 2, 5, 2, 26526
+#define PRODUCT_VER_STRING "2.5.2.26527"
+#define FILE_VER_STRING "WI-V2.5.2.26527"
+#define LICENSE_VER_STRING "WI-V2.5.2.26527"
+#define FILE_VER_NUMBER 2, 5, 2, 26527
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26526"
+#define FB_BUILD_NO "26527"
 #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	2012-08-21 03:36:19 UTC (rev 57053)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-21 03:55:10 UTC (rev 57054)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26526
+BuildNum=26527
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57058] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-25 03:43:04

Revision: 57058
          http://firebird.svn.sourceforge.net/firebird/?rev=57058&view=rev
Author:   firebirds
Date:     2012-08-25 03:42:56 +0000 (Sat, 25 Aug 2012)
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	2012-08-24 13:30:50 UTC (rev 57057)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-25 03:42:56 UTC (rev 57058)
@@ -1,3 +1,7 @@
+ 2012-08-24 13:30  alexpeshkoff 
+   M src/jrd/isc_sync.cpp
+Better fix for CORE-3786: Firebird 2.5.1 Classic (32-bit) Hangs on MacOSX 10.7 (Lion) on DB create after reboot
+
  2012-08-21 00:53  asfernandes 
    M src/dsql/gen.cpp
 Backport fix for CORE-3902 - Derived fields may not be optimized via an index.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-24 13:30:50 UTC (rev 57057)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-25 03:42:56 UTC (rev 57058)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26527
+  FORMAL BUILD NUMBER:26528
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26527"
-#define FILE_VER_STRING "WI-V2.5.2.26527"
-#define LICENSE_VER_STRING "WI-V2.5.2.26527"
-#define FILE_VER_NUMBER 2, 5, 2, 26527
+#define PRODUCT_VER_STRING "2.5.2.26528"
+#define FILE_VER_STRING "WI-V2.5.2.26528"
+#define LICENSE_VER_STRING "WI-V2.5.2.26528"
+#define FILE_VER_NUMBER 2, 5, 2, 26528
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26527"
+#define FB_BUILD_NO "26528"
 #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	2012-08-24 13:30:50 UTC (rev 57057)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-25 03:42:56 UTC (rev 57058)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26527
+BuildNum=26528
 
 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.

[Firebird-checkins] SF.net SVN: firebird:[57067] firebird/branches/B2_5_Release

From: <fir...@us...> - 2012-08-29 03:45:19

Revision: 57067
          http://firebird.svn.sourceforge.net/firebird/?rev=57067&view=rev
Author:   firebirds
Date:     2012-08-29 03:45:12 +0000 (Wed, 29 Aug 2012)
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	2012-08-29 03:29:29 UTC (rev 57066)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-08-29 03:45:12 UTC (rev 57067)
@@ -1,3 +1,14 @@
+ 2012-08-28 18:00  dimitr 
+   M src/jrd/tra.cpp
+Misc.
+
+ 2012-08-28 17:58  dimitr 
+   M src/jrd/jrd.cpp
+   M src/jrd/tra.cpp
+   M src/jrd/tra_proto.h
+Fixed the broken (working as no-op) sweep in SuperServer.
+Minor cleanup and simplification.
+
  2012-08-24 13:30  alexpeshkoff 
    M src/jrd/isc_sync.cpp
 Better fix for CORE-3786: Firebird 2.5.1 Classic (32-bit) Hangs on MacOSX 10.7 (Lion) on DB create after reboot

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-29 03:29:29 UTC (rev 57066)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-08-29 03:45:12 UTC (rev 57067)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26528
+  FORMAL BUILD NUMBER:26530
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26528"
-#define FILE_VER_STRING "WI-V2.5.2.26528"
-#define LICENSE_VER_STRING "WI-V2.5.2.26528"
-#define FILE_VER_NUMBER 2, 5, 2, 26528
+#define PRODUCT_VER_STRING "2.5.2.26530"
+#define FILE_VER_STRING "WI-V2.5.2.26530"
+#define LICENSE_VER_STRING "WI-V2.5.2.26530"
+#define FILE_VER_NUMBER 2, 5, 2, 26530
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26528"
+#define FB_BUILD_NO "26530"
 #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	2012-08-29 03:29:29 UTC (rev 57066)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-08-29 03:45:12 UTC (rev 57067)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26528
+BuildNum=26530
 
 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.

<< < 1 .. 9 10 11 12 13 .. 23 > >> (Page 11 of 23)