firebird-checkins Mailing List for Firebird

A powerful, cross platform, SQL database system

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

firebird-checkins — CVS checkins

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (24)	Oct (37)	Nov (42)	Dec (29)
2001	Jan (24)	Feb (24)	Mar (15)	Apr (55)	May (99)	Jun (70)	Jul (197)	Aug (329)	Sep (81)	Oct (141)	Nov (100)	Dec (157)
2002	Jan (96)	Feb (216)	Mar (78)	Apr (103)	May (29)	Jun (193)	Jul (130)	Aug (215)	Sep (262)	Oct (655)	Nov (1009)	Dec (655)
2003	Jan (413)	Feb (939)	Mar (527)	Apr (538)	May (439)	Jun (295)	Jul (681)	Aug (810)	Sep (835)	Oct (730)	Nov (988)	Dec (787)
2004	Jan (559)	Feb (480)	Mar (749)	Apr (565)	May (748)	Jun (529)	Jul (454)	Aug (714)	Sep (628)	Oct (857)	Nov (1153)	Dec (617)
2005	Jan (603)	Feb (444)	Mar (377)	Apr (579)	May (664)	Jun (407)	Jul (363)	Aug (326)	Sep (527)	Oct (522)	Nov (387)	Dec (540)
2006	Jan (355)	Feb (242)	Mar (563)	Apr (768)	May (482)	Jun (427)	Jul (440)	Aug (314)	Sep (299)	Oct (403)	Nov (333)	Dec (389)
2007	Jan (247)	Feb (335)	Mar (391)	Apr (562)	May (345)	Jun (202)	Jul (239)	Aug (288)	Sep (510)	Oct (320)	Nov (487)	Dec (387)
2008	Jan (575)	Feb (539)	Mar (762)	Apr (648)	May (625)	Jun (522)	Jul (382)	Aug (191)	Sep (426)	Oct (231)	Nov (305)	Dec (670)
2009	Jan (582)	Feb (595)	Mar (294)	Apr (461)	May (445)	Jun (597)	Jul (408)	Aug (542)	Sep (476)	Oct (437)	Nov (587)	Dec (722)
2010	Jan (456)	Feb (319)	Mar (437)	Apr (303)	May (276)	Jun (233)	Jul (155)	Aug (208)	Sep (136)	Oct (274)	Nov (241)	Dec (106)
2011	Jan (160)	Feb (244)	Mar (138)	Apr (235)	May (208)	Jun (196)	Jul (107)	Aug (77)	Sep (109)	Oct (165)	Nov (86)	Dec (211)
2012	Jan (188)	Feb (136)	Mar (273)	Apr (185)	May (149)	Jun (146)	Jul (73)	Aug (127)	Sep (103)	Oct (87)	Nov (159)	Dec (149)
2013	Jan (74)	Feb (112)	Mar (176)	Apr (139)	May (116)	Jun (160)	Jul (161)	Aug (124)	Sep (124)	Oct (82)	Nov (137)	Dec (128)
2014	Jan (116)	Feb (121)	Mar (134)	Apr (177)	May (146)	Jun (158)	Jul (154)	Aug (79)	Sep (60)	Oct (90)	Nov (184)	Dec (201)
2015	Jan (163)	Feb (263)	Mar (406)	Apr (291)	May (213)	Jun (229)	Jul (229)	Aug (111)	Sep (120)	Oct (234)	Nov (155)	Dec (153)
2016	Jan (147)	Feb (188)	Mar (363)	Apr (304)	May (199)	Jun (218)	Jul (136)	Aug (128)	Sep (120)	Oct (123)	Nov (102)	Dec (156)
2017	Jan (123)	Feb (114)	Mar (132)	Apr (44)	May (143)	Jun (83)	Jul (98)	Aug (59)	Sep (58)	Oct (12)	Nov (14)	Dec (16)
2018	Jan (18)	Feb (24)	Mar (41)	Apr (16)	May (19)	Jun (31)	Jul (3)	Aug (33)	Sep (11)	Oct (11)	Nov	Dec
2019	Jan (21)	Feb (66)	Mar (72)	Apr (69)	May (63)	Jun (49)	Jul (55)	Aug (38)	Sep (66)	Oct (51)	Nov (66)	Dec (97)
2020	Jan (98)	Feb (95)	Mar (83)	Apr (121)	May (91)	Jun (137)	Jul (94)	Aug (91)	Sep (60)	Oct (81)	Nov (82)	Dec (64)
2021	Jan (66)	Feb (50)	Mar (52)	Apr (110)	May (160)	Jun (94)	Jul (97)	Aug (99)	Sep (160)	Oct (118)	Nov (117)	Dec (119)
2022	Jan (90)	Feb (93)	Mar (75)	Apr (70)	May (61)	Jun (153)	Jul (82)	Aug (118)	Sep (127)	Oct (121)	Nov (78)	Dec (84)
2023	Jan (80)	Feb (75)	Mar (92)	Apr (103)	May (89)	Jun (89)	Jul (106)	Aug (87)	Sep (183)	Oct (128)	Nov (173)	Dec (116)
2024	Jan (144)	Feb (120)	Mar (113)	Apr (107)	May (84)	Jun (95)	Jul (100)	Aug (135)	Sep (119)	Oct (93)	Nov (91)	Dec (93)
2025	Jan (104)	Feb (165)	Mar (120)	Apr (124)	May (90)	Jun (95)	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
		1 (2)	2 (3)	3 (1)	4 (4)	5 (19)
6 (11)	7 (6)	8 (11)	9 (9)	10 (10)	11 (3)	12 (12)
13 (9)	14 (6)	15 (11)	16 (7)	17 (16)	18 (10)	19 (5)
20 (7)	21 (4)	22 (5)	23 (9)	24 (5)	25 (10)	26 (14)
27 (4)	28 (6)	29 (5)	30 (9)

Flat | Threaded

1 2 3 .. 7 > >> (Page 1 of 7)

[Firebird-checkins] SF.net SVN: firebird:[51306] firebird/trunk/builds/win32/msvc10

From: <hv...@us...> - 2010-06-30 21:29:51

Revision: 51306
          http://firebird.svn.sourceforge.net/firebird/?rev=51306&view=rev
Author:   hvlad
Date:     2010-06-30 21:29:41 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
VC10 build: leave build_msg.exe and codes.exe at intermediate build folder else make_boot failed

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/build_msg.vcxproj
    firebird/trunk/builds/win32/msvc10/codes.vcxproj

Modified: firebird/trunk/builds/win32/msvc10/build_msg.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/build_msg.vcxproj	2010-06-30 21:27:53 UTC (rev 51305)
+++ firebird/trunk/builds/win32/msvc10/build_msg.vcxproj	2010-06-30 21:29:41 UTC (rev 51306)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -89,10 +89,6 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/codes.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/codes.vcxproj	2010-06-30 21:27:53 UTC (rev 51305)
+++ firebird/trunk/builds/win32/msvc10/codes.vcxproj	2010-06-30 21:29:41 UTC (rev 51306)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -88,10 +88,6 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>


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

[Firebird-checkins] SF.net SVN: firebird:[51305] firebird/trunk/builds/win32/msvc10/firebird2. props

From: <hv...@us...> - 2010-06-30 21:27:59

Revision: 51305
          http://firebird.svn.sourceforge.net/firebird/?rev=51305&view=rev
Author:   hvlad
Date:     2010-06-30 21:27:53 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
VC10 build: don't put .bsc files into target build folder

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/firebird2.props

Modified: firebird/trunk/builds/win32/msvc10/firebird2.props
===================================================================
--- firebird/trunk/builds/win32/msvc10/firebird2.props	2010-06-30 19:54:34 UTC (rev 51304)
+++ firebird/trunk/builds/win32/msvc10/firebird2.props	2010-06-30 21:27:53 UTC (rev 51305)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -32,5 +32,8 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
     </Link>
+    <Bscmake>
+      <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
+    </Bscmake>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file


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

[Firebird-checkins] SF.net SVN: firebird:[51304] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data

From: <cin...@us...> - 2010-06-30 19:54:40

Revision: 51304
          http://firebird.svn.sourceforge.net/firebird/?rev=51304&view=rev
Author:   cincura_net
Date:     2010-06-30 19:54:34 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
DNET-124, DNET-328

Modified Paths:
--------------
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/XdrStream.cs
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/DbValue.cs
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbCommand.cs
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbParameter.cs

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/XdrStream.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/XdrStream.cs	2010-06-30 08:55:16 UTC (rev 51303)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/XdrStream.cs	2010-06-30 19:54:34 UTC (rev 51304)
@@ -673,8 +673,7 @@
 								if ((param.Length % param.Charset.BytesPerCharacter) == 0 &&
 									svalue.Length > param.CharCount)
 								{
-									//throw new IscException(IscCodes.isc_arith_except);
-									svalue = svalue.Substring(0, param.CharCount);
+									throw new IscException(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
 								}
 
 								this.WriteOpaque(param.Charset.GetBytes(svalue), param.Length);
@@ -693,8 +692,7 @@
 								if ((param.Length % param.Charset.BytesPerCharacter) == 0 &&
 									svalue.Length > param.CharCount)
 								{
-									//throw new IscException(IscCodes.isc_arith_except);
-									svalue = svalue.Substring(0, param.CharCount);
+									throw new IscException(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
 								}
 
 								byte[] data = param.Charset.GetBytes(svalue);

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/DbValue.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/DbValue.cs	2010-06-30 08:55:16 UTC (rev 51303)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/DbValue.cs	2010-06-30 19:54:34 UTC (rev 51304)
@@ -223,8 +223,8 @@
 
                         if ((this.Field.Length % this.Field.Charset.BytesPerCharacter) == 0 &&
                             svalue.Length > this.Field.CharCount)
-                        {
-							throw new IscException(IscCodes.isc_arith_except);
+						{
+							throw new IscException(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
                         }
 
                         byte[] buffer = new byte[this.Field.Length];
@@ -251,8 +251,8 @@
 
                         if ((this.Field.Length % this.Field.Charset.BytesPerCharacter) == 0 &&
                             svalue.Length > this.Field.CharCount)
-                        {
-							throw new IscException(IscCodes.isc_arith_except);
+						{
+							throw new IscException(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
                         }
 
                         byte[] sbuffer = this.Field.Charset.GetBytes(svalue);

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbCommand.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbCommand.cs	2010-06-30 08:55:16 UTC (rev 51303)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbCommand.cs	2010-06-30 19:54:34 UTC (rev 51304)
@@ -942,7 +942,7 @@
             Charset charset = this.connection.InnerConnection.Database.Charset;
 
             // Check the parameter character set
-            if (parameter.Charset == FbCharset.Octets && !(parameter.Value is byte[]))
+            if (parameter.Charset == FbCharset.Octets && !(parameter.InternalValue is byte[]))
             {
                 throw new InvalidOperationException("Value for char octets fields should be a byte array");
             }
@@ -1047,7 +1047,7 @@
 
                 if (index != -1)
                 {
-                    if (this.Parameters[index].Value == DBNull.Value || this.Parameters[index].Value == null)
+                    if (this.Parameters[index].InternalValue == DBNull.Value || this.Parameters[index].InternalValue == null)
                     {
                         this.statement.Parameters[i].NullFlag = -1;
                         this.statement.Parameters[i].Value = DBNull.Value;
@@ -1067,7 +1067,7 @@
                             case DbDataType.Binary:
                                 {
                                     BlobBase blob = this.statement.CreateBlob();
-                                    blob.Write((byte[])this.Parameters[index].Value);
+                                    blob.Write((byte[])this.Parameters[index].InternalValue);
                                     this.statement.Parameters[i].Value = blob.Id;
                                 }
                                 break;
@@ -1075,10 +1075,10 @@
                             case DbDataType.Text:
                                 {
                                     BlobBase blob = this.statement.CreateBlob();
-									if (this.Parameters[index].Value.GetType() == typeof(byte[]))
-										blob.Write((byte[])this.Parameters[index].Value);
+									if (this.Parameters[index].InternalValue.GetType() == typeof(byte[]))
+										blob.Write((byte[])this.Parameters[index].InternalValue);
 									else
-									    blob.Write((string)this.Parameters[index].Value);
+									    blob.Write((string)this.Parameters[index].InternalValue);
                                     this.statement.Parameters[i].Value = blob.Id;
                                 }
                                 break;
@@ -1099,22 +1099,22 @@
                                     }
 
                                     this.statement.Parameters[i].ArrayHandle.Handle = 0;
-                                    this.statement.Parameters[i].ArrayHandle.Write((System.Array)this.Parameters[index].Value);
+                                    this.statement.Parameters[i].ArrayHandle.Write((System.Array)this.Parameters[index].InternalValue);
                                     this.statement.Parameters[i].Value = this.statement.Parameters[i].ArrayHandle.Handle;
                                 }
                                 break;
 
                             case DbDataType.Guid:
-                                if (!(this.Parameters[index].Value is Guid) &&
-                                    !(this.Parameters[index].Value is byte[]))
+                                if (!(this.Parameters[index].InternalValue is Guid) &&
+                                    !(this.Parameters[index].InternalValue is byte[]))
                                 {
                                     throw new InvalidOperationException("Incorrect Guid value.");
                                 }
-                                this.statement.Parameters[i].Value = this.Parameters[index].Value;
+                                this.statement.Parameters[i].Value = this.Parameters[index].InternalValue;
                                 break;
 
                             default:
-                                this.statement.Parameters[i].Value = this.Parameters[index].Value;
+                                this.statement.Parameters[i].Value = this.Parameters[index].InternalValue;
                                 break;
                         }
                     }
@@ -1133,7 +1133,7 @@
             if (this.parameters != null)
                 foreach (FbParameter item in this.parameters)
                 {
-                    System.Diagnostics.Debug.WriteLine(string.Format("Name:{0} \t Type:{1} \t Value:{2}", item.InternalParameterName, item.FbDbType, item.Value));
+                    System.Diagnostics.Debug.WriteLine(string.Format("Name:{0} \t Type:{1} \t Value:{2}", item.InternalParameterName, item.FbDbType, item.InternalValue));
                 }
 #endif
 

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbParameter.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbParameter.cs	2010-06-30 08:55:16 UTC (rev 51303)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbParameter.cs	2010-06-30 19:54:34 UTC (rev 51304)
@@ -48,7 +48,6 @@
         private object value;
         private string parameterName;
         private string sourceColumn;
-        private bool isTypeSet;
 
         #endregion
 
@@ -73,6 +72,7 @@
             set
             {
                 this.size = value;
+				this.IsSizeSet = true;
 
                 // Hack for Clob parameters
                 if (value == 2147483647 &&
@@ -148,7 +148,7 @@
             set
             {
                 this.fbDbType = value;
-                this.isTypeSet = true;
+                this.IsTypeSet = true;
             }
         }
 
@@ -174,7 +174,7 @@
 
                 this.value = value;
 
-                if (!this.isTypeSet)
+                if (!this.IsTypeSet)
                 {
                     this.SetFbDbType(value);
                 }
@@ -235,18 +235,34 @@
         {
             get
             {
-                if (!String.IsNullOrEmpty(this.parameterName) && !this.parameterName.StartsWith("@"))
+                if (!string.IsNullOrEmpty(this.parameterName) && !this.parameterName.StartsWith("@"))
                 {
-                    return String.Format("@{0}", this.ParameterName);
+                    return string.Format("@{0}", this.ParameterName);
                 }
 
                 return this.ParameterName;
             }
         }
 
-		internal bool IsTypeSet
+		internal bool IsTypeSet { get; private set; }
+
+		internal bool IsSizeSet { get; private set; }
+
+		internal object InternalValue
 		{
-			get { return this.isTypeSet; }
+			get
+			{
+				if (this.IsSizeSet)
+				{
+					string svalue = (this.value as string);
+					if (svalue != null)
+						return svalue.Substring(0, Math.Min(this.size, svalue.Length));
+					else
+						return this.value;
+				}
+				
+				return this.value;
+			}
 		}
 
         #endregion


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

[Firebird-checkins] SF.net SVN: firebird:[51303] firebird/trunk/src

From: <ro...@us...> - 2010-06-30 08:55:23

Revision: 51303
          http://firebird.svn.sourceforge.net/firebird/?rev=51303&view=rev
Author:   robocop
Date:     2010-06-30 08:55:16 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/src/dsql/StmtNodes.cpp
    firebird/trunk/src/dsql/gen.cpp
    firebird/trunk/src/jrd/event.h
    firebird/trunk/src/jrd/isc_file.cpp
    firebird/trunk/src/jrd/isc_sync.cpp
    firebird/trunk/src/lock/lock_proto.h
    firebird/trunk/src/lock/print.cpp
    firebird/trunk/src/msgs/facilities2.sql

Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/dsql/StmtNodes.cpp	2010-06-30 08:55:16 UTC (rev 51303)
@@ -62,7 +62,7 @@
 	{
 		SCHAR buffer[100];
 
-		sprintf(buffer, "Invalid dtype %d in put_dtype", field->fld_dtype);
+		sprintf(buffer, "Invalid dtype %d in BlockNode::putDtype", field->fld_dtype);
 		ERRD_bugcheck(buffer);
 	}
 #endif

Modified: firebird/trunk/src/dsql/gen.cpp
===================================================================
--- firebird/trunk/src/dsql/gen.cpp	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/dsql/gen.cpp	2010-06-30 08:55:16 UTC (rev 51303)
@@ -2551,7 +2551,7 @@
 	dsql_nod* rse = NULL;
 	const dsql_msg* message = NULL;
 	bool innerSend = dsqlScratch->flags & DsqlCompilerScratch::FLAG_UPDATE_OR_INSERT;
-	bool merge = dsqlScratch->flags & DsqlCompilerScratch::FLAG_MERGE;
+	const bool merge = dsqlScratch->flags & DsqlCompilerScratch::FLAG_MERGE;
 
 	switch (node->nod_type)
 	{

Modified: firebird/trunk/src/jrd/event.h
===================================================================
--- firebird/trunk/src/jrd/event.h	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/jrd/event.h	2010-06-30 08:55:16 UTC (rev 51303)
@@ -29,7 +29,6 @@
 #include "../jrd/isc_s_proto.h"
 #include "../jrd/file_params.h"
 #include "../jrd/que.h"
-#include "../jrd/isc_s_proto.h"
 
 // Global section header
 

Modified: firebird/trunk/src/jrd/isc_file.cpp
===================================================================
--- firebird/trunk/src/jrd/isc_file.cpp	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/jrd/isc_file.cpp	2010-06-30 08:55:16 UTC (rev 51303)
@@ -1694,7 +1694,7 @@
 
 
 // Escape Unicode characters from a string
-void ISC_escape(AbstractString& str)
+void ISC_escape(AbstractString& /*str*/)
 {
 #if 0	// CORE-2929
 	size_t pos = 0;
@@ -1736,7 +1736,7 @@
 
 
 // Unescape Unicode characters from a string
-void ISC_unescape(AbstractString& str)
+void ISC_unescape(AbstractString& /*str*/)
 {
 #if 0	// CORE-2929
 	size_t pos = 0;

Modified: firebird/trunk/src/jrd/isc_sync.cpp
===================================================================
--- firebird/trunk/src/jrd/isc_sync.cpp	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/jrd/isc_sync.cpp	2010-06-30 08:55:16 UTC (rev 51303)
@@ -2379,7 +2379,7 @@
 
 
 void SharedMemoryBase::unmapObject(Arg::StatusVector& statusVector,
-								   UCHAR** object_pointer, ULONG object_length)
+								   UCHAR** object_pointer, ULONG /*object_length*/)
 {
 /**************************************
  *

Modified: firebird/trunk/src/lock/lock_proto.h
===================================================================
--- firebird/trunk/src/lock/lock_proto.h	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/lock/lock_proto.h	2010-06-30 08:55:16 UTC (rev 51303)
@@ -445,7 +445,7 @@
 	{
 	public:
 		Extent() { }
-		Extent(Firebird::MemoryPool&) { }
+		explicit Extent(Firebird::MemoryPool&) { }
 
 		Extent(const SharedMemoryBase& p)
 		{

Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/lock/print.cpp	2010-06-30 08:55:16 UTC (rev 51303)
@@ -91,7 +91,7 @@
 	class sh_mem : public Jrd::SharedMemory<lhb>
 	{
 	public:
-		sh_mem(bool p_consistency)
+		explicit sh_mem(bool p_consistency)
 		  :	sh_mem_consistency(p_consistency)
 		{ }
 
@@ -101,7 +101,7 @@
 			return sh_mem_consistency;
 		}
 
-		void mutexBug(int osErrorCode, const char* text)
+		void mutexBug(int /*osErrorCode*/, const char* /*text*/)
 		{
 			// Do nothing - lock print always ignored mutex errors
 		}

Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2010-06-30 08:54:18 UTC (rev 51302)
+++ firebird/trunk/src/msgs/facilities2.sql	2010-06-30 08:55:16 UTC (rev 51303)
@@ -13,7 +13,7 @@
 --('1996-11-07 13:39:40', 'GRST', 6, 1)
 --
 ('2005-11-05 13:09:00', 'DSQL', 7, 32)
-('2010-01-13 15:04:00', 'DYN', 8, 278)
+('2010-06-26 01:52:06', 'DYN', 8, 278)
 --
 --('1996-11-07 13:39:40', 'FRED', 9, 1)
 --


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

[Firebird-checkins] SF.net SVN: firebird:[51302] firebird/trunk/src/jrd/gds.cpp

From: <ro...@us...> - 2010-06-30 08:54:25

Revision: 51302
          http://firebird.svn.sourceforge.net/firebird/?rev=51302&view=rev
Author:   robocop
Date:     2010-06-30 08:54:18 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
Correction.

Modified Paths:
--------------
    firebird/trunk/src/jrd/gds.cpp

Modified: firebird/trunk/src/jrd/gds.cpp
===================================================================
--- firebird/trunk/src/jrd/gds.cpp	2010-06-29 16:22:48 UTC (rev 51301)
+++ firebird/trunk/src/jrd/gds.cpp	2010-06-30 08:54:18 UTC (rev 51302)
@@ -1148,7 +1148,7 @@
 	*p++ = ' ';
 	*p = '\0';
 
-	Firebird::string s(p);
+	Firebird::string s(buffer);
 	s += text;
 	s += "\n";
 


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

[Firebird-checkins] SF.net SVN: firebird:[51301] firebird/trunk/builds/win32/msvc10

From: <asf...@us...> - 2010-06-29 16:22:56

Revision: 51301
          http://firebird.svn.sourceforge.net/firebird/?rev=51301&view=rev
Author:   asfernandes
Date:     2010-06-29 16:22:48 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
Fix run from MSVC10 IDE

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/btyacc.vcxproj
    firebird/trunk/builds/win32/msvc10/build_msg.vcxproj
    firebird/trunk/builds/win32/msvc10/codes.vcxproj
    firebird/trunk/builds/win32/msvc10/fb2control.vcxproj
    firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj
    firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj
    firebird/trunk/builds/win32/msvc10/fbclient.vcxproj
    firebird/trunk/builds/win32/msvc10/fbembed.vcxproj
    firebird/trunk/builds/win32/msvc10/fbguard.vcxproj
    firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj
    firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
    firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj
    firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj
    firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj
    firebird/trunk/builds/win32/msvc10/fbudf.vcxproj
    firebird/trunk/builds/win32/msvc10/gbak.vcxproj
    firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/gfix.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/gsec.vcxproj
    firebird/trunk/builds/win32/msvc10/gsplit.vcxproj
    firebird/trunk/builds/win32/msvc10/gstat.vcxproj
    firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj
    firebird/trunk/builds/win32/msvc10/ib_util.vcxproj
    firebird/trunk/builds/win32/msvc10/instclient.vcxproj
    firebird/trunk/builds/win32/msvc10/instreg.vcxproj
    firebird/trunk/builds/win32/msvc10/instsvc.vcxproj
    firebird/trunk/builds/win32/msvc10/intl.vcxproj
    firebird/trunk/builds/win32/msvc10/isql.vcxproj
    firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/nbackup.vcxproj
    firebird/trunk/builds/win32/msvc10/qli.vcxproj
    firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj

Modified: firebird/trunk/builds/win32/msvc10/btyacc.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/btyacc.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/btyacc.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -90,6 +90,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/build_msg.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/build_msg.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/build_msg.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/codes.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/codes.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/codes.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/fb2control.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fb2control.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fb2control.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -75,7 +75,7 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -90,6 +90,9 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/fbclient.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbclient.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbclient.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fbembed.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbembed.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbembed.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fbguard.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbguard.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -50,6 +50,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -90,6 +90,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/fbudf.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbudf.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/fbudf.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -92,6 +92,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/gbak.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gbak.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gbak.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gfix.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gfix.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gfix.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gpre.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gpre.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gpre.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsec.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gsplit.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gsplit.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gsplit.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/gstat.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/gstat.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/gstat.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -92,6 +92,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/ib_util.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/ib_util.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/ib_util.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -92,6 +92,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/instclient.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instclient.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/instclient.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/instreg.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instreg.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/instreg.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/instsvc.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/instsvc.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/instsvc.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/intl.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/intl.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -92,6 +92,14 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fbintl</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fbintl</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">fbintl</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">fbintl</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

Modified: firebird/trunk/builds/win32/msvc10/isql.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/isql.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/isql.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -89,6 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/nbackup.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/nbackup.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/nbackup.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/qli.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/qli.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -88,6 +88,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj	2010-06-29 16:19:19 UTC (rev 51300)
+++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj	2010-06-29 16:22:48 UTC (rev 51301)
@@ -92,6 +92,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>


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

[Firebird-checkins] SF.net SVN: firebird:[51300] firebird/trunk/src/jrd/dyn_def.epp

From: <asf...@us...> - 2010-06-29 16:19:29

Revision: 51300
          http://firebird.svn.sourceforge.net/firebird/?rev=51300&view=rev
Author:   asfernandes
Date:     2010-06-29 16:19:19 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
Misc

Modified Paths:
--------------
    firebird/trunk/src/jrd/dyn_def.epp

Modified: firebird/trunk/src/jrd/dyn_def.epp
===================================================================
--- firebird/trunk/src/jrd/dyn_def.epp	2010-06-29 04:47:56 UTC (rev 51299)
+++ firebird/trunk/src/jrd/dyn_def.epp	2010-06-29 16:19:19 UTC (rev 51300)
@@ -507,10 +507,10 @@
 	{
 		STORE(REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
 			DIM IN RDB$FIELD_DIMENSIONS
+		{
 			DIM.RDB$UPPER_BOUND.NULL = TRUE;
 			DIM.RDB$LOWER_BOUND.NULL = TRUE;
 			DIM.RDB$DIMENSION = (SSHORT)DYN_get_number(ptr);
-		{
 			if (field_name) {
 				strcpy(DIM.RDB$FIELD_NAME, field_name->c_str());
 			}


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

[Firebird-checkins] SF.net SVN: firebird:[51299] firebird/tags/T2_5_0_RC3

From: <di...@us...> - 2010-06-29 04:48:04

Revision: 51299
          http://firebird.svn.sourceforge.net/firebird/?rev=51299&view=rev
Author:   dimitr
Date:     2010-06-29 04:47:56 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
Updated the tag for v2.5 RC3.

Modified Paths:
--------------
    firebird/tags/T2_5_0_RC3/ChangeLog
    firebird/tags/T2_5_0_RC3/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
    firebird/tags/T2_5_0_RC3/builds/make.new/config/install-sh
    firebird/tags/T2_5_0_RC3/builds/posix/postfix.darwin
    firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_i386
    firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_x86_64
    firebird/tags/T2_5_0_RC3/doc/WhatsNew
    firebird/tags/T2_5_0_RC3/extern/icu/source/config/mh-darwin
    firebird/tags/T2_5_0_RC3/src/common/classes/MetaName.h
    firebird/tags/T2_5_0_RC3/src/common/classes/alloc.cpp
    firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.cpp
    firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.h
    firebird/tags/T2_5_0_RC3/src/dsql/metd_proto.h
    firebird/tags/T2_5_0_RC3/src/jrd/Database.h
    firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.h
    firebird/tags/T2_5_0_RC3/src/jrd/build_no.h
    firebird/tags/T2_5_0_RC3/src/jrd/cch.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/cmp.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/dfw.epp
    firebird/tags/T2_5_0_RC3/src/jrd/event.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/event_proto.h
    firebird/tags/T2_5_0_RC3/src/jrd/evl.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/exe.h
    firebird/tags/T2_5_0_RC3/src/jrd/isc.h
    firebird/tags/T2_5_0_RC3/src/jrd/isc_s_proto.h
    firebird/tags/T2_5_0_RC3/src/jrd/isc_sync.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/isc_version.h
    firebird/tags/T2_5_0_RC3/src/jrd/jrd.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/jrd.h
    firebird/tags/T2_5_0_RC3/src/jrd/par.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.h
    firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.cpp
    firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.h
    firebird/tags/T2_5_0_RC3/src/jrd/unicode_util.cpp
    firebird/tags/T2_5_0_RC3/src/lock/lock.cpp
    firebird/tags/T2_5_0_RC3/src/lock/lock_proto.h
    firebird/tags/T2_5_0_RC3/src/misc/writeBuildNum.sh
    firebird/tags/T2_5_0_RC3/src/remote/server.cpp

Property Changed:
----------------
    firebird/tags/T2_5_0_RC3/


Property changes on: firebird/tags/T2_5_0_RC3
___________________________________________________________________
Added: svn:mergeinfo
   + /firebird/branches/B2_5_Release:50055-51295

Modified: firebird/tags/T2_5_0_RC3/ChangeLog
===================================================================
--- firebird/tags/T2_5_0_RC3/ChangeLog	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/ChangeLog	2010-06-29 04:47:56 UTC (rev 51299)
@@ -1,3 +1,23 @@
+2010-05-21 17:35  dimitr
+
+	* firebird2/doc/WhatsNew (1.190.2.20):
+
+	Update.
+
+2010-05-21 10:24  dimitr
+
+	* firebird2/src/common/classes/alloc.cpp (1.128.2.1):
+
+	Fixed unregistered bug: MON$MEMORY_USED for connection/database is
+	bigger than MON$MEMORY_ALLOCATED.
+
+2010-05-21 07:19  dimitr
+
+	* firebird2/: doc/WhatsNew (1.190.2.19), src/jrd/isc_version.h
+	(1.10.2.16):
+
+	Update.
+
 2010-05-20 12:36  alexpeshkoff
 
 	* firebird2/src/lock/lock.cpp (1.207.2.2):

Modified: firebird/tags/T2_5_0_RC3/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in
===================================================================
--- firebird/tags/T2_5_0_RC3/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/builds/install/arch-specific/linux/misc/firebird.init.d.gentoo.in	2010-06-29 04:47:56 UTC (rev 51299)
@@ -6,9 +6,6 @@
 # on system startup and shutdown to start the background
 # Firebird database server daemon
 
-# Source function library.
-. /etc/init.d/functions.sh
-
 # To run more instances of firebird:
 #   Copy @prefix@ somewhere
 #   Copy this script under a new name
@@ -49,19 +46,19 @@
 	GUARDIAN=@FB_SBINDIR@/fbguard
 fi
 
-start(){
+start() {
 	ebegin "Starting $FULLNAME"
 	start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $GUARDIAN -- $FB_OPTS
 	eend $?
 }
 
-stop(){
+stop() {
 	ebegin "Stopping $FULLNAME"
 	start-stop-daemon --stop --pidfile $pidfile --oknodo
 	eend $?
 }
 
-restart(){
+restart() {
 	svc_stop
 	sleep 1
 	svc_start

Modified: firebird/tags/T2_5_0_RC3/builds/make.new/config/install-sh
===================================================================
--- firebird/tags/T2_5_0_RC3/builds/make.new/config/install-sh	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/builds/make.new/config/install-sh	2010-06-29 04:47:56 UTC (rev 51299)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

Modified: firebird/tags/T2_5_0_RC3/builds/posix/postfix.darwin
===================================================================
--- firebird/tags/T2_5_0_RC3/builds/posix/postfix.darwin	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/builds/posix/postfix.darwin	2010-06-29 04:47:56 UTC (rev 51299)
@@ -82,7 +82,6 @@
 	cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
-	cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
@@ -149,7 +148,6 @@
 	cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
-	#cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
 	#cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
 	cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin

Modified: firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_i386
===================================================================
--- firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_i386	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_i386	2010-06-29 04:47:56 UTC (rev 51299)
@@ -22,27 +22,27 @@
 # 2. dnl the CPU_TYPE
 # 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386)
 # 4. for  CFLAGS, CXXFLAGS. LDFLAGS export '-m32 -arch i386'
-# 5. export MACOSX_DEPLOYMENT_TARGET=10.4 
+# 5. export MACOSX_DEPLOYMENT_TARGET=10.6
 
 DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
 export DYLD_LIBRARY_PATH
 
-MACOSX_DEPLOYMENT_TARGET=10.4
+MACOSX_DEPLOYMENT_TARGET=10.6
 export MACOSX_DEPLOYMENT_TARGET
 
 OS_ServerFiles=inet_server.cpp
 
-PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.4
-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.4
+PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
-EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
-CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 	fbtracemgr
 
 Physical_IO_Module=os/posix/unix.cpp
 PLATFORM_PATH=os/darwin
 
 LINK_OPTS:=-m32
-LD_FLAGS+=-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+LD_FLAGS+=-m32 -arch i386 
 
 include $(ROOT)/gen/darwin.defaults

Modified: firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_x86_64
===================================================================
--- firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_x86_64	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/builds/posix/prefix.darwin_x86_64	2010-06-29 04:47:56 UTC (rev 51299)
@@ -22,16 +22,16 @@
 DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
 export DYLD_LIBRARY_PATH
 
-MACOSX_DEPLOYMENT_TARGET=10.5
+MACOSX_DEPLOYMENT_TARGET=10.6
 export MACOSX_DEPLOYMENT_TARGET
 
 OS_ServerFiles=inet_server.cpp
 
-PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.5
-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5
+PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
-EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
-CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
 	fbtracemgr
 
 Physical_IO_Module=os/posix/unix.cpp

Modified: firebird/tags/T2_5_0_RC3/doc/WhatsNew
===================================================================
--- firebird/tags/T2_5_0_RC3/doc/WhatsNew	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/doc/WhatsNew	2010-06-29 04:47:56 UTC (rev 51299)
@@ -2,11 +2,69 @@
   * v2.5 Release Candidate 3
   **************************
 
+    * Bugfix CORE-3046
+        Assertion after ALTER TABLE
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3038
+        The insert failed because a column definition includes validation
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
+    * Bugfix CORE-3034
+        Bugcheck 300 (can't find shared latch)
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-3021
+        Segfault in DEV_BUILD
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3019
+        Startup failure of SuperServer and SuperClassic on Linux Gentoo
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3017
+        Files left at Firebird's lock directory 
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix CORE-3016
+        On disconnect it is possible to see "Fatal lock manager error: invalid lock id (0), errno: 0" 
+        in firebird.log
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-3015
+        Various "Cannot initialize the shared memory region" errors
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-3011
+        Server hangs or crashes while monitoring connections repeatedly attaching and detaching
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix CORE-3010
+        First connect to any database shows MON$MEMORY_USED = 4Gb 
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-3006
         /tmp/firebird and files in it may get 'root' (i.e. GID == 0) group
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-3003
+        Procedure suspend check may cause restore to fail
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
     * Bugfix CORE-3001
         Install fails to create user and group "firebird"
       Contributor(s):
@@ -29,6 +87,12 @@
         Vlad Khorsun <hvlad at users.sourceforge.net>
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Bugfix CORE-2985
+        Altering COMPUTED columns doesn't handle dependencies well
+      Contributor(s):
+        Nickolay Samofatov <skidder at users.sourceforge.net>
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2984
         GBAK -v srv:db stdout creates a broken backup
       Contributor(s):
@@ -124,6 +188,11 @@
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
+    * Bugfix CORE-2920
+        Incorrect execution of volatile SQL statements inside EXECUTE STATEMENT
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-2919
         Installation script ignores non-standard ports
       Contributor(s):
@@ -159,11 +228,21 @@
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
+    * Bugfix CORE-2900
+        Access violation using aggregate distinct
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2898
         CHAR_TO_UUID and UUID_TO_CHAR work differently in big/little endian architectures
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
+    * Bugfix CORE-2893
+        Expression in a subquery may be treated as invariant and produce incorrect results
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
     * Bugfix CORE-2888
         A memory corruption cause incorrect query evaluation and may crash the server
       Contributor(s):
@@ -209,16 +288,16 @@
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-2859
+        Security database remains locked after replacing database
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-2858
         Possible memory trashing when raising some exceptions to signal failed security checks
       Contributor(s):
         Claudio Valderrama <cvalde at usa.net>
 
-    * Bugfix CORE-2859
-        Security database remains locked after replacing database
-      Contributor(s):
-        Alex Peshkov <peshkoff at mail.ru>
-
     * Bugfix CORE-2856
         Non-NULL key in unique index could be not found when key is removed
       Contributor(s):
@@ -240,6 +319,11 @@
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Bugfix CORE-2845
+        Solaris 10 no longer requires SFIO
+      Contributor(s):
+        Paul Beach <pbeach at ibphoenix.com>
+
     * Bugfix CORE-2844
         Unresolved symbol references when linking fbsvcmgr and fbtracemgr
       Contributor(s):
@@ -261,6 +345,11 @@
         Damyan Ivanov <dmn at debian.org>
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-2756
+        Substring from timestamp - unexpected result
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-2750
         Physical backup cannot restart operations after the explicit difference file has been dropped
       Contributor(s):

Modified: firebird/tags/T2_5_0_RC3/extern/icu/source/config/mh-darwin
===================================================================
--- firebird/tags/T2_5_0_RC3/extern/icu/source/config/mh-darwin	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/extern/icu/source/config/mh-darwin	2010-06-29 04:47:56 UTC (rev 51299)
@@ -17,9 +17,9 @@
 # Set CFLAGS and CXXFLAGS for relevant MacOS architecture
 # and backwards compatibility. Set accordingly before building.
 
-# Default 64 bit Leopard/Snow Leopard - intel (MacOS 10.5+)
-CFLAGS += -arch x86_64 
-CXXFLAGS += -arch x86_64 
+# Default 64 bit Snow Leopard - intel (MacOS 10.6+)
+CFLAGS += -arch x86_64 -mmacosx-version-min=10.6
+CXXFLAGS += -arch x86_64 -mmacosx-version-min=10.6
 
 # 64 bit powerpc
 #CFLAGS += -arch ppc64  -mmacosx-version-min=10.5
@@ -27,8 +27,8 @@
 
 # 32bit intel default 
 # DARWIN flag added because of problem with putil.c
-#CFLAGS += -arch i386 -mmacosx-version-min=10.4 -DDARWIN
-#CXXFLAGS += -arch i386 -mmacosx-version-min=10.4
+#CFLAGS += -arch i386 -mmacosx-version-min=10.6 -DDARWIN
+#CXXFLAGS += -arch i386 -mmacosx-version-min=10.6
 
 # 32 bit powerpc
 #CFLAGS += -arch ppc -mmacosx-version-min=10.2

Modified: firebird/tags/T2_5_0_RC3/src/common/classes/MetaName.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/common/classes/MetaName.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/common/classes/MetaName.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -30,6 +30,7 @@
 #define METANAME_H
 
 #include "../common/classes/fb_string.h"
+#include "../common/classes/fb_pair.h"
 #include "../jrd/constants.h"
 
 #ifdef SFIO
@@ -114,7 +115,8 @@
 };
 #define MetaTmp(x) for (Firebird::LoopMetaName tmp(x); tmp; tmp.stop())
 
+typedef Pair<Full<MetaName, MetaName> > MetaNamePair;
+
 } // namespace Firebird
 
 #endif // METANAME_H
-

Modified: firebird/tags/T2_5_0_RC3/src/common/classes/alloc.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/common/classes/alloc.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/common/classes/alloc.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -1371,6 +1371,9 @@
 		MemoryExtent* extent = pool->extents_parent;
 		while (extent) {
 			MemoryExtent* next = extent->mxt_next;
+
+			MemoryBlock* blk = ptrToBlock(extent);
+			parent->increment_usage(blk->mbk_small.mbk_length);
 			parent->deallocate(extent);
 			extent = next;
 		}
@@ -1731,6 +1734,7 @@
 	}
 	else
 	{
+		parent->increment_usage(ext_size);
 		parent->deallocate(extent);
 	}
 }

Modified: firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -33,23 +33,18 @@
 
 #ifdef COMMON_CLASSES_SEMAPHORE_MACH
 
-	void SignalSafeSemaphore::machErrorCheck(kern_return_t rc, const char* fun)
+	void SignalSafeSemaphore::init()
 	{
-		if (rc != KERN_SUCCESS)
+		semaphore = dispatch_semaphore_create(0);
+		if (!semaphore)	// With const zero parameter this means OOM
 		{
-			(Arg::Gds(isc_sys_request) << fun << Arg::Mach(static_cast<ISC_STATUS>(rc))).raise();
+			BadAlloc::raise();
 		}
 	}
 
-	void SignalSafeSemaphore::init()
-	{
-		machErrorCheck(semaphore_create(mach_task_self(), &sem, SYNC_POLICY_FIFO, 0),
-					  "semaphore_create");
-	}
-
 	SignalSafeSemaphore::~SignalSafeSemaphore()
 	{
-		machErrorCheck(semaphore_destroy(mach_task_self(), sem), "semaphore_destroy");
+		dispatch_release(semaphore);
 	}
 
 #endif  // COMMON_CLASSES_SEMAPHORE_MACH

Modified: firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/common/classes/semaphore.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -93,9 +93,7 @@
 
 // Mach semaphore
 #define COMMON_CLASSES_SEMAPHORE_MACH
-#include <mach/mach.h>
-#include <mach/semaphore.h>
-#include <mach/task.h>
+#include <dispatch/dispatch.h>
 
 namespace Firebird
 {
@@ -105,9 +103,8 @@
 class SignalSafeSemaphore
 {
 private:
-	semaphore_t sem;
+	dispatch_semaphore_t semaphore;
 
-	static void machErrorCheck(kern_return_t rc, const char* function);
 	void init();
 
 public:
@@ -118,7 +115,7 @@
 
 	void enter()
 	{
-		machErrorCheck(semaphore_wait(sem), "semaphore_wait");
+		dispatch_semaphore_wait(semaphore);
 	}
 
 	void release(SLONG count = 1)
@@ -126,7 +123,7 @@
 		fb_assert(count >= 0);
 		while (count--)
 		{
-			machErrorCheck(semaphore_signal(sem), "semaphore_signal");
+			dispatch_semaphore_signal(semaphore);
 		}
 	}
 };

Modified: firebird/tags/T2_5_0_RC3/src/dsql/metd_proto.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/dsql/metd_proto.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/dsql/metd_proto.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -30,8 +30,7 @@
 #include "../common/classes/MetaName.h"
 #include "../common/classes/fb_pair.h"
 
-typedef Firebird::Pair<Firebird::Full<Firebird::MetaName, Firebird::MetaName> > MetaNamePair;
-typedef Firebird::GenericMap<MetaNamePair> MetaNamePairMap;
+typedef Firebird::GenericMap<Firebird::MetaNamePair> MetaNamePairMap;
 
 // forward declarations
 namespace Jrd {

Modified: firebird/tags/T2_5_0_RC3/src/jrd/Database.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/Database.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/Database.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -107,6 +107,7 @@
 const ULONG DBB_gc_background		= 0x40000L;	// background garbage collection by gc_thread
 const ULONG DBB_no_fs_cache			= 0x80000L;	// Not using file system cache
 const ULONG DBB_destroying			= 0x100000L;	// database destructor is called
+const ULONG DBB_monitor_locking		= 0x200000L;	// monitoring lock is being acquired
 
 //
 // dbb_ast_flags

Modified: firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -101,14 +101,12 @@
 	{ // scope
 		DumpGuard guard(this);
 		cleanup();
+
+		if (base->used == sizeof(Header))
+			ISC_remove_map_file(&handle);
 	}
 
-#ifdef WIN_NT
-	ISC_mutex_fini(&mutex);
-#else
-	ISC_mutex_fini(&base->mutex);
-#endif
-
+	ISC_mutex_fini(mutex);
 	ISC_STATUS_ARRAY statusVector;
 	ISC_unmap_file(statusVector, &handle);
 }
@@ -116,11 +114,8 @@
 
 void DatabaseSnapshot::SharedData::acquire()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(mutex));
+
 	if (base->allocated > handle.sh_mem_length_mapped)
 	{
 #if (defined HAVE_MMAP || defined WIN_NT)
@@ -139,11 +134,7 @@
 
 void DatabaseSnapshot::SharedData::release()
 {
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(mutex));
 }
 
 
@@ -311,20 +302,27 @@
 	fb_assert(shmem);
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&shmem->mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&shmem->winMutex, shmemData->sh_mem_name));
+	shmem->mutex = &shmem->winMutex;
 #endif
 
+	Header* const header = (Header*) shmemData->sh_mem_address;
+
 	if (!initialize)
+	{
+#ifndef WIN_NT
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &shmem->mutex));
+#endif
 		return;
+	}
 
 	// Initialize the shared data header
-	Header* const header = (Header*) shmemData->sh_mem_address;
 	header->version = MONITOR_VERSION;
 	header->used = alignOffset(sizeof(Header));
 	header->allocated = shmemData->sh_mem_length_mapped;
 
 #ifndef WIN_NT
-	checkMutex("init", ISC_mutex_init(&header->mutex));
+	checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &shmem->mutex));
 #endif
 }
 
@@ -387,8 +385,13 @@
 				}
 			}
 
-			// Release the lock and mark dbb as requesting a new one
-			LCK_release(tdbb, lock);
+			// Release the lock, if feasible
+			if (!(dbb->dbb_flags & DBB_monitor_locking))
+			{
+				LCK_release(tdbb, lock);
+			}
+
+			// Mark dbb as requesting a new lock
 			dbb->dbb_ast_flags |= DBB_monitor_off;
 		}
 	}

Modified: firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/DatabaseSnapshot.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -233,8 +233,9 @@
 
 		sh_mem handle;
 #ifdef WIN_NT
-		struct mtx mutex;
+		struct mtx winMutex;
 #endif
+		struct mtx *mutex;
 		Header* base;
 
 		const SLONG process_id;

Modified: firebird/tags/T2_5_0_RC3/src/jrd/build_no.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/build_no.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/build_no.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26024
+  FORMAL BUILD NUMBER:26050
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26024"
-#define FILE_VER_STRING "WI-V2.5.0.26024"
-#define LICENSE_VER_STRING "WI-V2.5.0.26024"
-#define FILE_VER_NUMBER 2, 5, 0, 26024
+#define PRODUCT_VER_STRING "2.5.0.26050"
+#define FILE_VER_STRING "WI-V2.5.0.26050"
+#define LICENSE_VER_STRING "WI-V2.5.0.26050"
+#define FILE_VER_NUMBER 2, 5, 0, 26050
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26024"
+#define FB_BUILD_NO "26050"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5 Release Candidate 3"

Modified: firebird/tags/T2_5_0_RC3/src/jrd/cch.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/cch.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/cch.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -374,6 +374,9 @@
 	{
 		Database::SyncGuard dsGuard(dbb, true);
 
+		if (dbb->dbb_flags & DBB_not_in_use)
+			return 0;
+
 		Lock* const lock = dbb->dbb_lock;
 
 		// Since this routine will be called asynchronously,
@@ -5251,14 +5254,17 @@
 		{
 		case LATCH_shared:
 			++bdb->bdb_use_count;
+			++tdbb->tdbb_latch_count;
 			allocSharedLatch(tdbb, bdb);
 			break;
 		case LATCH_exclusive:
 			++bdb->bdb_use_count;
+			++tdbb->tdbb_latch_count;
 			bdb->bdb_exclusive = tdbb;
 			break;
 		case LATCH_io:
 			++bdb->bdb_use_count;
+			++tdbb->tdbb_latch_count;
 			bdb->bdb_io = tdbb;
 			break;
 		case LATCH_mark:
@@ -5323,6 +5329,7 @@
 		// waiters while an io is in progress.
 
 		++bdb->bdb_use_count;
+		++tdbb->tdbb_latch_count;
 		allocSharedLatch(tdbb, bdb);
 		//LATCH_MUTEX_RELEASE;
 		return 0;
@@ -5335,6 +5342,7 @@
 			break;				// someone else owns the io latch
 		}
 		++bdb->bdb_use_count;
+		++tdbb->tdbb_latch_count;
 		bdb->bdb_io = tdbb;
 		//LATCH_MUTEX_RELEASE;
 		return 0;
@@ -5352,6 +5360,7 @@
 			break;
 		}
 		++bdb->bdb_use_count;
+		++tdbb->tdbb_latch_count;
 		bdb->bdb_exclusive = tdbb;
 		//LATCH_MUTEX_RELEASE;
 		return 0;
@@ -6045,6 +6054,7 @@
 		// ail.c does: exclusive - mark - exclusive
 		// CVC: but this comment was related to our obsolete WAL facility.
 		--bdb->bdb_use_count;
+		--tdbb->tdbb_latch_count;
 		if (!bdb->bdb_use_count)
 		{
 			// All latches are released
@@ -6093,6 +6103,7 @@
 			BUGCHECK(297);	// bdb is unexpectedly marked
 		}
 		--bdb->bdb_use_count;
+		--tdbb->tdbb_latch_count;
 		if (bdb->bdb_io == tdbb) {
 			bdb->bdb_io = 0;
 		}
@@ -6124,6 +6135,7 @@
 					return;
 				}
 				++bdb->bdb_use_count;
+				++lwt->lwt_tdbb->tdbb_latch_count;
 				bdb->bdb_exclusive = lwt->lwt_tdbb;
 				lwt->lwt_flags &= ~LWT_pending;
 				lwt->lwt_sem.release();
@@ -6134,6 +6146,7 @@
 				if (!bdb->bdb_io)
 				{
 					++bdb->bdb_use_count;
+					++lwt->lwt_tdbb->tdbb_latch_count;
 					bdb->bdb_io = lwt->lwt_tdbb;
 					lwt->lwt_flags &= ~LWT_pending;
 					lwt->lwt_sem.release();
@@ -6166,6 +6179,7 @@
 					*/
 				}
 				++bdb->bdb_use_count;
+				++lwt->lwt_tdbb->tdbb_latch_count;
 				allocSharedLatch(lwt->lwt_tdbb, bdb);
 				lwt->lwt_flags &= ~LWT_pending;
 				lwt->lwt_sem.release();

Modified: firebird/tags/T2_5_0_RC3/src/jrd/cmp.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/cmp.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/cmp.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -3986,6 +3986,11 @@
 	//case nod_count2:
 	case nod_total:
 		ignore_dbkey(tdbb, csb, (RecordSelExpr*) node->nod_arg[e_stat_rse], view);
+		node->nod_arg[e_stat_rse] = CMP_pass1(tdbb, csb, node->nod_arg[e_stat_rse]);
+		csb->csb_current_nodes.push(node->nod_arg[e_stat_rse]);
+		node->nod_arg[e_stat_value] = CMP_pass1(tdbb, csb, node->nod_arg[e_stat_value]);
+		node->nod_arg[e_stat_default] = CMP_pass1(tdbb, csb, node->nod_arg[e_stat_default]);
+		csb->csb_current_nodes.pop();
 		break;
 
 	case nod_aggregate:

Modified: firebird/tags/T2_5_0_RC3/src/jrd/dfw.epp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/dfw.epp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/dfw.epp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -4143,11 +4143,14 @@
 		break;
 	}
 
-	// Look to see if an object of the desired type is being deleted.
+	// Look to see if an object of the desired type is being deleted or modified.
+	// For an object being modified we verify dependencies separately when we parse its BLR.
 	for (const DeferredWork* work = transaction->tra_deferred_job->work; work; work = work->getNext())
 	{
 		if ((work->dfw_type == dfw_type ||
-			(work->dfw_type == dfw_modify_procedure && dfw_type == dfw_delete_procedure)) &&
+			(work->dfw_type == dfw_modify_procedure && dfw_type == dfw_delete_procedure) ||
+			(work->dfw_type == dfw_modify_field && dfw_type == dfw_delete_global) ||
+			(work->dfw_type == dfw_modify_trigger && dfw_type == dfw_delete_trigger)) &&
 			work->dfw_name == object_name && (!rel_id || rel_id == work->dfw_id))
 		{
 			if (work->dfw_type == dfw_modify_procedure)

Modified: firebird/tags/T2_5_0_RC3/src/jrd/event.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/event.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/event.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -61,7 +61,7 @@
 #include <windows.h>
 #define MUTEX		&m_mutex
 #else
-#define MUTEX		&m_header->evh_mutex
+#define MUTEX		m_mutex
 #endif
 
 #define SRQ_BASE                  ((UCHAR*) m_header)
@@ -1114,11 +1114,17 @@
 #endif
 
 	m_sharedFileCreated = initialize;
+	m_header = (evh*) shmem_data->sh_mem_address;
 
 	if (!initialize)
+	{
+#ifndef WIN_NT
+		if ( (mutex_state = ISC_map_mutex(shmem_data, &m_header->evh_mutex, &MUTEX)) )
+			mutex_bugcheck("mutex map", mutex_state);
+#endif
 		return;
+	}
 
-	m_header = (evh*) shmem_data->sh_mem_address;
 	m_header->evh_length = m_shmemData.sh_mem_length_mapped;
 	m_header->evh_version = EVENT_VERSION;
 	m_header->evh_request_id = 0;
@@ -1127,7 +1133,7 @@
 	SRQ_INIT(m_header->evh_events);
 
 #ifndef WIN_NT
-	if ( (mutex_state = ISC_mutex_init(MUTEX)) )
+	if ( (mutex_state = ISC_mutex_init(shmem_data, &m_header->evh_mutex, &MUTEX)) )
 		mutex_bugcheck("mutex init", mutex_state);
 #endif
 

Modified: firebird/tags/T2_5_0_RC3/src/jrd/event_proto.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/event_proto.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/event_proto.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -114,6 +114,8 @@
 
 #ifdef WIN_NT
 	struct mtx m_mutex;
+#else
+	struct mtx* m_mutex;
 #endif
 
 	bool m_sharedFileCreated;

Modified: firebird/tags/T2_5_0_RC3/src/jrd/evl.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/evl.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/evl.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -910,8 +910,10 @@
 				const Format* compileFormat = (Format*) node->nod_arg[e_fld_format];
 
 				// ASF: CORE-1432 - If the the record is not on the latest format, upgrade it.
+				// AP: for fields that are missing in original format use record's one.
 				if (compileFormat &&
 					record->rec_format->fmt_version != compileFormat->fmt_version &&
+					id < compileFormat->fmt_desc.getCount() &&
 					!DSC_EQUIV(&impure->vlu_desc, &compileFormat->fmt_desc[id], true))
 				{
 					dsc desc = impure->vlu_desc;
@@ -1754,9 +1756,10 @@
 							desc, &to, INTL_KEY_UNIQUE);
 					}
 
-					asb->asb_desc.dsc_address = data +
+					dsc toDesc = asb->asb_desc;
+					toDesc.dsc_address = data +
 						(asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
-					MOV_move(tdbb, desc, &asb->asb_desc);
+					MOV_move(tdbb, desc, &toDesc);
 
 					break;
 				}
@@ -3018,7 +3021,7 @@
 	const size_t asb_index = (node->nod_type == nod_agg_list_distinct) ? 2 : 1;
 	AggregateSort* asb = (AggregateSort*) node->nod_arg[asb_index];
 	impure_agg_sort* asb_impure = (impure_agg_sort*) ((SCHAR *) request + asb->nod_impure);
-	dsc* desc = &asb->asb_desc;
+	dsc desc = asb->asb_desc;
 	impure_value_ex* impure = (impure_value_ex*) ((SCHAR *) request + node->nod_impure);
 
 /* Sort the values already "put" to sort */
@@ -3042,20 +3045,20 @@
 			break;
 		}
 
-		desc->dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
+		desc.dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
 
 		switch (node->nod_type)
 		{
 		case nod_agg_total_distinct:
 		case nod_agg_average_distinct:
 			++impure->vlux_count;
-			add(desc, node, impure);
+			add(&desc, node, impure);
 			break;
 
 		case nod_agg_total_distinct2:
 		case nod_agg_average_distinct2:
 			++impure->vlux_count;
-			add2(desc, node, impure);
+			add2(&desc, node, impure);
 			break;
 
 		case nod_agg_count_distinct:
@@ -3069,7 +3072,7 @@
 			{
 				impure->vlu_blob = BLB_create(tdbb, tdbb->getRequest()->req_transaction,
 					&impure->vlu_misc.vlu_bid);
-				impure->vlu_desc.makeBlob(desc->getBlobSubType(), desc->getTextType(),
+				impure->vlu_desc.makeBlob(desc.getBlobSubType(), desc.getTextType(),
 					(ISC_QUAD* ) &impure->vlu_misc.vlu_bid);
 			}
 
@@ -3088,7 +3091,7 @@
 				BLB_put_data(tdbb, impure->vlu_blob, temp, len);
 			}
 			++impure->vlux_count;
-			len = MOV_make_string2(tdbb, desc, impure->vlu_desc.getTextType(), &temp, buffer, false);
+			len = MOV_make_string2(tdbb, &desc, impure->vlu_desc.getTextType(), &temp, buffer, false);
 			BLB_put_data(tdbb, impure->vlu_blob, temp, len);
 			break;
 		}

Modified: firebird/tags/T2_5_0_RC3/src/jrd/exe.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/exe.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/exe.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -786,13 +786,14 @@
 	}
 
 	Firebird::MetaName name;
-	Firebird::MetaName field;
+	Firebird::MetaNamePair field;
 	bool nullable;
 	bool explicitCollation;
 	bool fullDomain;
 };
 
-typedef Firebird::GenericMap<Firebird::Pair<Firebird::Left<Firebird::MetaName, FieldInfo> > > MapFieldInfo;
+typedef Firebird::GenericMap<Firebird::Pair<Firebird::Left<Firebird::MetaNamePair, FieldInfo> > >
+	MapFieldInfo;
 typedef Firebird::GenericMap<Firebird::Pair<Firebird::Right<Item, ItemInfo> > > MapItemInfo;
 
 // Compile scratch block

Modified: firebird/tags/T2_5_0_RC3/src/jrd/isc.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/isc.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/isc.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -38,11 +38,13 @@
 #endif
 
 #ifdef LINUX
+
 // This hack fixes CORE-2896 - embedded connections fail on linux.
 // Looks like a lot of linux kernels are buggy when working with PRIO_INHERIT mutexes.
 #undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
-#endif
 
+#endif //LINUX
+
 #ifdef UNIX
 
 #if defined(USE_POSIX_THREADS)
@@ -105,6 +107,7 @@
 	UCHAR *sh_mem_address;
 	ULONG sh_mem_length_mapped;
 	SLONG sh_mem_handle;
+	TEXT	sh_mem_name[MAXPATHLEN];
 };
 
 #endif // UNIX

Modified: firebird/tags/T2_5_0_RC3/src/jrd/isc_s_proto.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/isc_s_proto.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/isc_s_proto.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -45,7 +45,7 @@
 #if defined(WIN_NT)
 int		ISC_mutex_init(struct mtx*, const TEXT*);
 #else
-int		ISC_mutex_init(struct mtx*);
+int		ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped);
 #endif
 
 int		ISC_mutex_lock(struct mtx*);
@@ -58,6 +58,9 @@
 void	ISC_unmap_object(ISC_STATUS*, /*sh_mem*,*/ UCHAR**, ULONG);
 #endif
 
+int		ISC_map_mutex(sh_mem* shmem_data, mtx* mutex, mtx** mapped);
+void	ISC_unmap_mutex(mtx* mutex);
+
 #ifdef UNIX
 void	ISC_exception_post(ULONG, const TEXT*);
 void	ISC_sync_signals_set(void*);
@@ -72,5 +75,6 @@
 void	ISC_unmap_file(ISC_STATUS*, struct sh_mem*);
 
 void	ISC_remove_map_file(const TEXT* filename);
+void	ISC_remove_map_file(const struct sh_mem*);
 
 #endif // JRD_ISC_S_PROTO_H

Modified: firebird/tags/T2_5_0_RC3/src/jrd/isc_sync.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/isc_sync.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/isc_sync.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -1679,14 +1679,21 @@
 
 void ISC_remove_map_file(const TEXT* filename)
 {
+#ifndef WIN_NT
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, filename);
 
 	// We can't do much (specially in dtors) when it fails
 	// therefore do not check for errors - at least it's just /tmp.
 	unlink(expanded_filename);
+#endif // WIN_NT
 }
 
+void ISC_remove_map_file(const struct sh_mem* shmem_data)
+{
+	ISC_remove_map_file(shmem_data->sh_mem_name);
+}
+
 #ifdef UNIX
 
 UCHAR* ISC_map_file(ISC_STATUS* status_vector,
@@ -1822,6 +1829,7 @@
 	shmem_data->sh_mem_address = address;
 	shmem_data->sh_mem_length_mapped = length;
 	shmem_data->sh_mem_handle = fd;
+	strcpy(shmem_data->sh_mem_name, filename);
 
 #ifdef USE_SYS5SEMAPHORE
 	// register mapped file
@@ -1924,20 +1932,23 @@
  *	routine (if given) or punt (leaving the file unmapped).
  *
  **************************************/
-	HANDLE file_handle, event_handle;
+	HANDLE file_handle;
+	HANDLE event_handle = 0;
 	int retry_count = 0;
 
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, filename);
 
 	const bool trunc_flag = (length != 0);
+	bool init_flag = false;
 
 /* retry to attach to mmapped file if the process initializing
  * dies during initialization.
  */
 
   retry:
-	retry_count++;
+	if (retry_count++ > 0) 
+		THREAD_SLEEP(10);
 
 	file_handle = CreateFile(expanded_filename,
 							 GENERIC_READ | GENERIC_WRITE,
@@ -1946,15 +1957,19 @@
 							 OPEN_ALWAYS,
 							 FILE_ATTRIBUTE_NORMAL,
 							 NULL);
+	DWORD err = GetLastError();
 	if (file_handle == INVALID_HANDLE_VALUE)
 	{
-		error(status_vector, "CreateFile", GetLastError());
+		if (err == ERROR_SHARING_VIOLATION)
+			goto retry;
+
+		error(status_vector, "CreateFile", err);
 		return NULL;
 	}
 
 	// Check if file already exists
 
-	const bool file_exists = (GetLastError() == ERROR_ALREADY_EXISTS);
+	const bool file_exists = (err == ERROR_ALREADY_EXISTS);
 
 	// Create an event that can be used to determine if someone has already
 	// initialized shared memory.
@@ -1967,22 +1982,25 @@
 		return NULL;
 	}
 
-	event_handle = CreateEvent(ISC_get_security_desc(), TRUE, FALSE, object_name);
-	if (!event_handle)
+	if (!init_flag)
 	{
-		error(status_vector, "CreateEvent", GetLastError());
-		CloseHandle(file_handle);
-		return NULL;
-	}
+		event_handle = CreateEvent(ISC_get_security_desc(), TRUE, FALSE, object_name);
+		if (!event_handle)
+		{
+			error(status_vector, "CreateEvent", GetLastError());
+			CloseHandle(file_handle);
+			return NULL;
+		}
 
-	const bool init_flag = (GetLastError() != ERROR_ALREADY_EXISTS);
+		init_flag = (GetLastError() != ERROR_ALREADY_EXISTS);
 
-	if (init_flag && !init_routine)
-	{
-		CloseHandle(event_handle);
-		CloseHandle(file_handle);
-		Arg::Gds(isc_unavailable).copyTo(status_vector);
-		return NULL;
+		if (init_flag && !init_routine)
+		{
+			CloseHandle(event_handle);
+			CloseHandle(file_handle);
+			Arg::Gds(isc_unavailable).copyTo(status_vector);
+			return NULL;
+		}
 	}
 
 	if (length == 0)
@@ -2022,7 +2040,7 @@
 			CloseHandle(event_handle);
 			if (retry_count > 10)
 			{
-				error(status_vector, "WaitForSingleObject", GetLastError());
+				error(status_vector, "WaitForSingleObject", 0);
 				return NULL;
 			}
 			goto retry;
@@ -2046,6 +2064,14 @@
 	{
 		const DWORD err = GetLastError();
 
+		if ((err == ERROR_SHARING_VIOLATION) || (err == ERROR_FILE_NOT_FOUND && fdw_create == TRUNCATE_EXISTING))
+		{
+			if (!init_flag) {
+				CloseHandle(event_handle);
+			}
+			goto retry;
+		}
+		
 		if (err == ERROR_USER_MAPPED_FILE && init_flag && file_exists && trunc_flag)
 			Arg::Gds(isc_instance_conflict).copyTo(status_vector);
 		else
@@ -2193,6 +2219,9 @@
 
 
 #ifdef HAVE_MMAP
+
+#define HAVE_MAP_OBJECT 1
+
 UCHAR* ISC_map_object(ISC_STATUS* status_vector,
 					  sh_mem* shmem_data,
 					  ULONG object_offset,
@@ -2252,7 +2281,6 @@
 
 
 void ISC_unmap_object(ISC_STATUS* status_vector,
-					  //sh_mem* shmem_data,
 					  UCHAR** object_pointer,
 					  ULONG object_length)
 {
@@ -2307,6 +2335,9 @@
 
 
 #ifdef WIN_NT
+
+#define HAVE_MAP_OBJECT 1
+
 UCHAR* ISC_map_object(ISC_STATUS* status_vector,
 					  sh_mem* shmem_data,
 					  ULONG object_offset,
@@ -2350,7 +2381,6 @@
 
 
 void ISC_unmap_object(ISC_STATUS* status_vector,
-					  //sh_mem* shmem_data,
 					  UCHAR** object_pointer,
 					  ULONG /*object_length*/)
 {
@@ -2383,12 +2413,42 @@
 }
 #endif
 
+int ISC_map_mutex(sh_mem* shmem_data, mtx* mutex, mtx** mapped)
+{
+#ifdef HAVE_MAP_OBJECT
+	ISC_STATUS_ARRAY temp;
+	mutex = reinterpret_cast<mtx*>(ISC_map_object(temp, shmem_data,
+			reinterpret_cast<UCHAR*>(mutex) - shmem_data->sh_mem_address, sizeof(mtx)));
+	if (!mutex)
+	{
+		iscLogStatus("ISC_map_mutex()", temp);
+		return -1;
+	}
+#endif // HAVE_MAP_OBJECT
 
+	*mapped = mutex;
+	return 0;
+}
+
+void ISC_unmap_mutex(mtx* mutex)
+{
+#ifdef HAVE_MAP_OBJECT
+	ISC_STATUS_ARRAY temp;
+	ISC_unmap_object(temp, reinterpret_cast<UCHAR**>(&mutex), sizeof(mtx));
+	if (mutex)
+	{
+		iscLogStatus("ISC_unmap_mutex()", temp);
+	}
+#endif // HAVE_MAP_OBJECT
+
+}
+		
+
 #ifdef USE_POSIX_THREADS
 
 #ifdef USE_SYS5SEMAPHORE
 
-int ISC_mutex_init(struct mtx* mutex)
+int ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped)
 {
 /**************************************
  *
@@ -2400,6 +2460,13 @@
  *	Initialize a mutex.
  *
  **************************************/
+
+	if (ISC_map_mutex(shmem_data, mutex, mapped) != 0)
+	{
+		return -1;	// no errno known here...
+	}
+	mutex = *mapped;
+
 	if (!getSem5(mutex))
 	{
 		return FB_FAILURE;
@@ -2430,7 +2497,7 @@
  *	Destroy a mutex.
  *
  **************************************/
-	// no-op for SystemV semaphores
+	ISC_unmap_mutex(mutex);
 }
 
 
@@ -2536,7 +2603,7 @@
 static volatile bool staticBugFlag = false;
 #endif
 
-int ISC_mutex_init(struct mtx* mutex)
+int ISC_mutex_init(sh_mem* shmem_data, struct mtx* mutex, struct mtx** mapped)
 {
 /**************************************
  *
@@ -2548,6 +2615,13 @@
  *	Initialize a mutex.
  *
  **************************************/
+
+  if (ISC_map_mutex(shmem_data, mutex, mapped) != 0)
+  {
+		return -1;	// no errno known here...
+  }
+  mutex = *mapped;
+
 #ifdef BUGGY_LINUX_MUTEX
   do
   {
@@ -2636,7 +2710,7 @@
  *	Destroy a mutex.
  *
  **************************************/
-	// no-op for posix threads
+	ISC_unmap_mutex(mutex);
 }
 
 
@@ -3403,11 +3477,18 @@
 
 	TEXT expanded_filename[MAXPATHLEN];
 	gds__prefix_lock(expanded_filename, shmem_data->sh_mem_name);
-	if (!DeleteFile(expanded_filename))
-	{
-		error(status_vector, "DeleteFile", GetLastError());
-		return;
-	}
+	
+	// Delete file only if it is not used by anyone else
+	HANDLE hFile = CreateFile(expanded_filename,
+							 DELETE,
+							 0,
+							 NULL,
+							 OPEN_EXISTING,
+							 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
+							 NULL);
+
+	if (hFile != INVALID_HANDLE_VALUE) 
+		CloseHandle(hFile);
 }
 #endif
 

Modified: firebird/tags/T2_5_0_RC3/src/jrd/isc_version.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/isc_version.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/isc_version.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-T6.3.4.26024"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 26024
+#define ISC_FILE_VER_STRING "WI-T6.3.4.26050"
+#define ISC_FILE_VER_NUMBER 6, 3, 4, 26050
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"

Modified: firebird/tags/T2_5_0_RC3/src/jrd/jrd.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/jrd.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/jrd.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -525,7 +525,8 @@
 static bool			drop_files(const jrd_file*);
 static void			find_intl_charset(thread_db*, Attachment*, const DatabaseOptions*);
 static jrd_tra*		find_transaction(thread_db*, ISC_STATUS);
-static void			init_database_locks(thread_db*);
+static void			init_database_lock(thread_db*);
+static void			init_monitoring_lock(thread_db*);
 static ISC_STATUS	handle_error(ISC_STATUS*, ISC_STATUS);
 static void			run_commit_triggers(thread_db* tdbb, jrd_tra* transaction);
 static void			verify_request_synchronization(jrd_req*& request, SSHORT level);
@@ -591,8 +592,7 @@
 							jrd8_cancel_operation(status, &att, fb_cancel_enable);
 							jrd8_cancel_operation(status, &att, fb_cancel_raise);
 						}
-
-						THREAD_YIELD();
+						THREAD_SLEEP(10);
 					}
 
 					// check if attachment still exist
@@ -1000,8 +1000,8 @@
 		LCK_init(tdbb, LCK_OWNER_attachment);
 		attachment->att_flags |= ATT_lck_init_done;
 
-		// Initialize locks
-		init_database_locks(tdbb);
+		// Initialize the database lock
+		init_database_lock(tdbb);
 
 		INI_init(tdbb);
 		SHUT_init(tdbb);
@@ -1032,6 +1032,9 @@
 		// initialize shadowing as soon as the database is ready for it
 		// but before any real work is done
 		SDW_init(tdbb, options.dpb_activate_shadow, options.dpb_delete_shadow);
+
+		// Turn monitoring on
+		init_monitoring_lock(tdbb);
 	}
 	else
 	{
@@ -2040,8 +2043,8 @@
 	LCK_init(tdbb, LCK_OWNER_attachment);
 	attachment->att_flags |= ATT_lck_init_done;
 
-	// Initialize locks
-	init_database_locks(tdbb);
+	// Initialize the database lock
+	init_database_lock(tdbb);
 
 	INI_init(tdbb);
 	PAG_init(tdbb);
@@ -2116,6 +2119,9 @@
 	VIO_init(tdbb);
 #endif
 
+	// Turn monitoring on
+	init_monitoring_lock(tdbb);
+
     if (options.dpb_set_db_readonly)
     {
         if (!CCH_exclusive (tdbb, LCK_EX, WAIT_PERIOD))
@@ -4017,6 +4023,13 @@
  *	control so that somebody else may run.
  *
  **************************************/
+	if (tdbb->tdbb_latch_count && !(tdbb->tdbb_flags & TDBB_no_cache_unwind))
+	{
+		if (tdbb->tdbb_quantum < 0)
+			tdbb->tdbb_quantum = 0;
+		return false;
+	}
+	
 	Database* dbb = tdbb->getDatabase();
 
 	if (dbb->dbb_sync->hasContention())
@@ -4103,7 +4116,9 @@
 	if (dbb->dbb_ast_flags & DBB_monitor_off)
 	{
 		dbb->dbb_ast_flags &= ~DBB_monitor_off;
+		dbb->dbb_flags |= DBB_monitor_locking;
 		LCK_lock(tdbb, dbb->dbb_monitor_lock, LCK_SR, LCK_WAIT);
+		dbb->dbb_flags &= ~DBB_monitor_locking;
 
 		// While waiting for return from LCK_lock call above the blocking AST (see 
 		// DatabaseSnapshot::blockingAst) was called and set DBB_monitor_off flag 
@@ -4219,7 +4234,9 @@
 	if (dbb->dbb_ast_flags & DBB_monitor_off)
 	{
 		dbb->dbb_ast_flags &= ~DBB_monitor_off;
+		dbb->dbb_flags |= DBB_monitor_locking;
 		LCK_lock(tdbb, dbb->dbb_monitor_lock, LCK_SR, LCK_WAIT);
+		dbb->dbb_flags &= ~DBB_monitor_locking;
 
 		if (dbb->dbb_ast_flags & DBB_monitor_off)
 			LCK_release(tdbb, dbb->dbb_monitor_lock);
@@ -4915,16 +4932,16 @@
 }
 
 
-static void init_database_locks(thread_db* tdbb)
+static void init_database_lock(thread_db* tdbb)
 {
 /**************************************
  *
- *	i n i t _ d a t a b a s e _ l o c k s
+ *	i n i t _ d a t a b a s e _ l o c k
  *
  **************************************
  *
  * Functional description
- *	Initialize database locks.
+ *	Initialize the database lock.
  *
  **************************************/
 	SET_TDBB(tdbb);
@@ -4977,11 +4994,27 @@
 			}
 		}
 	}
+}
 
+static void init_monitoring_lock(thread_db* tdbb)
+{
+/**************************************
+ *
+ *	i n i t _ m o n i t o r i n g _ l o c k
+ *
+ **************************************
+ *
+ * Functional description
+ *	Initialize the monitoring lock.
+ *
+ **************************************/
+	SET_TDBB(tdbb);
+	Database* const dbb = tdbb->getDatabase();
+
 	// Lock shared by all dbb owners, used to signal other processes
 	// to dump their monitoring data and synchronize operations
 
-	lock = FB_NEW_RPT(*dbb->dbb_permanent, sizeof(SLONG)) Lock();
+	Lock* const lock = FB_NEW_RPT(*dbb->dbb_permanent, sizeof(SLONG)) Lock();
 	dbb->dbb_monitor_lock = lock;
 	lock->lck_type = LCK_monitor;
 	lock->lck_owner_handle = LCK_get_owner_handle(tdbb, lock->lck_type);

Modified: firebird/tags/T2_5_0_RC3/src/jrd/jrd.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/jrd.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/jrd.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -679,18 +679,27 @@
 		tdbb_quantum = QUANTUM;
 		tdbb_flags = 0;
 		tdbb_temp_traid = 0;
+		tdbb_latch_count = 0;
 		QUE_INIT(tdbb_latches);
 		reqStat = traStat = attStat = dbbStat = RuntimeStatistics::getDummy();
 
 		tdbb_status_vector = status;
 		fb_utils::init_status(tdbb_status_vector);
 	}
+
+	~thread_db()
+	{
+		fb_assert(QUE_EMPTY(tdbb_latches));
+		fb_assert(tdbb_latch_count == 0);
+	}
+
 	ISC_STATUS*	tdbb_status_vector;
 	SSHORT		tdbb_quantum;		// Cycles remaining until voluntary schedule
 	USHORT		tdbb_flags;
 
 	SLONG		tdbb_temp_traid;	// current temporary table scope
 
+	int			tdbb_latch_count;	// count of all latches held by thread
 	que			tdbb_latches;		// shared latches held by thread
 
 	MemoryPool* getDefaultPool()

Modified: firebird/tags/T2_5_0_RC3/src/jrd/par.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/par.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/par.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -357,19 +357,21 @@
 	case blr_domain_name2:
 		{
 			bool fullDomain = (csb->csb_blr_reader.getByte() == blr_domain_full);
-			Firebird::MetaName* name = FB_NEW(csb->csb_pool) Firebird::MetaName(csb->csb_pool);
+			MetaName* name = FB_NEW(csb->csb_pool) MetaName(csb->csb_pool);
 			par_name(csb, *name);
 
+			MetaNamePair namePair(*name, "");
+
 			FieldInfo fieldInfo;
-			bool exist = csb->csb_map_field_info.get(*name, fieldInfo);
+			bool exist = csb->csb_map_field_info.get(namePair, fieldInfo);
 			MET_get_domain(tdbb, *name, desc, (exist ? NULL : &fieldInfo));
 
 			if (!exist)
-				csb->csb_map_field_info.put(*name, fieldInfo);
+				csb->csb_map_field_info.put(namePair, fieldInfo);
 
 			if (itemInfo)
 			{
-				itemInfo->field = *name;
+				itemInfo->field = namePair;
 
 				if (fullDomain)
 				{
@@ -416,21 +418,23 @@
 	case blr_column_name2:
 		{
 			const bool fullDomain = (csb->csb_blr_reader.getByte() == blr_domain_full);
-			Firebird::MetaName* relationName = FB_NEW(csb->csb_pool) Firebird::MetaName(csb->csb_pool);
+			MetaName* relationName = FB_NEW(csb->csb_pool) MetaName(csb->csb_pool);
 			par_name(csb, *relationName);
-			Firebird::MetaName* fieldName = FB_NEW(csb->csb_pool) Firebird::MetaName(csb->csb_pool);
+			MetaName* fieldName = FB_NEW(csb->csb_pool) MetaName(csb->csb_pool);
 			par_name(csb, *fieldName);
 
+			MetaNamePair namePair(*relationName, *fieldName);
+
 			FieldInfo fieldInfo;
-			Firebird::MetaName fieldSource = MET_get_relation_field(tdbb, *relationName, *fieldName, desc, &fieldInfo);
-			bool exist = csb->csb_map_field_info.get(fieldSource, fieldInfo);
+			bool exist = csb->csb_map_field_info.get(namePair, fieldInfo);
+			MET_get_relation_field(tdbb, *relationName, *fieldName, desc, (exist ? NULL : &fieldInfo));
 
 			if (!exist)
-				csb->csb_map_field_info.put(fieldSource, fieldInfo);
+				csb->csb_map_field_info.put(namePair, fieldInfo);
 
 			if (itemInfo)
 			{
-				itemInfo->field = fieldSource;
+				itemInfo->field = namePair;
 
 				if (fullDomain)
 				{

Modified: firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -150,6 +150,8 @@
 		{
 			unlink(m_base->cfg_file_name);
 			memset(m_base->cfg_file_name, 0, sizeof(m_base->cfg_file_name));
+
+			ISC_remove_map_file(&m_handle);
 		}
 	}
 
@@ -177,7 +179,8 @@
 	fb_assert(storage);
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&storage->m_mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&storage->m_winMutex, shmemData->sh_mem_name));
+	storage->m_mutex = &storage->m_winMutex;
 #endif
 
 	ShMemHeader* const header = (ShMemHeader*) shmemData->sh_mem_address;
@@ -193,7 +196,11 @@
 		header->touch_time = 0;
 		memset(header->cfg_file_name, 0, sizeof(header->cfg_file_name));
 #ifndef WIN_NT
-		checkMutex("init", ISC_mutex_init(&header->mutex));
+		checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &storage->m_mutex));
+	}
+	else
+	{
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &storage->m_mutex));
 #endif
 	}
 }
@@ -342,22 +349,13 @@
 
 void ConfigStorage::acquire()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&m_mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&m_base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(m_mutex));
 }
 
 void ConfigStorage::release()
 {
 	checkDirty();
-
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&m_mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&m_base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(m_mutex));
 }
 
 void ConfigStorage::addSession(TraceSession& session)

Modified: firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceConfigStorage.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -122,8 +122,9 @@
 	sh_mem m_handle;
 	ShMemHeader* m_base;
 #ifdef WIN_NT
-	struct mtx m_mutex;
+	struct mtx m_winMutex;
 #endif
+	struct mtx* m_mutex;
 	int  m_cfg_file;
 	bool m_dirty;
 	Firebird::Semaphore m_touchStartSem;

Modified: firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -245,7 +245,8 @@
 	TraceLog* log = (TraceLog*) arg;
 
 #ifdef WIN_NT
-	checkMutex("init", ISC_mutex_init(&log->m_mutex, shmemData->sh_mem_name));
+	checkMutex("init", ISC_mutex_init(&log->m_winMutex, shmemData->sh_mem_name));
+	log->m_mutex = &log->m_winMutex;
 #endif
 
 	ShMemHeader* const header = (ShMemHeader*) shmemData->sh_mem_address;
@@ -256,27 +257,23 @@
 		header->readFileNum = 0;
 		header->writeFileNum = 0;
 #ifndef WIN_NT
-		checkMutex("init", ISC_mutex_init(&header->mutex));
+		checkMutex("init", ISC_mutex_init(shmemData, &header->mutex, &log->m_mutex));
+	}
+	else
+	{
+		checkMutex("map", ISC_map_mutex(shmemData, &header->mutex, &log->m_mutex));
 #endif
 	}
 }
 
 void TraceLog::lock()
 {
-#ifdef WIN_NT
-	checkMutex("lock", ISC_mutex_lock(&m_mutex));
-#else
-	checkMutex("lock", ISC_mutex_lock(&m_base->mutex));
-#endif
+	checkMutex("lock", ISC_mutex_lock(m_mutex));
 }
 
 void TraceLog::unlock()
 {
-#ifdef WIN_NT
-	checkMutex("unlock", ISC_mutex_unlock(&m_mutex));
-#else
-	checkMutex("unlock", ISC_mutex_unlock(&m_base->mutex));
-#endif
+	checkMutex("unlock", ISC_mutex_unlock(m_mutex));
 }
 
 } // namespace Jrd

Modified: firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/trace/TraceLog.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -67,8 +67,9 @@
 	sh_mem m_handle;
 	ShMemHeader* m_base;
 #ifdef WIN_NT
-	struct mtx m_mutex;
+	struct mtx m_winMutex;
 #endif
+	struct mtx* m_mutex;
 
 	Firebird::PathName m_baseFileName;
 	unsigned int m_fileNum;

Modified: firebird/tags/T2_5_0_RC3/src/jrd/unicode_util.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/jrd/unicode_util.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/jrd/unicode_util.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -888,7 +888,8 @@
 			!icu->ulocGetAvailable || !icu->usetClose || !icu->usetGetItem ||
 			!icu->usetGetItemCount || !icu->usetOpen || !icu->ucolClose ||
 			!icu->ucolGetContractions || !icu->ucolGetSortKey || !icu->ucolOpen ||
-			!icu->ucolSetAttribute || !icu->ucolStrColl || !icu->ucolGetVersion)
+			!icu->ucolSetAttribute || !icu->ucolStrColl || !icu->ucolGetVersion ||
+			!icu->utransOpen || !icu->utransClose || !icu->utransTransUChars)
 		{
 			delete icu;
 			continue;

Modified: firebird/tags/T2_5_0_RC3/src/lock/lock.cpp
===================================================================
--- firebird/tags/T2_5_0_RC3/src/lock/lock.cpp	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/lock/lock.cpp	2010-06-29 04:47:56 UTC (rev 51299)
@@ -97,7 +97,7 @@
 #include <process.h>
 #define MUTEX		&m_shmemMutex
 #else
-#define MUTEX		&m_header->lhb_mutex
+#define MUTEX		m_lhb_mutex
 #endif
 
 #ifdef DEV_BUILD
@@ -2317,6 +2317,7 @@
  *	to have an exclusive lock on the lock file.
  *
  **************************************/
+
 #ifdef WIN_NT
 	if (ISC_mutex_init(MUTEX, shmem_data->sh_mem_name)) {
 		bug(NULL, "mutex init failed");
@@ -2336,6 +2337,11 @@
 #endif
 
 	if (!initializeMemory) {
+#ifndef WIN_NT
+		if (ISC_map_mutex(shmem_data, &m_header->lhb_mutex, &(MUTEX))) {
+			bug(NULL, "mutex map failed");
+		}
+#endif
 		return;
 	}
 
@@ -2354,7 +2360,7 @@
 	SRQ_INIT(m_header->lhb_free_requests);
 
 #ifndef WIN_NT
-	if (ISC_mutex_init(MUTEX)) {
+	if (ISC_mutex_init(shmem_data, &m_header->lhb_mutex, &(MUTEX))) {
 		bug(NULL, "mutex init failed");
 	}
 #endif

Modified: firebird/tags/T2_5_0_RC3/src/lock/lock_proto.h
===================================================================
--- firebird/tags/T2_5_0_RC3/src/lock/lock_proto.h	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/lock/lock_proto.h	2010-06-29 04:47:56 UTC (rev 51299)
@@ -438,6 +438,8 @@
 
 #ifdef WIN_NT
 	struct mtx m_shmemMutex;
+#else
+	struct mtx* m_lhb_mutex;
 #endif
 
 #ifdef USE_SHMEM_EXT

Modified: firebird/tags/T2_5_0_RC3/src/misc/writeBuildNum.sh
===================================================================
--- firebird/tags/T2_5_0_RC3/src/misc/writeBuildNum.sh	2010-06-28 16:49:42 UTC (rev 51298)
+++ firebird/tags/T2_5_0_RC3/src/misc/writeBuildNum.sh	2010-06-29 04:47:56 UTC (rev 51299)
@@ -3,13 +3,13 @@
 # This file is used both to rebuild the header file and to set the
 # environment variables on the config call
 
-BuildVersion="$Id: writeBuildNum.sh,v 1.25898.2.18 2010-05-21 05:19:49 dimitr Exp $"
+BuildVersion="$Id: writeBuildNum.sh,v 1.25898.2.19 2010/05/28 14:38:22 alexpeshkoff Exp $"
 
 BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26024
+BuildNum=26050
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds

Modified: f...
 
[truncated message content]

[Firebird-checkins] SF.net SVN: firebird:[51298] firebird/trunk/builds/win32/msvc10/ Firebird2Boot.sln

From: <asf...@us...> - 2010-06-28 16:49:48

Revision: 51298
          http://firebird.svn.sourceforge.net/firebird/?rev=51298&view=rev
Author:   asfernandes
Date:     2010-06-28 16:49:42 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Fixed MSVC10 boot build

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln

Modified: firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln
===================================================================
--- firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln	2010-06-28 09:46:25 UTC (rev 51297)
+++ firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln	2010-06-28 16:49:42 UTC (rev 51298)
@@ -11,6 +11,10 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre_embed", "gpre_embed.vcxproj", "{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcxproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}"
+	ProjectSection(ProjectDependencies) = postProject
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC} = {53F75437-15B8-4A5C-86BF-E238CC68FCBC}
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} = {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alice", "alice.vcxproj", "{0D616380-1A5A-4230-A80B-021360E4E669}"
 EndProject
@@ -36,6 +40,10 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_classic", "common_classic.vcxproj", "{F5746066-8613-4811-B27C-0ED70FF9F0FF}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtrace", "fbtrace.vcxproj", "{53F75437-15B8-4A5C-86BF-E238CC68FCBC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_util", "ib_util.vcxproj", "{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -188,6 +196,22 @@
 		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|Win32.Build.0 = Release|Win32
 		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.ActiveCfg = Release|x64
 		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.Build.0 = Release|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|Win32.Build.0 = Debug|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|x64.ActiveCfg = Debug|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|x64.Build.0 = Debug|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|Win32.ActiveCfg = Release|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|Win32.Build.0 = Release|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.ActiveCfg = Release|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.Build.0 = Release|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.Build.0 = Debug|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.ActiveCfg = Debug|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.Build.0 = Debug|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|Win32.ActiveCfg = Release|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|Win32.Build.0 = Release|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|x64.ActiveCfg = Release|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE


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

[Firebird-checkins] SF.net SVN: firebird:[51296] firebird/trunk/src/jrd/event.cpp

From: <ale...@us...> - 2010-06-28 11:09:58

Revision: 51296
          http://firebird.svn.sourceforge.net/firebird/?rev=51296&view=rev
Author:   alexpeshkoff
Date:     2010-06-28 09:38:00 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Fixed some bugs, related with remapping fo events shared memory - thanks to Adriano

Modified Paths:
--------------
    firebird/trunk/src/jrd/event.cpp

Modified: firebird/trunk/src/jrd/event.cpp
===================================================================
--- firebird/trunk/src/jrd/event.cpp	2010-06-27 03:47:40 UTC (rev 51295)
+++ firebird/trunk/src/jrd/event.cpp	2010-06-28 09:38:00 UTC (rev 51296)
@@ -556,7 +556,7 @@
 
 #ifdef HAVE_OBJECT_MAP
 		Arg::StatusVector localStatus;
-		if (remapFile(localStatus, length, false))
+		if (!remapFile(localStatus, length, false))
 #endif
 		{
 			release_shmem();
@@ -596,25 +596,21 @@
 		}
 	}
 
+#ifdef HAVE_OBJECT_MAP
 	if (!best && !recurse)
 	{
 		const ULONG old_length = sh_mem_length_mapped;
 		const ULONG ev_length = old_length + m_config->getEventMemSize();
 
-		evh* header = NULL;
-
-#ifdef HAVE_OBJECT_MAP
 		Arg::StatusVector localStatus;
 		if (remapFile(localStatus, ev_length, true))
-#endif
 		{
-			free = (frb*) ((UCHAR*) header + old_length);
+			free = (frb*) (((UCHAR*) sh_mem_header) + old_length);
 			//free->frb_header.hdr_length = EVENT_EXTEND_SIZE - sizeof (struct evh);
 			free->frb_header.hdr_length = sh_mem_length_mapped - old_length;
 			free->frb_header.hdr_type = type_frb;
 			free->frb_next = 0;
 
-			sh_mem_header = header;
 			sh_mem_header->evh_length = sh_mem_length_mapped;
 
 			free_global(free);
@@ -622,6 +618,7 @@
 			return alloc_global(type, length, true);
 		}
 	}
+#endif
 
 	if (!best)
 	{


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

[Firebird-checkins] SF.net SVN: firebird:[51297] firebird/trunk/src/jrd/event_proto.h

From: <ale...@us...> - 2010-06-28 09:46:31

Revision: 51297
          http://firebird.svn.sourceforge.net/firebird/?rev=51297&view=rev
Author:   alexpeshkoff
Date:     2010-06-28 09:46:25 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    firebird/trunk/src/jrd/event_proto.h

Modified: firebird/trunk/src/jrd/event_proto.h
===================================================================
--- firebird/trunk/src/jrd/event_proto.h	2010-06-28 09:38:00 UTC (rev 51296)
+++ firebird/trunk/src/jrd/event_proto.h	2010-06-28 09:46:25 UTC (rev 51297)
@@ -98,14 +98,6 @@
 		return 0;
 	}
 
-	/*
-	static void init_shmem(void* arg, sh_mem* shmem, bool init)
-	{
-		EventManager* const eventMgr = static_cast<EventManager*>(arg);
-		eventMgr->init_shmem(shmem, init);
-	}
-	*/
-
 	static void mutex_bugcheck(const TEXT*, int);
 	static void punt(const TEXT*);
 


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

[Firebird-checkins] SF.net SVN: firebird:[51295] firebird/trunk

From: <asf...@us...> - 2010-06-27 03:47:49

Revision: 51295
          http://firebird.svn.sourceforge.net/firebird/?rev=51295&view=rev
Author:   asfernandes
Date:     2010-06-27 03:47:40 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
MSVC10 support

Modified Paths:
--------------
    firebird/trunk/builds/win32/setenvvar.bat
    firebird/trunk/src/jrd/gds.cpp
    firebird/trunk/src/jrd/os/win32/mod_loader.cpp

Added Paths:
-----------
    firebird/trunk/builds/win32/msvc10/
    firebird/trunk/builds/win32/msvc10/DllNoEmbedManifest.props
    firebird/trunk/builds/win32/msvc10/Firebird2.sln
    firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln
    firebird/trunk/builds/win32/msvc10/Firebird2_Examples.sln
    firebird/trunk/builds/win32/msvc10/alice.vcxproj
    firebird/trunk/builds/win32/msvc10/alice.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/btyacc.vcxproj
    firebird/trunk/builds/win32/msvc10/btyacc.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/build_msg.vcxproj
    firebird/trunk/builds/win32/msvc10/build_msg.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/burp.vcxproj
    firebird/trunk/builds/win32/msvc10/burp.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/codes.vcxproj
    firebird/trunk/builds/win32/msvc10/codes.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/common.vcxproj
    firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/common_classic.vcxproj
    firebird/trunk/builds/win32/msvc10/common_classic.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/common_static.vcxproj
    firebird/trunk/builds/win32/msvc10/common_static.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/config.vcxproj
    firebird/trunk/builds/win32/msvc10/config.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj
    firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj
    firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/empbuild.vcxproj
    firebird/trunk/builds/win32/msvc10/empbuild.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/engine.vcxproj
    firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj
    firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fb2control.vcxproj
    firebird/trunk/builds/win32/msvc10/fb2control.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj
    firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj
    firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbclient.vcxproj
    firebird/trunk/builds/win32/msvc10/fbclient.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbembed.vcxproj
    firebird/trunk/builds/win32/msvc10/fbembed.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbguard.vcxproj
    firebird/trunk/builds/win32/msvc10/fbguard.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj
    firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
    firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj
    firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj
    firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj
    firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/fbudf.vcxproj
    firebird/trunk/builds/win32/msvc10/fbudf.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/firebird2.props
    firebird/trunk/builds/win32/msvc10/firebird2debug.props
    firebird/trunk/builds/win32/msvc10/firebird2release.props
    firebird/trunk/builds/win32/msvc10/gbak.vcxproj
    firebird/trunk/builds/win32/msvc10/gbak.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gfix.vcxproj
    firebird/trunk/builds/win32/msvc10/gfix.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gpre.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gsec.vcxproj
    firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gsplit.vcxproj
    firebird/trunk/builds/win32/msvc10/gsplit.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/gstat.vcxproj
    firebird/trunk/builds/win32/msvc10/gstat.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj
    firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/ib_util.vcxproj
    firebird/trunk/builds/win32/msvc10/ib_util.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/instclient.vcxproj
    firebird/trunk/builds/win32/msvc10/instclient.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/instreg.vcxproj
    firebird/trunk/builds/win32/msvc10/instreg.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/instsvc.vcxproj
    firebird/trunk/builds/win32/msvc10/instsvc.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/intl.vcxproj
    firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/intlbuild.vcxproj
    firebird/trunk/builds/win32/msvc10/intlbuild.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/isql.vcxproj
    firebird/trunk/builds/win32/msvc10/isql.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj
    firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/lock.vcxproj
    firebird/trunk/builds/win32/msvc10/lock.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/lock_classic.vcxproj
    firebird/trunk/builds/win32/msvc10/lock_classic.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/nbackup.vcxproj
    firebird/trunk/builds/win32/msvc10/nbackup.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/qli.vcxproj
    firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/remote.vcxproj
    firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj
    firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters
    firebird/trunk/builds/win32/msvc10/udrcpp_example.vcxproj
    firebird/trunk/builds/win32/msvc10/udrcpp_example.vcxproj.filters
    firebird/trunk/extern/icu/source/allinone/allinone_10.sln
    firebird/trunk/extern/icu/source/allinone/firebird2debug.props
    firebird/trunk/extern/icu/source/allinone/firebird2intl.props
    firebird/trunk/extern/icu/source/allinone/firebird2release.props
    firebird/trunk/extern/icu/source/common/common_10.vcxproj
    firebird/trunk/extern/icu/source/common/common_10.vcxproj.filters
    firebird/trunk/extern/icu/source/data/makedata_10.vcxproj
    firebird/trunk/extern/icu/source/data/makedata_10.vcxproj.filters
    firebird/trunk/extern/icu/source/extra/uconv/uconv_10.vcxproj
    firebird/trunk/extern/icu/source/extra/uconv/uconv_10.vcxproj.filters
    firebird/trunk/extern/icu/source/i18n/i18n_10.vcxproj
    firebird/trunk/extern/icu/source/i18n/i18n_10.vcxproj.filters
    firebird/trunk/extern/icu/source/io/io_10.vcxproj
    firebird/trunk/extern/icu/source/io/io_10.vcxproj.filters
    firebird/trunk/extern/icu/source/layout/layout_10.vcxproj
    firebird/trunk/extern/icu/source/layout/layout_10.vcxproj.filters
    firebird/trunk/extern/icu/source/layoutex/layoutex_10.vcxproj
    firebird/trunk/extern/icu/source/layoutex/layoutex_10.vcxproj.filters
    firebird/trunk/extern/icu/source/stubdata/stubdata_10.vcxproj
    firebird/trunk/extern/icu/source/stubdata/stubdata_10.vcxproj.filters
    firebird/trunk/extern/icu/source/test/cintltst/cintltst_10.vcxproj
    firebird/trunk/extern/icu/source/test/cintltst/cintltst_10.vcxproj.filters
    firebird/trunk/extern/icu/source/test/intltest/intltest_10.vcxproj
    firebird/trunk/extern/icu/source/test/intltest/intltest_10.vcxproj.filters
    firebird/trunk/extern/icu/source/test/iotest/iotest_10.vcxproj
    firebird/trunk/extern/icu/source/test/iotest/iotest_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/ctestfw/ctestfw_10.vcxproj
    firebird/trunk/extern/icu/source/tools/ctestfw/ctestfw_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genbrk/genbrk_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genbrk/genbrk_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genccode/genccode_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genccode/genccode_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gencmn/decmn_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gencmn/decmn_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gencmn/gencmn_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gencmn/gencmn_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gencnval/gencnval_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gencnval/gencnval_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gennames/gennames_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gennames/gennames_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gennorm/gennorm_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gennorm/gennorm_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genpname/genpname_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genpname/genpname_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genprops/genprops_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genprops/genprops_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genrb/derb_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genrb/derb_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genrb/genrb_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genrb/genrb_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gensprep/gensprep_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gensprep/gensprep_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/gentest/gentest_10.vcxproj
    firebird/trunk/extern/icu/source/tools/gentest/gentest_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/genuca/genuca_10.vcxproj
    firebird/trunk/extern/icu/source/tools/genuca/genuca_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/icuswap/icuswap_10.vcxproj
    firebird/trunk/extern/icu/source/tools/icuswap/icuswap_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/makeconv/makeconv_10.vcxproj
    firebird/trunk/extern/icu/source/tools/makeconv/makeconv_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/pkgdata/pkgdata_10.vcxproj
    firebird/trunk/extern/icu/source/tools/pkgdata/pkgdata_10.vcxproj.filters
    firebird/trunk/extern/icu/source/tools/toolutil/toolutil_10.vcxproj
    firebird/trunk/extern/icu/source/tools/toolutil/toolutil_10.vcxproj.filters

Added: firebird/trunk/builds/win32/msvc10/DllNoEmbedManifest.props
===================================================================
--- firebird/trunk/builds/win32/msvc10/DllNoEmbedManifest.props	                        (rev 0)
+++ firebird/trunk/builds/win32/msvc10/DllNoEmbedManifest.props	2010-06-27 03:47:40 UTC (rev 51295)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+</Project>
\ No newline at end of file


Property changes on: firebird/trunk/builds/win32/msvc10/DllNoEmbedManifest.props
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: firebird/trunk/builds/win32/msvc10/Firebird2.sln
===================================================================
--- firebird/trunk/builds/win32/msvc10/Firebird2.sln	                        (rev 0)
+++ firebird/trunk/builds/win32/msvc10/Firebird2.sln	2010-06-27 03:47:40 UTC (rev 51295)
@@ -0,0 +1,423 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alice", "alice.vcxproj", "{0D616380-1A5A-4230-A80B-021360E4E669}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burp", "burp.vcxproj", "{D1507562-A363-4685-96AF-B036F5E5E47F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{15605F44-BFFD-444F-AD4C-55DC9D704465}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_classic", "common_classic.vcxproj", "{F5746066-8613-4811-B27C-0ED70FF9F0FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsql_server", "dsql_server.vcxproj", "{520DF501-5775-44FD-BDC6-37753A17696A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsql_server_classic", "dsql_server_classic.vcxproj", "{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine.vcxproj", "{F8798A49-9D20-451E-A7BD-FEB5237103B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_classic", "engine_classic.vcxproj", "{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_embed", "engine_embed.vcxproj", "{F55ACA54-70DF-4343-8E16-FA97C757CCF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_inet_server", "fb_inet_server.vcxproj", "{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb_lock_print", "fb_lock_print.vcxproj", "{E8397148-0E9C-449B-9F45-7FB377A08242}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbclient", "fbclient.vcxproj", "{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcxproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbguard", "fbguard.vcxproj", "{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbserver", "fbserver.vcxproj", "{23EC8DAA-6718-4EF3-979F-89F611C7D504}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbudf", "fbudf.vcxproj", "{9DC67B05-AC3E-49A3-B0CC-83B25D757445}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak", "gbak.vcxproj", "{B732F5D2-B5D9-417F-B156-D790F466CB8E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcxproj", "{44A9E4AD-B932-4620-B319-431A153BB341}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre", "gpre.vcxproj", "{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsec", "gsec.vcxproj", "{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcxproj", "{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstat", "gstat.vcxproj", "{7E862973-37C4-4202-80E7-490ED4DEDA14}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_udf", "ib_udf.vcxproj", "{0D4A2D8E-6461-479E-9399-F7929174E050}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ib_util", "ib_util.vcxproj", "{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instreg", "instreg.vcxproj", "{19470DE6-1975-4F9B-B1BE-E87A83240B15}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsvc", "instsvc.vcxproj", "{72894398-38CA-47A6-95FE-9647DE2BE968}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intl", "intl.vcxproj", "{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcxproj", "{DEE75AD5-F165-40E1-80B2-400E27725D5C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock", "lock.vcxproj", "{604E1144-1A22-43AF-9A3E-08650EE4EE90}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock_classic", "lock_classic.vcxproj", "{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcxproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcxproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcxproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcxproj", "{E83187C1-AAC2-445D-B8B2-883EFC10C39A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instclient", "instclient.vcxproj", "{C6A31374-178C-4680-A404-76BE24D0229B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fb2control", "fb2control.vcxproj", "{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbrmclib", "fbrmclib.vcxproj", "{FAF9AD25-8238-49E9-9AC9-8C56E190440A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbsvcmgr", "fbsvcmgr.vcxproj", "{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtrace", "fbtrace.vcxproj", "{53F75437-15B8-4A5C-86BF-E238CC68FCBC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbtracemgr", "fbtracemgr.vcxproj", "{58C7E370-0EDD-4F5E-8617-3F5071170205}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udr_engine", "udr_engine.vcxproj", "{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|Win32.Build.0 = Debug|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|x64.ActiveCfg = Debug|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|x64.Build.0 = Debug|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|Win32.ActiveCfg = Release|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|Win32.Build.0 = Release|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|x64.ActiveCfg = Release|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|x64.Build.0 = Release|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|Win32.Build.0 = Debug|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|x64.ActiveCfg = Debug|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|x64.Build.0 = Debug|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|Win32.ActiveCfg = Release|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|Win32.Build.0 = Release|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|x64.ActiveCfg = Release|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|x64.Build.0 = Release|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|Win32.ActiveCfg = Debug|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|Win32.Build.0 = Debug|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|x64.ActiveCfg = Debug|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|x64.Build.0 = Debug|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|Win32.ActiveCfg = Release|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|Win32.Build.0 = Release|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|x64.ActiveCfg = Release|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|x64.Build.0 = Release|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|Win32.Build.0 = Debug|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|x64.ActiveCfg = Debug|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|x64.Build.0 = Debug|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|Win32.ActiveCfg = Release|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|Win32.Build.0 = Release|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.ActiveCfg = Release|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.Build.0 = Release|x64
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Debug|Win32.Build.0 = Debug|Win32
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Debug|x64.ActiveCfg = Debug|x64
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Debug|x64.Build.0 = Debug|x64
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Release|Win32.ActiveCfg = Release|Win32
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Release|Win32.Build.0 = Release|Win32
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Release|x64.ActiveCfg = Release|x64
+		{520DF501-5775-44FD-BDC6-37753A17696A}.Release|x64.Build.0 = Release|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|Win32.Build.0 = Debug|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|x64.ActiveCfg = Debug|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|x64.Build.0 = Debug|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|Win32.ActiveCfg = Release|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|Win32.Build.0 = Release|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|x64.ActiveCfg = Release|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|x64.Build.0 = Release|x64
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug|Win32.Build.0 = Debug|Win32
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug|x64.ActiveCfg = Debug|x64
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Debug|x64.Build.0 = Debug|x64
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release|Win32.ActiveCfg = Release|Win32
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release|Win32.Build.0 = Release|Win32
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release|x64.ActiveCfg = Release|x64
+		{F8798A49-9D20-451E-A7BD-FEB5237103B5}.Release|x64.Build.0 = Release|x64
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug|Win32.Build.0 = Debug|Win32
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug|x64.ActiveCfg = Debug|x64
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Debug|x64.Build.0 = Debug|x64
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release|Win32.ActiveCfg = Release|Win32
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release|Win32.Build.0 = Release|Win32
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release|x64.ActiveCfg = Release|x64
+		{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}.Release|x64.Build.0 = Release|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|Win32.Build.0 = Debug|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|x64.ActiveCfg = Debug|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|x64.Build.0 = Debug|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|Win32.ActiveCfg = Release|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|Win32.Build.0 = Release|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|x64.ActiveCfg = Release|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|x64.Build.0 = Release|x64
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug|Win32.ActiveCfg = Debug|Win32
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug|Win32.Build.0 = Debug|Win32
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug|x64.ActiveCfg = Debug|x64
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Debug|x64.Build.0 = Debug|x64
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release|Win32.ActiveCfg = Release|Win32
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release|Win32.Build.0 = Release|Win32
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release|x64.ActiveCfg = Release|x64
+		{664D4A04-36E0-48EF-8BCA-D5C331EFAA24}.Release|x64.Build.0 = Release|x64
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Debug|Win32.Build.0 = Debug|Win32
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Debug|x64.ActiveCfg = Debug|x64
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Debug|x64.Build.0 = Debug|x64
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Release|Win32.ActiveCfg = Release|Win32
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Release|Win32.Build.0 = Release|Win32
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Release|x64.ActiveCfg = Release|x64
+		{E8397148-0E9C-449B-9F45-7FB377A08242}.Release|x64.Build.0 = Release|x64
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug|Win32.Build.0 = Debug|Win32
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug|x64.ActiveCfg = Debug|x64
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Debug|x64.Build.0 = Debug|x64
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release|Win32.ActiveCfg = Release|Win32
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release|Win32.Build.0 = Release|Win32
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release|x64.ActiveCfg = Release|x64
+		{492E7BDA-8948-408D-A43E-4C0A5B86AFB8}.Release|x64.Build.0 = Release|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|Win32.Build.0 = Debug|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|x64.ActiveCfg = Debug|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|x64.Build.0 = Debug|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|Win32.ActiveCfg = Release|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|Win32.Build.0 = Release|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|x64.ActiveCfg = Release|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|x64.Build.0 = Release|x64
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug|Win32.Build.0 = Debug|Win32
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug|x64.ActiveCfg = Debug|x64
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Debug|x64.Build.0 = Debug|x64
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release|Win32.ActiveCfg = Release|Win32
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release|Win32.Build.0 = Release|Win32
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release|x64.ActiveCfg = Release|x64
+		{BBD83ED3-8A48-4FE8-B4B7-CB27730986B2}.Release|x64.Build.0 = Release|x64
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug|Win32.ActiveCfg = Debug|Win32
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug|Win32.Build.0 = Debug|Win32
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug|x64.ActiveCfg = Debug|x64
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Debug|x64.Build.0 = Debug|x64
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|Win32.ActiveCfg = Release|Win32
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|Win32.Build.0 = Release|Win32
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.ActiveCfg = Release|x64
+		{23EC8DAA-6718-4EF3-979F-89F611C7D504}.Release|x64.Build.0 = Release|x64
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|Win32.Build.0 = Debug|Win32
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.ActiveCfg = Debug|x64
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Debug|x64.Build.0 = Debug|x64
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.ActiveCfg = Release|Win32
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|Win32.Build.0 = Release|Win32
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.ActiveCfg = Release|x64
+		{9DC67B05-AC3E-49A3-B0CC-83B25D757445}.Release|x64.Build.0 = Release|x64
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|Win32.Build.0 = Debug|Win32
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|x64.ActiveCfg = Debug|x64
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Debug|x64.Build.0 = Debug|x64
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release|Win32.ActiveCfg = Release|Win32
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release|Win32.Build.0 = Release|Win32
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release|x64.ActiveCfg = Release|x64
+		{B732F5D2-B5D9-417F-B156-D790F466CB8E}.Release|x64.Build.0 = Release|x64
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.Build.0 = Debug|Win32
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Debug|x64.ActiveCfg = Debug|x64
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Debug|x64.Build.0 = Debug|x64
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Release|Win32.ActiveCfg = Release|Win32
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Release|Win32.Build.0 = Release|Win32
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Release|x64.ActiveCfg = Release|x64
+		{44A9E4AD-B932-4620-B319-431A153BB341}.Release|x64.Build.0 = Release|x64
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug|Win32.Build.0 = Debug|Win32
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug|x64.ActiveCfg = Debug|x64
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Debug|x64.Build.0 = Debug|x64
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release|Win32.ActiveCfg = Release|Win32
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release|Win32.Build.0 = Release|Win32
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release|x64.ActiveCfg = Release|x64
+		{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}.Release|x64.Build.0 = Release|x64
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug|Win32.Build.0 = Debug|Win32
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug|x64.ActiveCfg = Debug|x64
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Debug|x64.Build.0 = Debug|x64
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release|Win32.ActiveCfg = Release|Win32
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release|Win32.Build.0 = Release|Win32
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release|x64.ActiveCfg = Release|x64
+		{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}.Release|x64.Build.0 = Release|x64
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug|Win32.Build.0 = Debug|Win32
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug|x64.ActiveCfg = Debug|x64
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Debug|x64.Build.0 = Debug|x64
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release|Win32.ActiveCfg = Release|Win32
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release|Win32.Build.0 = Release|Win32
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release|x64.ActiveCfg = Release|x64
+		{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}.Release|x64.Build.0 = Release|x64
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug|Win32.Build.0 = Debug|Win32
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug|x64.ActiveCfg = Debug|x64
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Debug|x64.Build.0 = Debug|x64
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|Win32.ActiveCfg = Release|Win32
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|Win32.Build.0 = Release|Win32
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.ActiveCfg = Release|x64
+		{7E862973-37C4-4202-80E7-490ED4DEDA14}.Release|x64.Build.0 = Release|x64
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|Win32.Build.0 = Debug|Win32
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.ActiveCfg = Debug|x64
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Debug|x64.Build.0 = Debug|x64
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.ActiveCfg = Release|Win32
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|Win32.Build.0 = Release|Win32
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.ActiveCfg = Release|x64
+		{0D4A2D8E-6461-479E-9399-F7929174E050}.Release|x64.Build.0 = Release|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|Win32.Build.0 = Debug|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.ActiveCfg = Debug|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Debug|x64.Build.0 = Debug|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|Win32.ActiveCfg = Release|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|Win32.Build.0 = Release|Win32
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|x64.ActiveCfg = Release|x64
+		{EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D}.Release|x64.Build.0 = Release|x64
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug|Win32.Build.0 = Debug|Win32
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug|x64.ActiveCfg = Debug|x64
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Debug|x64.Build.0 = Debug|x64
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release|Win32.ActiveCfg = Release|Win32
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release|Win32.Build.0 = Release|Win32
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release|x64.ActiveCfg = Release|x64
+		{19470DE6-1975-4F9B-B1BE-E87A83240B15}.Release|x64.Build.0 = Release|x64
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Debug|Win32.Build.0 = Debug|Win32
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Debug|x64.ActiveCfg = Debug|x64
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Debug|x64.Build.0 = Debug|x64
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Release|Win32.ActiveCfg = Release|Win32
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Release|Win32.Build.0 = Release|Win32
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Release|x64.ActiveCfg = Release|x64
+		{72894398-38CA-47A6-95FE-9647DE2BE968}.Release|x64.Build.0 = Release|x64
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug|Win32.Build.0 = Debug|Win32
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug|x64.ActiveCfg = Debug|x64
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Debug|x64.Build.0 = Debug|x64
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release|Win32.ActiveCfg = Release|Win32
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release|Win32.Build.0 = Release|Win32
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release|x64.ActiveCfg = Release|x64
+		{DFFA2117-E6A8-4806-BB69-94DAC8F8F42A}.Release|x64.Build.0 = Release|x64
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug|Win32.Build.0 = Debug|Win32
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug|x64.ActiveCfg = Debug|x64
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Debug|x64.Build.0 = Debug|x64
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release|Win32.ActiveCfg = Release|Win32
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release|Win32.Build.0 = Release|Win32
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release|x64.ActiveCfg = Release|x64
+		{DEE75AD5-F165-40E1-80B2-400E27725D5C}.Release|x64.Build.0 = Release|x64
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug|Win32.Build.0 = Debug|Win32
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug|x64.ActiveCfg = Debug|x64
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Debug|x64.Build.0 = Debug|x64
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release|Win32.ActiveCfg = Release|Win32
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release|Win32.Build.0 = Release|Win32
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release|x64.ActiveCfg = Release|x64
+		{604E1144-1A22-43AF-9A3E-08650EE4EE90}.Release|x64.Build.0 = Release|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|Win32.Build.0 = Debug|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|x64.ActiveCfg = Debug|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|x64.Build.0 = Debug|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|Win32.ActiveCfg = Release|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|Win32.Build.0 = Release|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|x64.ActiveCfg = Release|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|x64.Build.0 = Release|x64
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug|Win32.Build.0 = Debug|Win32
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug|x64.ActiveCfg = Debug|x64
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Debug|x64.Build.0 = Debug|x64
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release|Win32.ActiveCfg = Release|Win32
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release|Win32.Build.0 = Release|Win32
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release|x64.ActiveCfg = Release|x64
+		{EBB8361B-49D5-43A5-8771-940DF3E308EF}.Release|x64.Build.0 = Release|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|Win32.Build.0 = Debug|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|x64.ActiveCfg = Debug|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|x64.Build.0 = Debug|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|Win32.ActiveCfg = Release|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|Win32.Build.0 = Release|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|x64.ActiveCfg = Release|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|x64.Build.0 = Release|x64
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug|Win32.Build.0 = Debug|Win32
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug|x64.ActiveCfg = Debug|x64
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Debug|x64.Build.0 = Debug|x64
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release|Win32.ActiveCfg = Release|Win32
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release|Win32.Build.0 = Release|Win32
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release|x64.ActiveCfg = Release|x64
+		{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}.Release|x64.Build.0 = Release|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|Win32.Build.0 = Debug|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|x64.ActiveCfg = Debug|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|x64.Build.0 = Debug|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|Win32.ActiveCfg = Release|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|Win32.Build.0 = Release|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|x64.ActiveCfg = Release|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|x64.Build.0 = Release|x64
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Debug|Win32.Build.0 = Debug|Win32
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Debug|x64.ActiveCfg = Debug|x64
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Debug|x64.Build.0 = Debug|x64
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Release|Win32.ActiveCfg = Release|Win32
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Release|Win32.Build.0 = Release|Win32
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Release|x64.ActiveCfg = Release|x64
+		{C6A31374-178C-4680-A404-76BE24D0229B}.Release|x64.Build.0 = Release|x64
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug|Win32.Build.0 = Debug|Win32
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug|x64.ActiveCfg = Debug|x64
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Debug|x64.Build.0 = Debug|x64
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release|Win32.ActiveCfg = Release|Win32
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release|Win32.Build.0 = Release|Win32
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release|x64.ActiveCfg = Release|x64
+		{1AE02D41-7E24-43CC-9BCB-E4CEB6037D16}.Release|x64.Build.0 = Release|x64
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Debug|Win32.Build.0 = Debug|Win32
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Debug|x64.ActiveCfg = Debug|Win32
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Release|Win32.ActiveCfg = Release|Win32
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Release|Win32.Build.0 = Release|Win32
+		{FAF9AD25-8238-49E9-9AC9-8C56E190440A}.Release|x64.ActiveCfg = Release|Win32
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug|Win32.Build.0 = Debug|Win32
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug|x64.ActiveCfg = Debug|x64
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Debug|x64.Build.0 = Debug|x64
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release|Win32.ActiveCfg = Release|Win32
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release|Win32.Build.0 = Release|Win32
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release|x64.ActiveCfg = Release|x64
+		{EFB07DBC-36E3-4C54-B941-3CDAFAACF47B}.Release|x64.Build.0 = Release|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|Win32.Build.0 = Debug|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|x64.ActiveCfg = Debug|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Debug|x64.Build.0 = Debug|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|Win32.ActiveCfg = Release|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|Win32.Build.0 = Release|Win32
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.ActiveCfg = Release|x64
+		{53F75437-15B8-4A5C-86BF-E238CC68FCBC}.Release|x64.Build.0 = Release|x64
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|Win32.ActiveCfg = Debug|Win32
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|Win32.Build.0 = Debug|Win32
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|x64.ActiveCfg = Debug|x64
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Debug|x64.Build.0 = Debug|x64
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|Win32.ActiveCfg = Release|Win32
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|Win32.Build.0 = Release|Win32
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|x64.ActiveCfg = Release|x64
+		{58C7E370-0EDD-4F5E-8617-3F5071170205}.Release|x64.Build.0 = Release|x64
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Debug|Win32.Build.0 = Debug|Win32
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Debug|x64.ActiveCfg = Debug|x64
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Debug|x64.Build.0 = Debug|x64
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Release|Win32.ActiveCfg = Release|Win32
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Release|Win32.Build.0 = Release|Win32
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Release|x64.ActiveCfg = Release|x64
+		{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal


Property changes on: firebird/trunk/builds/win32/msvc10/Firebird2.sln
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln
===================================================================
--- firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln	                        (rev 0)
+++ firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln	2010-06-27 03:47:40 UTC (rev 51295)
@@ -0,0 +1,195 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_msg", "build_msg.vcxproj", "{99A84638-DF3A-417F-895D-5BD88FC29411}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codes", "codes.vcxproj", "{5658573B-E79E-4C84-8B15-C910C4CDB9AD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "common_static.vcxproj", "{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre_boot", "gpre_boot.vcxproj", "{8348521F-4480-4A1D-AE3B-E260235E9860}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre_embed", "gpre_embed.vcxproj", "{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fbembed", "fbembed.vcxproj", "{C5A60E3D-7815-4127-B856-96277BEC1D11}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alice", "alice.vcxproj", "{0D616380-1A5A-4230-A80B-021360E4E669}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "burp", "burp.vcxproj", "{D1507562-A363-4685-96AF-B036F5E5E47F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{15605F44-BFFD-444F-AD4C-55DC9D704465}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcxproj", "{E83187C1-AAC2-445D-B8B2-883EFC10C39A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_embed", "engine_embed.vcxproj", "{F55ACA54-70DF-4343-8E16-FA97C757CCF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gbak_embed", "gbak_embed.vcxproj", "{03136BE7-9E18-4B03-94DB-D19A6EF992B4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql_embed", "isql_embed.vcxproj", "{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btyacc", "btyacc.vcxproj", "{57CDBF51-F1FB-4227-8C03-6F4134A7E234}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsql_server_classic", "dsql_server_classic.vcxproj", "{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lock_classic", "lock_classic.vcxproj", "{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcxproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_classic", "common_classic.vcxproj", "{F5746066-8613-4811-B27C-0ED70FF9F0FF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Debug|Win32.Build.0 = Debug|Win32
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Debug|x64.ActiveCfg = Debug|x64
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Debug|x64.Build.0 = Debug|x64
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Release|Win32.ActiveCfg = Release|Win32
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Release|Win32.Build.0 = Release|Win32
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Release|x64.ActiveCfg = Release|x64
+		{99A84638-DF3A-417F-895D-5BD88FC29411}.Release|x64.Build.0 = Release|x64
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Debug|Win32.Build.0 = Debug|Win32
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Debug|x64.ActiveCfg = Debug|x64
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Debug|x64.Build.0 = Debug|x64
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Release|Win32.ActiveCfg = Release|Win32
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Release|Win32.Build.0 = Release|Win32
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Release|x64.ActiveCfg = Release|x64
+		{5658573B-E79E-4C84-8B15-C910C4CDB9AD}.Release|x64.Build.0 = Release|x64
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Debug|Win32.Build.0 = Debug|Win32
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Debug|x64.ActiveCfg = Debug|x64
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Debug|x64.Build.0 = Debug|x64
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Release|Win32.ActiveCfg = Release|Win32
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Release|Win32.Build.0 = Release|Win32
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Release|x64.ActiveCfg = Release|x64
+		{DC8E2FAB-B3E1-4A13-A1EC-60D05D0135C9}.Release|x64.Build.0 = Release|x64
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Debug|Win32.Build.0 = Debug|Win32
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Debug|x64.ActiveCfg = Debug|x64
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Debug|x64.Build.0 = Debug|x64
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Release|Win32.ActiveCfg = Release|Win32
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Release|Win32.Build.0 = Release|Win32
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Release|x64.ActiveCfg = Release|x64
+		{8348521F-4480-4A1D-AE3B-E260235E9860}.Release|x64.Build.0 = Release|x64
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Debug|Win32.Build.0 = Debug|Win32
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Debug|x64.ActiveCfg = Debug|x64
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Debug|x64.Build.0 = Debug|x64
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Release|Win32.ActiveCfg = Release|Win32
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Release|Win32.Build.0 = Release|Win32
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Release|x64.ActiveCfg = Release|x64
+		{A8FA63F9-9F86-49DA-96AC-2A6AB5B8F292}.Release|x64.Build.0 = Release|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|Win32.Build.0 = Debug|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|x64.ActiveCfg = Debug|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Debug|x64.Build.0 = Debug|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|Win32.ActiveCfg = Release|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|Win32.Build.0 = Release|Win32
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|x64.ActiveCfg = Release|x64
+		{C5A60E3D-7815-4127-B856-96277BEC1D11}.Release|x64.Build.0 = Release|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|Win32.Build.0 = Debug|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|x64.ActiveCfg = Debug|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Debug|x64.Build.0 = Debug|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|Win32.ActiveCfg = Release|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|Win32.Build.0 = Release|Win32
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|x64.ActiveCfg = Release|x64
+		{0D616380-1A5A-4230-A80B-021360E4E669}.Release|x64.Build.0 = Release|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|Win32.Build.0 = Debug|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|x64.ActiveCfg = Debug|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Debug|x64.Build.0 = Debug|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|Win32.ActiveCfg = Release|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|Win32.Build.0 = Release|Win32
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|x64.ActiveCfg = Release|x64
+		{D1507562-A363-4685-96AF-B036F5E5E47F}.Release|x64.Build.0 = Release|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|Win32.ActiveCfg = Debug|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|Win32.Build.0 = Debug|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|x64.ActiveCfg = Debug|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Debug|x64.Build.0 = Debug|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|Win32.ActiveCfg = Release|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|Win32.Build.0 = Release|Win32
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|x64.ActiveCfg = Release|x64
+		{15605F44-BFFD-444F-AD4C-55DC9D704465}.Release|x64.Build.0 = Release|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|Win32.Build.0 = Debug|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|x64.ActiveCfg = Debug|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Debug|x64.Build.0 = Debug|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|Win32.ActiveCfg = Release|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|Win32.Build.0 = Release|Win32
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|x64.ActiveCfg = Release|x64
+		{E83187C1-AAC2-445D-B8B2-883EFC10C39A}.Release|x64.Build.0 = Release|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|Win32.Build.0 = Debug|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|x64.ActiveCfg = Debug|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Debug|x64.Build.0 = Debug|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|Win32.ActiveCfg = Release|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|Win32.Build.0 = Release|Win32
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|x64.ActiveCfg = Release|x64
+		{F55ACA54-70DF-4343-8E16-FA97C757CCF6}.Release|x64.Build.0 = Release|x64
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Debug|Win32.Build.0 = Debug|Win32
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Debug|x64.ActiveCfg = Debug|x64
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Debug|x64.Build.0 = Debug|x64
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Release|Win32.ActiveCfg = Release|Win32
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Release|Win32.Build.0 = Release|Win32
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Release|x64.ActiveCfg = Release|x64
+		{03136BE7-9E18-4B03-94DB-D19A6EF992B4}.Release|x64.Build.0 = Release|x64
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Debug|Win32.Build.0 = Debug|Win32
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Debug|x64.ActiveCfg = Debug|x64
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Debug|x64.Build.0 = Debug|x64
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Release|Win32.ActiveCfg = Release|Win32
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Release|Win32.Build.0 = Release|Win32
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Release|x64.ActiveCfg = Release|x64
+		{B8AACEB0-2586-4EAE-868F-18A6A93A1A19}.Release|x64.Build.0 = Release|x64
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Debug|Win32.Build.0 = Debug|Win32
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Debug|x64.ActiveCfg = Debug|x64
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Debug|x64.Build.0 = Debug|x64
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Release|Win32.ActiveCfg = Release|Win32
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Release|Win32.Build.0 = Release|Win32
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Release|x64.ActiveCfg = Release|x64
+		{57CDBF51-F1FB-4227-8C03-6F4134A7E234}.Release|x64.Build.0 = Release|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|Win32.Build.0 = Debug|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|x64.ActiveCfg = Debug|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Debug|x64.Build.0 = Debug|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|Win32.ActiveCfg = Release|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|Win32.Build.0 = Release|Win32
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|x64.ActiveCfg = Release|x64
+		{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}.Release|x64.Build.0 = Release|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|Win32.Build.0 = Debug|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|x64.ActiveCfg = Debug|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Debug|x64.Build.0 = Debug|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|Win32.ActiveCfg = Release|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|Win32.Build.0 = Release|Win32
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|x64.ActiveCfg = Release|x64
+		{213C6F21-D83F-48C7-BBB5-B35AB1B706B1}.Release|x64.Build.0 = Release|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|Win32.Build.0 = Debug|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|x64.ActiveCfg = Debug|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Debug|x64.Build.0 = Debug|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|Win32.ActiveCfg = Release|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|Win32.Build.0 = Release|Win32
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|x64.ActiveCfg = Release|x64
+		{4BCC693D-1745-45ED-8302-E5E2F979549A}.Release|x64.Build.0 = Release|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|Win32.Build.0 = Debug|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|x64.ActiveCfg = Debug|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Debug|x64.Build.0 = Debug|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|Win32.ActiveCfg = Release|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|Win32.Build.0 = Release|Win32
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.ActiveCfg = Release|x64
+		{F5746066-8613-4811-B27C-0ED70FF9F0FF}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal


Property changes on: firebird/trunk/builds/win32/msvc10/Firebird2Boot.sln
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: firebird/trunk/builds/win32/msvc10/Firebird2_Examples.sln
===================================================================
--- firebird/trunk/builds/win32/msvc10/Firebird2_Examples.sln	                        (rev 0)
+++ firebird/trunk/builds/win32/msvc10/Firebird2_Examples.sln	2010-06-27 03:47:40 UTC (rev 51295)
@@ -0,0 +1,61 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "empbuild", "empbuild.vcxproj", "{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intlbuild", "intlbuild.vcxproj", "{9546EF04-1326-464B-A6ED-395C60DD63CC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udr_engine", "udr_engine.vcxproj", "{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udrcpp_example", "udrcpp_example.vcxproj", "{FF0FD8DF-1E5C-486E-B395-A620376A4633}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{15605F44-BFFD-444F-AD4C-55DC9D704465}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}.Debug|Win32.Build.0 = Debug|Win32
+		{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}.Debug|x64.ActiveCfg = Debug|x64
+		{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}.Debug|x64.Build.0 = Debug|x64
+		{FC2859B9-56DB-40B4-86C4-2DE31ECE9144}.Release|Win32.ActiveCf...
 
[truncated message content]

[Firebird-checkins] CVS: manual/src/docs/firebirddocs fbutil_gfix.xml, 1.3, 1.4

From: Norman D. <nor...@us...> - 2010-06-26 13:42:46

Update of /cvsroot/firebird/manual/src/docs/firebirddocs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18486

Modified Files:
	fbutil_gfix.xml 
Log Message:
Two lists - spacing corrected. Added transaction details to -mend option.

Index: fbutil_gfix.xml
===================================================================
RCS file: /cvsroot/firebird/manual/src/docs/firebirddocs/fbutil_gfix.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- fbutil_gfix.xml	20 Oct 2009 19:15:40 -0000	1.3
+++ fbutil_gfix.xml	26 Jun 2010 13:42:36 -0000	1.4
@@ -17,7 +17,7 @@
             <surname>Dunbar</surname>
         </author>
 
-        <edition>20 October 2009 â Document version 1.1</edition>
+        <edition>25 June 2010 â Document version 1.2</edition>
     </articleinfo>
 
     <section id="gfix-intro">
@@ -609,8 +609,7 @@
 -ca[che]      shutdown cache manager
 ...</screen></para>
 
-        <para>However, when called this option simply displays the help page again.
-        </para>
+        <para>However, when called this option simply displays the help page again.</para>
 
         <para>The question that immediately springs to my mind is, if we can shutdown the
         cache manager with this option, how do we start it back up again?</para>
@@ -1338,7 +1337,7 @@
             advised to validate the database to check for corruption. The times you would
             check are:</para>
 
-            <itemizedlist>
+            <itemizedlist spacing="compact">
                 <listitem>
                     <para>When an application receives a <emphasis>database
                     corrupt</emphasis> error message.</para>
@@ -1369,7 +1368,7 @@
             <para>When a database is validated the following checks are made <emphasis>and
             corrected</emphasis> by default:</para>
 
-            <itemizedlist>
+            <itemizedlist spacing="compact">
                 <listitem>
                     <para>Orphan pages are returned to free space. This updates the
                     database.</para>
@@ -1486,9 +1485,9 @@
                 <title>Recover a Corrupt Database</title>
 
                 <para>The option required to fix a corrupted database is the <command>gfix
-                -m[end]</command> command. However, it cannot fix all problems and may
-                result in a loss of data. It all depends on the level of corruption
-                detected. The command is:</para>
+                -m[end]</command> command. However, it cannot fix all problems and
+                <emphasis>may result in a loss of data</emphasis>. It all depends on the
+                level of corruption detected. The command is:</para>
 
                 <para><command>gfix -m[end] database_name</command></para>
 
@@ -1503,6 +1502,16 @@
                     test restorations. There is no point taking backups every night, for
                     example, if they cannot be used when required. Test always and
                     frequently.</para>
+
+                    <para>Equally, when attempting to recover a potentially corrupted
+                    database, <emphasis>always</emphasis> work with a copy of the main
+                    database file and never with the original. Using the
+                    <command>-mend</command> option can lead to silent deletions of data
+                    because <application>gfix</application> doesn't care about internal
+                    database constraints like foreign keys etc, the
+                    <command>-mend</command> option simply says to
+                    <application>gfix</application> "<emphasis>go ahead and clean out
+                    anything you don't like</emphasis>".</para>
                 </important>
             </section>
         </section>
@@ -1756,6 +1765,20 @@
                         manual.</para>
                     </revdescription>
                 </revision>
+
+                <revision>
+                    <revnumber>1.2</revnumber>
+
+                    <date>25 June 2010</date>
+
+                    <authorinitials>ND</authorinitials>
+
+                    <revdescription>
+                        <para>Fixed spacing on a couple of lists. Added an enhancement to
+                        the details of the -mend recovery option. It can lead to a loss of
+                        data.</para>
+                    </revdescription>
+                </revision>
             </revhistory></para>
     </appendix>

[Firebird-checkins] CVS: firebird2 ChangeLog, 1.2008.2.120, 1.2008.2.121

From: Frank Schlottmann-G. <fs...@us...> - 2010-06-26 12:59:09

Build Version :  T3.0.0.28596 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28771 2010/06/26 12:58:53 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8327/firebird2

Modified Files:
      Tag: B2_5_Release
	ChangeLog 
Log Message:
nightly update B2_5_Release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.2008.2.120
retrieving revision 1.2008.2.121
diff -b -U3 -r1.2008.2.120 -r1.2008.2.121
--- ChangeLog	25 Jun 2010 12:58:48 -0000	1.2008.2.120
+++ ChangeLog	26 Jun 2010 12:58:48 -0000	1.2008.2.121
@@ -1,3 +1,9 @@
+2010-06-26 03:26  asfernandes
+
+	* firebird2/doc/WhatsNew (1.190.2.25):
+
+	Credits
+
 2010-06-25 11:04  dimitr
 
 	* firebird2/: src/jrd/isc_version.h (1.10.2.18), doc/WhatsNew

[Firebird-checkins] SF.net SVN: firebird:[51294] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data/Common/IscException.cs

From: <cin...@us...> - 2010-06-26 12:47:02

Revision: 51294
          http://firebird.svn.sourceforge.net/firebird/?rev=51294&view=rev
Author:   cincura_net
Date:     2010-06-26 12:46:56 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Added new ctor.

Modified Paths:
--------------
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs	2010-06-26 11:38:51 UTC (rev 51293)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs	2010-06-26 12:46:56 UTC (rev 51294)
@@ -88,6 +88,17 @@
 			this.BuildExceptionData();
 		}
 
+		public IscException(IEnumerable<int> errorCodes)
+			: this()
+		{
+			foreach (int errorCode in errorCodes)
+			{
+				this.Errors.Add(new IscError(IscCodes.isc_arg_gds, errorCode));
+			}
+
+			this.BuildExceptionData();
+		}
+
 		/// <param name="dummy">This parameter is here only to differentiate sqlState and strParam.</param>
 		public IscException(string sqlState, int dummy)
 			: this()


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

[Firebird-checkins] SF.net SVN: firebird:[51293] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data/Common/IscCodes.cs

From: <cin...@us...> - 2010-06-26 11:38:58

Revision: 51293
          http://firebird.svn.sourceforge.net/firebird/?rev=51293&view=rev
Author:   cincura_net
Date:     2010-06-26 11:38:51 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Added new error code.

Modified Paths:
--------------
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscCodes.cs

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscCodes.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscCodes.cs	2010-06-26 11:38:06 UTC (rev 51292)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscCodes.cs	2010-06-26 11:38:51 UTC (rev 51293)
@@ -802,20 +802,21 @@
 		public const int isc_arg_warning    = 18;	// warning argument
 		public const int isc_arg_sql_state  = 19;	// SQLSTATE
 
-        public const int isc_open_trans     = 335544357;
-        public const int isc_segment        = 335544366;
-        public const int isc_segstr_eof     = 335544367;
-        public const int isc_connect_reject = 335544421;
-        public const int isc_invalid_dimension = 335544458;
-        public const int isc_tra_state      = 335544468;
-        public const int isc_except         = 335544517;
-        public const int isc_dsql_sqlda_err = 335544583;
-        public const int isc_network_error  = 335544721;
-        public const int isc_net_read_err   = 335544726;
-        public const int isc_net_write_err  = 335544727;
-        public const int isc_stack_trace    = 335544842;
-        public const int isc_except2        = 335544848;
-		public const int isc_arith_except	= 335544321;
+        public const int isc_open_trans			= 335544357;
+        public const int isc_segment			= 335544366;
+        public const int isc_segstr_eof			= 335544367;
+        public const int isc_connect_reject		= 335544421;
+        public const int isc_invalid_dimension	= 335544458;
+        public const int isc_tra_state			= 335544468;
+        public const int isc_except				= 335544517;
+        public const int isc_dsql_sqlda_err		= 335544583;
+        public const int isc_network_error		= 335544721;
+        public const int isc_net_read_err		= 335544726;
+        public const int isc_net_write_err		= 335544727;
+        public const int isc_stack_trace		= 335544842;
+        public const int isc_except2			= 335544848;
+		public const int isc_arith_except		= 335544321;
+		public const int isc_string_truncation	= 335544914;
 
 		#endregion
 


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

[Firebird-checkins] SF.net SVN: firebird:[51292] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data/Resources

From: <cin...@us...> - 2010-06-26 11:38:12

Revision: 51292
          http://firebird.svn.sourceforge.net/firebird/?rev=51292&view=rev
Author:   cincura_net
Date:     2010-06-26 11:38:06 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Content according to FB2.5RC2 sources.

Modified Paths:
--------------
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/isc_error_msg.resx
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/sqlstate_mapping.resx

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/isc_error_msg.resx
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/isc_error_msg.resx	2010-06-26 11:37:06 UTC (rev 51291)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/isc_error_msg.resx	2010-06-26 11:38:06 UTC (rev 51292)
@@ -154,7 +154,7 @@
     <value>invalid transaction handle (expecting explicit transaction start)</value>
   </data>
   <data name="335544333" xml:space="preserve">
-    <value>internal gds software consistency check ({0})</value>
+    <value>internal Firebird consistency check ({0})</value>
   </data>
   <data name="335544334" xml:space="preserve">
     <value>conversion error from string "{0}"</value>
@@ -187,7 +187,7 @@
     <value>invalid request BLR at offset {0}</value>
   </data>
   <data name="335544344" xml:space="preserve">
-    <value>I/O error for file "{1}"</value>
+    <value>I/O error during "{0}" operation for file "{1}"</value>
   </data>
   <data name="335544345" xml:space="preserve">
     <value>lock conflict on no wait transaction</value>
@@ -265,7 +265,7 @@
     <value>attempted read of a new, open BLOB</value>
   </data>
   <data name="335544370" xml:space="preserve">
-    <value>attempted action on blob outside transaction</value>
+    <value>attempted action on BLOB outside transaction</value>
   </data>
   <data name="335544371" xml:space="preserve">
     <value>attempted write to read-only BLOB</value>
@@ -797,7 +797,7 @@
     <value>Cannot define constraints on views</value>
   </data>
   <data name="335544547" xml:space="preserve">
-    <value>internal gds software consistency check (invalid RDB$CONSTRAINT_TYPE)</value>
+    <value>internal Firebird consistency check (invalid RDB$CONSTRAINT_TYPE)</value>
   </data>
   <data name="335544548" xml:space="preserve">
     <value>Attempt to define a second PRIMARY KEY for the same table</value>
@@ -1891,6 +1891,240 @@
   <data name="335544911" xml:space="preserve">
     <value>Cannot take a table reservation isc_tpb_lock_write in TPB because the transaction is in read only mode</value>
   </data>
+  <data name="335544912" xml:space="preserve">
+    <value>value exceeds the range for a valid time</value>
+  </data>
+  <data name="335544913" xml:space="preserve">
+    <value>value exceeds the range for valid timestamps</value>
+  </data>
+  <data name="335544914" xml:space="preserve">
+    <value>string right truncation</value>
+  </data>
+  <data name="335544915" xml:space="preserve">
+    <value>blob truncation when converting to a string: length limit exceeded</value>
+  </data>
+  <data name="335544916" xml:space="preserve">
+    <value>numeric value is out of range</value>
+  </data>
+  <data name="335544917" xml:space="preserve">
+    <value>Firebird shutdown is still in progress after the specified timeout</value>
+  </data>
+  <data name="335544918" xml:space="preserve">
+    <value>Attachment handle is busy</value>
+  </data>
+  <data name="335544919" xml:space="preserve">
+    <value>Bad written UDF detected: pointer returned in FREE_IT function was not allocated by ib_util_malloc</value>
+  </data>
+  <data name="335544920" xml:space="preserve">
+    <value>External Data Source provider '{0}' not found</value>
+  </data>
+  <data name="335544921" xml:space="preserve">
+    <value>Execute statement error at {0} :
+{1}Data source : {2}</value>
+  </data>
+  <data name="335544922" xml:space="preserve">
+    <value>Execute statement preprocess SQL error</value>
+  </data>
+  <data name="335544923" xml:space="preserve">
+    <value>Statement expected</value>
+  </data>
+  <data name="335544924" xml:space="preserve">
+    <value>Parameter name expected</value>
+  </data>
+  <data name="335544925" xml:space="preserve">
+    <value>Unclosed comment found near '{0}'</value>
+  </data>
+  <data name="335544926" xml:space="preserve">
+    <value>Execute statement error at {0} :
+{1}Statement : {2}
+Data source : {3}</value>
+  </data>
+  <data name="335544927" xml:space="preserve">
+    <value>Input parameters mismatch</value>
+  </data>
+  <data name="335544928" xml:space="preserve">
+    <value>Output parameters mismatch</value>
+  </data>
+  <data name="335544929" xml:space="preserve">
+    <value>Input parameter '{0}' have no value set</value>
+  </data>
+  <data name="335544930" xml:space="preserve">
+    <value>BLR stream length {0} exceeds implementation limit {1}</value>
+  </data>
+  <data name="335544931" xml:space="preserve">
+    <value>Monitoring table space exhausted</value>
+  </data>
+  <data name="335544932" xml:space="preserve">
+    <value>module name or entrypoint could not be found</value>
+  </data>
+  <data name="335544933" xml:space="preserve">
+    <value>nothing to cancel</value>
+  </data>
+  <data name="335544934" xml:space="preserve">
+    <value>ib_util library has not been loaded to deallocate memory returned by FREE_IT function</value>
+  </data>
+  <data name="335544935" xml:space="preserve">
+    <value>Cannot have circular dependencies with computed fields</value>
+  </data>
+  <data name="335544936" xml:space="preserve">
+    <value>Security database error</value>
+  </data>
+  <data name="335544937" xml:space="preserve">
+    <value>Invalid data type in DATE/TIME/TIMESTAMP addition or subtraction in add_datettime()</value>
+  </data>
+  <data name="335544938" xml:space="preserve">
+    <value>Only a TIME value can be added to a DATE value</value>
+  </data>
+  <data name="335544939" xml:space="preserve">
+    <value>Only a DATE value can be added to a TIME value</value>
+  </data>
+  <data name="335544940" xml:space="preserve">
+    <value>TIMESTAMP values can be subtracted only from another TIMESTAMP value</value>
+  </data>
+  <data name="335544941" xml:space="preserve">
+    <value>Only one operand can be of type TIMESTAMP</value>
+  </data>
+  <data name="335544942" xml:space="preserve">
+    <value>Only HOUR, MINUTE, SECOND and MILLISECOND can be extracted from TIME values</value>
+  </data>
+  <data name="335544943" xml:space="preserve">
+    <value>HOUR, MINUTE, SECOND and MILLISECOND cannot be extracted from DATE values</value>
+  </data>
+  <data name="335544944" xml:space="preserve">
+    <value>Invalid argument for EXTRACT() not being of DATE/TIME/TIMESTAMP type</value>
+  </data>
+  <data name="335544945" xml:space="preserve">
+    <value>Arguments for {0} must be integral types or NUMERIC/DECIMAL without scale</value>
+  </data>
+  <data name="335544946" xml:space="preserve">
+    <value>First argument for {0} must be integral type or floating point type</value>
+  </data>
+  <data name="335544947" xml:space="preserve">
+    <value>Human readable UUID argument for {0} must be of string type</value>
+  </data>
+  <data name="335544948" xml:space="preserve">
+    <value>Human readable UUID argument for {1} must be of exact length {0}</value>
+  </data>
+  <data name="335544949" xml:space="preserve">
+    <value>Human readable UUID argument for {2} must have "-" at position {1} instead of "{0}"</value>
+  </data>
+  <data name="335544950" xml:space="preserve">
+    <value>Human readable UUID argument for {2} must have hex digit at position {1} instead of "{0}"</value>
+  </data>
+  <data name="335544951" xml:space="preserve">
+    <value>Only HOUR, MINUTE, SECOND and MILLISECOND can be added to TIME values in {0}</value>
+  </data>
+  <data name="335544952" xml:space="preserve">
+    <value>Invalid data type in addition of part to DATE/TIME/TIMESTAMP in {0}</value>
+  </data>
+  <data name="335544953" xml:space="preserve">
+    <value>Invalid part {0} to be added to a DATE/TIME/TIMESTAMP value in {1}</value>
+  </data>
+  <data name="335544954" xml:space="preserve">
+    <value>Expected DATE/TIME/TIMESTAMP type in evlDateAdd() result</value>
+  </data>
+  <data name="335544955" xml:space="preserve">
+    <value>Expected DATE/TIME/TIMESTAMP type as first and second argument to {0}</value>
+  </data>
+  <data name="335544956" xml:space="preserve">
+    <value>The result of TIME-&lt;value&gt; in {0} cannot be expressed in YEAR, MONTH, DAY or WEEK</value>
+  </data>
+  <data name="335544957" xml:space="preserve">
+    <value>The result of TIME-TIMESTAMP or TIMESTAMP-TIME in {0} cannot be expressed in HOUR, MINUTE, SECOND or MILLISECOND</value>
+  </data>
+  <data name="335544958" xml:space="preserve">
+    <value>The result of DATE-TIME or TIME-DATE in {0} cannot be expressed in HOUR, MINUTE, SECOND and MILLISECOND</value>
+  </data>
+  <data name="335544959" xml:space="preserve">
+    <value>Invalid part {0} to express the difference between two DATE/TIME/TIMESTAMP values in {1}</value>
+  </data>
+  <data name="335544960" xml:space="preserve">
+    <value>Argument for {0} must be positive</value>
+  </data>
+  <data name="335544961" xml:space="preserve">
+    <value>Base for {0} must be positive</value>
+  </data>
+  <data name="335544962" xml:space="preserve">
+    <value>Argument #{0} for {1} must be zero or positive</value>
+  </data>
+  <data name="335544963" xml:space="preserve">
+    <value>Argument #{0} for {1} must be positive</value>
+  </data>
+  <data name="335544964" xml:space="preserve">
+    <value>Base for {0} cannot be zero if exponent is negative</value>
+  </data>
+  <data name="335544965" xml:space="preserve">
+    <value>Base for {0} cannot be negative if exponent is not an integral value</value>
+  </data>
+  <data name="335544966" xml:space="preserve">
+    <value>The numeric scale must be between -128 and 127 in {0}</value>
+  </data>
+  <data name="335544967" xml:space="preserve">
+    <value>Argument for {0} must be zero or positive</value>
+  </data>
+  <data name="335544968" xml:space="preserve">
+    <value>Binary UUID argument for {0} must be of string type</value>
+  </data>
+  <data name="335544969" xml:space="preserve">
+    <value>Binary UUID argument for {1} must use {0} bytes</value>
+  </data>
+  <data name="335544970" xml:space="preserve">
+    <value>Missing required item {0} in service parameter block</value>
+  </data>
+  <data name="335544971" xml:space="preserve">
+    <value>{0} server is shutdown</value>
+  </data>
+  <data name="335544972" xml:space="preserve">
+    <value>Invalid connection string</value>
+  </data>
+  <data name="335544973" xml:space="preserve">
+    <value>Unrecognized events block</value>
+  </data>
+  <data name="335544974" xml:space="preserve">
+    <value>Could not start first worker thread - shutdown server</value>
+  </data>
+  <data name="335544975" xml:space="preserve">
+    <value>Timeout occurred while waiting for a secondary connection for event processing</value>
+  </data>
+  <data name="335544976" xml:space="preserve">
+    <value>Argument for {0} must be different than zero</value>
+  </data>
+  <data name="335544977" xml:space="preserve">
+    <value>Argument for {0} must be in the range [-1, 1]</value>
+  </data>
+  <data name="335544978" xml:space="preserve">
+    <value>Argument for {0} must be greater or equal than one</value>
+  </data>
+  <data name="335544979" xml:space="preserve">
+    <value>Argument for {0} must be in the range ]-1, 1[</value>
+  </data>
+  <data name="335544980" xml:space="preserve">
+    <value>Incorrect parameters provided to internal function {0}</value>
+  </data>
+  <data name="335544981" xml:space="preserve">
+    <value>Floating point overflow in built-in function {0}</value>
+  </data>
+  <data name="335544982" xml:space="preserve">
+    <value>Floating point overflow in result from UDF {0}</value>
+  </data>
+  <data name="335544983" xml:space="preserve">
+    <value>Invalid floating point value returned by UDF {0}</value>
+  </data>
+  <data name="335544984" xml:space="preserve">
+    <value>Database is probably already opened by another engine instance in another Windows session</value>
+  </data>
+  <data name="335544985" xml:space="preserve">
+    <value>No free space found in temporary directories</value>
+  </data>
+  <data name="335544986" xml:space="preserve">
+    <value>Explicit transaction control is not allowed</value>
+  </data>
+  <data name="335544987" xml:space="preserve">
+    <value>Use of TRUSTED switches in spb_command_line is prohibited</value>
+  </data>
+  <data name="335545017" xml:space="preserve">
+    <value>Asynchronous call is already running for this attachment</value>
+  </data>
   <data name="335740929" xml:space="preserve">
     <value>data base file name ({0}) already given</value>
   </data>
@@ -1972,9 +2206,6 @@
   <data name="335741038" xml:space="preserve">
     <value>"read_only" or "read_write" required</value>
   </data>
-  <data name="335741039" xml:space="preserve">
-    <value>	-sql_dialect	set database dialect n</value>
-  </data>
   <data name="335741042" xml:space="preserve">
     <value>positive or zero numeric value required</value>
   </data>
@@ -2065,6 +2296,9 @@
   <data name="336003103" xml:space="preserve">
     <value>Database trigger type can't be changed</value>
   </data>
+  <data name="336068740" xml:space="preserve">
+    <value>Table {0} already exists</value>
+  </data>
   <data name="336068784" xml:space="preserve">
     <value>column {0} does not exist in table/view {1}</value>
   </data>
@@ -2146,6 +2380,9 @@
   <data name="336068858" xml:space="preserve">
     <value>Password should not be empty string</value>
   </data>
+  <data name="336068859" xml:space="preserve">
+    <value>Index {0} already exists</value>
+  </data>
   <data name="336330753" xml:space="preserve">
     <value>found unknown switch</value>
   </data>
@@ -2264,7 +2501,7 @@
     <value>do not recognize record type {0}</value>
   </data>
   <data name="336330796" xml:space="preserve">
-    <value>Expected backup version 1..8.  Found {0}</value>
+    <value>Expected backup version 1..9.  Found {0}</value>
   </data>
   <data name="336330797" xml:space="preserve">
     <value>expected backup description record</value>
@@ -2398,6 +2635,12 @@
   <data name="336331034" xml:space="preserve">
     <value>restoring data only ignoring foreign key, unique, not null &amp; other constraints</value>
   </data>
+  <data name="336331093" xml:space="preserve">
+    <value>Invalid metadata detected. Use -FIX_FSS_METADATA option.</value>
+  </data>
+  <data name="336331094" xml:space="preserve">
+    <value>Invalid data detected. Use -FIX_FSS_DATA option.</value>
+  </data>
   <data name="336397205" xml:space="preserve">
     <value>ODS versions before ODS{0} are not supported</value>
   </data>
@@ -2495,11 +2738,68 @@
     <value>feature is not supported in dialect {0}</value>
   </data>
   <data name="336397237" xml:space="preserve">
+    <value>CTE "{0}" is not used in query</value>
+  </data>
+  <data name="336397238" xml:space="preserve">
     <value>column {0} appears more than once in ALTER VIEW</value>
   </data>
-  <data name="336397238" xml:space="preserve">
+  <data name="336397239" xml:space="preserve">
     <value>{0} is not supported inside IN AUTONOMOUS TRANSACTION block</value>
   </data>
+  <data name="336397240" xml:space="preserve">
+    <value>Unknown node type {0} in dsql/GEN_expr</value>
+  </data>
+  <data name="336397241" xml:space="preserve">
+    <value>Argument for {0} in dialect 1 must be string or numeric</value>
+  </data>
+  <data name="336397242" xml:space="preserve">
+    <value>Argument for {0} in dialect 3 must be numeric</value>
+  </data>
+  <data name="336397243" xml:space="preserve">
+    <value>Strings cannot be added to or subtracted from DATE or TIME types</value>
+  </data>
+  <data name="336397244" xml:space="preserve">
+    <value>Invalid data type for subtraction involving DATE, TIME or TIMESTAMP types</value>
+  </data>
+  <data name="336397245" xml:space="preserve">
+    <value>Adding two DATE values or two TIME values is not allowed</value>
+  </data>
+  <data name="336397246" xml:space="preserve">
+    <value>DATE value cannot be subtracted from the provided data type</value>
+  </data>
+  <data name="336397247" xml:space="preserve">
+    <value>Strings cannot be added or subtracted in dialect 3</value>
+  </data>
+  <data name="336397248" xml:space="preserve">
+    <value>Invalid data type for addition or subtraction in dialect 3</value>
+  </data>
+  <data name="336397249" xml:space="preserve">
+    <value>Invalid data type for multiplication in dialect 1</value>
+  </data>
+  <data name="336397250" xml:space="preserve">
+    <value>Strings cannot be multiplied in dialect 3</value>
+  </data>
+  <data name="336397251" xml:space="preserve">
+    <value>Invalid data type for multiplication in dialect 3</value>
+  </data>
+  <data name="336397252" xml:space="preserve">
+    <value>Division in dialect 1 must be between numeric data types</value>
+  </data>
+  <data name="336397253" xml:space="preserve">
+    <value>Strings cannot be divided in dialect 3</value>
+  </data>
+  <data name="336397254" xml:space="preserve">
+    <value>Invalid data type for division in dialect 3</value>
+  </data>
+  <data name="336397255" xml:space="preserve">
+    <value>Strings cannot be negated (applied the minus operator) in dialect 3</value>
+  </data>
+  <data name="336397256" xml:space="preserve">
+    <value>Invalid data type for negation (minus operator)</value>
+  </data>
+  <data name="336397257" xml:space="preserve">
+    <value>Cannot have more than 255 items in DISTINCT list</value>
+  </data>
   <data name="336723983" xml:space="preserve">
     <value>unable to open database</value>
   </data>
@@ -2695,6 +2995,21 @@
   <data name="336986118" xml:space="preserve">
     <value>Unknown switch "{0}"</value>
   </data>
+  <data name="336986159" xml:space="preserve">
+    <value>Wrong value for shutdown mode</value>
+  </data>
+  <data name="336986160" xml:space="preserve">
+    <value>could not open file {0}</value>
+  </data>
+  <data name="336986161" xml:space="preserve">
+    <value>could not read file {0}</value>
+  </data>
+  <data name="336986162" xml:space="preserve">
+    <value>empty file {0}</value>
+  </data>
+  <data name="336986164" xml:space="preserve">
+    <value>Invalid or missing parameter for switch {0}</value>
+  </data>
   <data name="337051649" xml:space="preserve">
     <value>Switches trusted_svc and trusted_role are not supported from command line</value>
   </data>

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/sqlstate_mapping.resx
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/sqlstate_mapping.resx	2010-06-26 11:37:06 UTC (rev 51291)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Resources/sqlstate_mapping.resx	2010-06-26 11:38:06 UTC (rev 51292)
@@ -2097,6 +2097,30 @@
   <data name="335544980" xml:space="preserve">
     <value>HY000</value>
   </data>
+  <data name="335544981" xml:space="preserve">
+    <value>42000</value>
+  </data>
+  <data name="335544982" xml:space="preserve">
+    <value>39000</value>
+  </data>
+  <data name="335544983" xml:space="preserve">
+    <value>39000</value>
+  </data>
+  <data name="335544984" xml:space="preserve">
+    <value>42000</value>
+  </data>
+  <data name="335544985" xml:space="preserve">
+    <value>HY000</value>
+  </data>
+  <data name="335544986" xml:space="preserve">
+    <value>42000</value>
+  </data>
+  <data name="335544987" xml:space="preserve">
+    <value>28000</value>
+  </data>
+  <data name="335545017" xml:space="preserve">
+    <value>HY018</value>
+  </data>
   <data name="335740929" xml:space="preserve">
     <value>00000</value>
   </data>
@@ -2178,9 +2202,6 @@
   <data name="335741038" xml:space="preserve">
     <value>00000</value>
   </data>
-  <data name="335741039" xml:space="preserve">
-    <value>00000</value>
-  </data>
   <data name="335741042" xml:space="preserve">
     <value>00000</value>
   </data>
@@ -2610,6 +2631,12 @@
   <data name="336331034" xml:space="preserve">
     <value>00000</value>
   </data>
+  <data name="336331093" xml:space="preserve">
+    <value>00000</value>
+  </data>
+  <data name="336331094" xml:space="preserve">
+    <value>00000</value>
+  </data>
   <data name="336397205" xml:space="preserve">
     <value>HY000</value>
   </data>
@@ -2976,6 +3003,9 @@
   <data name="336986162" xml:space="preserve">
     <value>00000</value>
   </data>
+  <data name="336986164" xml:space="preserve">
+    <value>00000</value>
+  </data>
   <data name="337051649" xml:space="preserve">
     <value>00000</value>
   </data>


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

[Firebird-checkins] SF.net SVN: firebird:[51291] NETProvider/trunk/NETProvider/source/ FirebirdSql/Data/Common/IscException.cs

From: <cin...@us...> - 2010-06-26 11:37:13

Revision: 51291
          http://firebird.svn.sourceforge.net/firebird/?rev=51291&view=rev
Author:   cincura_net
Date:     2010-06-26 11:37:06 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Encapsulation.

Modified Paths:
--------------
    NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs

Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs
===================================================================
--- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs	2010-06-26 02:50:07 UTC (rev 51290)
+++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Common/IscException.cs	2010-06-26 11:37:06 UTC (rev 51291)
@@ -217,7 +217,7 @@
 					}
 					catch
 					{
-						message = string.Format(CultureInfo.CurrentCulture, "No message for error code {0} found.", code);
+						message = BuildDefaultErrorMessage(code);
 					}
 
 					ArrayList param = new ArrayList();
@@ -273,7 +273,7 @@
 					}
 					catch
 					{
-						message = string.Format(CultureInfo.CurrentCulture, "No message for error code {0} found.", code);
+						message = BuildDefaultErrorMessage(code);
 
 						builder.AppendFormat(CultureInfo.CurrentCulture, message, args);
 					}
@@ -290,6 +290,11 @@
 			_message = builder.ToString();
 		}
 
+		private string BuildDefaultErrorMessage(int code)
+		{
+			return string.Format(CultureInfo.CurrentCulture, "No message for error code {0} found.", code);
+		}
+
 		#endregion
 	}
 }


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

[Firebird-checkins] SF.net SVN: firebird:[51290] firebird/trunk/src

From: <asf...@us...> - 2010-06-26 02:50:13

Revision: 51290
          http://firebird.svn.sourceforge.net/firebird/?rev=51290&view=rev
Author:   asfernandes
Date:     2010-06-26 02:50:07 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    firebird/trunk/src/dsql/DdlNodes.epp
    firebird/trunk/src/dsql/ddl.cpp
    firebird/trunk/src/dsql/metd.epp
    firebird/trunk/src/dsql/metd_proto.h
    firebird/trunk/src/jrd/irq.h

Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 02:30:01 UTC (rev 51289)
+++ firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 02:50:07 UTC (rev 51290)
@@ -781,9 +781,8 @@
 	if (alter)
 	{
 		// Update DSQL cache
-		AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-		METD_drop_function(transaction, str, package);
-		MET_dsql_cache_release(tdbb, SYM_udf, str->str_data, package);
+		METD_drop_function(transaction, QualifiedName(name, package));
+		MET_dsql_cache_release(tdbb, SYM_udf, name.c_str(), package);
 	}
 }
 
@@ -1382,9 +1381,8 @@
 	savePoint.release();	// everything is ok
 
 	// Update DSQL cache
-	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-	METD_drop_function(transaction, str, package);
-	MET_dsql_cache_release(tdbb, SYM_udf, str->str_data, package);
+	METD_drop_function(transaction, QualifiedName(name, package));
+	MET_dsql_cache_release(tdbb, SYM_udf, name.c_str(), package);
 }
 
 
@@ -1579,9 +1577,8 @@
 	if (alter)
 	{
 		// Update DSQL cache
-		AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-		METD_drop_procedure(transaction, str, package);
-		MET_dsql_cache_release(tdbb, SYM_procedure, str->str_data, package);
+		METD_drop_procedure(transaction, QualifiedName(name, package));
+		MET_dsql_cache_release(tdbb, SYM_procedure, name.c_str(), package);
 	}
 }
 
@@ -2191,9 +2188,8 @@
 	savePoint.release();	// everything is ok
 
 	// Update DSQL cache
-	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-	METD_drop_procedure(transaction, str, package);
-	MET_dsql_cache_release(tdbb, SYM_procedure, str->str_data, package);
+	METD_drop_procedure(transaction, QualifiedName(name, package));
+	MET_dsql_cache_release(tdbb, SYM_procedure, name.c_str(), package);
 }
 
 

Modified: firebird/trunk/src/dsql/ddl.cpp
===================================================================
--- firebird/trunk/src/dsql/ddl.cpp	2010-06-26 02:30:01 UTC (rev 51289)
+++ firebird/trunk/src/dsql/ddl.cpp	2010-06-26 02:50:07 UTC (rev 51290)
@@ -273,7 +273,7 @@
 			// Signal UDF for obsolescence
 			string = (dsql_str*) statement->getDdlNode()->nod_arg[e_udf_name];
 			sym_type = SYM_udf;
-			METD_drop_function(request->getTransaction(), string, "");
+			METD_drop_function(request->getTransaction(), QualifiedName(string->str_data, ""));
 			break;
 	}
 

Modified: firebird/trunk/src/dsql/metd.epp
===================================================================
--- firebird/trunk/src/dsql/metd.epp	2010-06-26 02:30:01 UTC (rev 51289)
+++ firebird/trunk/src/dsql/metd.epp	2010-06-26 02:50:07 UTC (rev 51290)
@@ -148,7 +148,7 @@
 }
 
 
-void METD_drop_function(jrd_tra* transaction, const dsql_str* name, const MetaName& packageName)
+void METD_drop_function(jrd_tra* transaction, const QualifiedName& name)
 {
 /**************************************
  *
@@ -169,20 +169,19 @@
 	thread_db* tdbb = JRD_get_thread_data();
 	dsql_dbb* dbb = transaction->getDsqlAttachment();
 
-	const QualifiedName metaName(MetaName(name->str_data, name->str_length), packageName);
 	dsql_udf* function;
 
-	if (dbb->dbb_functions.get(metaName, function))
+	if (dbb->dbb_functions.get(name, function))
 	{
-		MET_dsql_cache_use(tdbb, SYM_udf, metaName.identifier, metaName.package);
+		MET_dsql_cache_use(tdbb, SYM_udf, name.identifier, name.package);
 		function->udf_flags |= UDF_dropped;
-		dbb->dbb_functions.remove(metaName);
+		dbb->dbb_functions.remove(name);
 	}
 
 }
 
 
-void METD_drop_procedure(jrd_tra* transaction, const dsql_str* name, const MetaName& packageName)
+void METD_drop_procedure(jrd_tra* transaction, const QualifiedName& name)
 {
 /**************************************
  *
@@ -203,14 +202,13 @@
 	thread_db* tdbb = JRD_get_thread_data();
 	dsql_dbb* dbb = transaction->getDsqlAttachment();
 
-	const QualifiedName metaName(MetaName(name->str_data, name->str_length), packageName);
 	dsql_prc* procedure;
 
-	if (dbb->dbb_procedures.get(metaName, procedure))
+	if (dbb->dbb_procedures.get(name, procedure))
 	{
-		MET_dsql_cache_use(tdbb, SYM_procedure, metaName.identifier, metaName.package);
+		MET_dsql_cache_use(tdbb, SYM_procedure, name.identifier, name.package);
 		procedure->prc_flags |= PRC_dropped;
-		dbb->dbb_procedures.remove(metaName);
+		dbb->dbb_procedures.remove(name);
 	}
 }
 
@@ -1515,50 +1513,6 @@
 }
 
 
-bool METD_get_trigger(jrd_tra* transaction, const dsql_str* name, dsql_str** relation, USHORT* trig_type)
-{
-/**************************************
- *
- *  M E T D _ g e t _ t r i g g e r
- *
- **************************************
- *
- * Functional description
- *  Look up a trigger's relation and it's current type
- *
- **************************************/
-	thread_db* tdbb = JRD_get_thread_data();
-
-	validateTransaction(transaction);
-
-	bool found = false;
-
-	if (relation)
-		*relation = NULL;
-
-	AutoCacheRequest handle(tdbb, irq_trigger, IRQ_REQUESTS);
-
-	FOR(REQUEST_HANDLE handle TRANSACTION_HANDLE transaction)
-		X IN RDB$TRIGGERS WITH X.RDB$TRIGGER_NAME EQ name->str_data
-	{
-		found = true;
-		*trig_type = X.RDB$TRIGGER_TYPE;
-
-		if (!X.RDB$RELATION_NAME.NULL)
-		{
-			if (relation)
-			{
-				fb_utils::exact_name(X.RDB$RELATION_NAME);
-				*relation = MAKE_string(X.RDB$RELATION_NAME, strlen(X.RDB$RELATION_NAME));
-			}
-		}
-	}
-	END_FOR
-
-	return found;
-}
-
-
 bool METD_get_type(jrd_tra* transaction, const dsql_str* name, const char* field, SSHORT* value)
 {
 /**************************************

Modified: firebird/trunk/src/dsql/metd_proto.h
===================================================================
--- firebird/trunk/src/dsql/metd_proto.h	2010-06-26 02:30:01 UTC (rev 51289)
+++ firebird/trunk/src/dsql/metd_proto.h	2010-06-26 02:50:07 UTC (rev 51290)
@@ -48,8 +48,8 @@
 
 void METD_drop_charset(Jrd::jrd_tra*, const Firebird::MetaName&);
 void METD_drop_collation(Jrd::jrd_tra*, const Firebird::MetaName&);
-void METD_drop_function(Jrd::jrd_tra*, const Jrd::dsql_str*, const Firebird::MetaName&);
-void METD_drop_procedure(Jrd::jrd_tra*, const Jrd::dsql_str*, const Firebird::MetaName&);
+void METD_drop_function(Jrd::jrd_tra*, const Firebird::QualifiedName&);
+void METD_drop_procedure(Jrd::jrd_tra*, const Firebird::QualifiedName&);
 void METD_drop_relation(Jrd::jrd_tra*, const Jrd::dsql_str*);
 
 Jrd::dsql_intlsym* METD_get_charset(Jrd::jrd_tra*, USHORT, const char* name);
@@ -67,7 +67,6 @@
 Jrd::dsql_prc* METD_get_procedure(Jrd::jrd_tra*, Jrd::DsqlCompilerScratch*, const Jrd::dsql_str*,
 	const Jrd::dsql_str*);
 Jrd::dsql_rel* METD_get_relation(Jrd::jrd_tra*, Jrd::DsqlCompilerScratch*, const Jrd::dsql_str*);
-bool METD_get_trigger(Jrd::jrd_tra*, const Jrd::dsql_str*, Jrd::dsql_str**, USHORT*);
 bool METD_get_type(Jrd::jrd_tra*, const Jrd::dsql_str*, const char*, SSHORT*);
 Jrd::dsql_rel* METD_get_view_base(Jrd::jrd_tra*, Jrd::DsqlCompilerScratch*, const char* view_name,
 	Jrd::MetaNamePairMap& fields);

Modified: firebird/trunk/src/jrd/irq.h
===================================================================
--- firebird/trunk/src/jrd/irq.h	2010-06-26 02:30:01 UTC (rev 51289)
+++ firebird/trunk/src/jrd/irq.h	2010-06-26 02:50:07 UTC (rev 51290)
@@ -137,7 +137,6 @@
 	irq_parameters,			// DSQL/METD: lookup a procedure's parameters
 	irq_collation,			// DSQL/METD: lookup a collation name
 	irq_charset,			// DSQL/METD: lookup a character set
-	irq_trigger,			// DSQL/METD: lookup a trigger
 	irq_domain,				// DSQL/METD: lookup a domain
 	irq_type,				// DSQL/METD: lookup a symbolic name in RDB$TYPES
 	irq_col_default,		// DSQL/METD: lookup default for a column


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

[Firebird-checkins] SF.net SVN: firebird:[51289] firebird/trunk/src/dsql

From: <asf...@us...> - 2010-06-26 02:30:08

Revision: 51289
          http://firebird.svn.sourceforge.net/firebird/?rev=51289&view=rev
Author:   asfernandes
Date:     2010-06-26 02:30:01 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Misc

Modified Paths:
--------------
    firebird/trunk/src/dsql/DdlNodes.epp
    firebird/trunk/src/dsql/ddl.cpp
    firebird/trunk/src/dsql/metd.epp
    firebird/trunk/src/dsql/metd_proto.h

Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 01:52:06 UTC (rev 51288)
+++ firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 02:30:01 UTC (rev 51289)
@@ -2951,9 +2951,8 @@
 	savePoint.release();	// everything is ok
 
 	// Update DSQL cache
-	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-	METD_drop_collation(transaction, str);
-	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, str->str_data);
+	METD_drop_collation(transaction, name);
+	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, name.c_str());
 }
 
 DdlNode* CreateCollationNode::internalDsqlPass()
@@ -2972,9 +2971,8 @@
 
 	if (fromName.hasData())
 	{
-		AutoPtr<dsql_str> str(MAKE_string(fromName.c_str(), fromName.length()));
 		const dsql_intlsym* resolvedCollation = METD_get_collation(
-			dsqlScratch->getTransaction(), str, forCharSetId);
+			dsqlScratch->getTransaction(), fromName, forCharSetId);
 
 		if (!resolvedCollation)
 		{
@@ -3103,9 +3101,8 @@
 	savePoint.release();	// everything is ok
 
 	// Update DSQL cache
-	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
-	METD_drop_collation(transaction, str);
-	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, str->str_data);
+	METD_drop_collation(transaction, name);
+	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, name.c_str());
 }
 
 

Modified: firebird/trunk/src/dsql/ddl.cpp
===================================================================
--- firebird/trunk/src/dsql/ddl.cpp	2010-06-26 01:52:06 UTC (rev 51288)
+++ firebird/trunk/src/dsql/ddl.cpp	2010-06-26 02:30:01 UTC (rev 51289)
@@ -619,7 +619,7 @@
 	if (collation_name)
 	{
 		const dsql_intlsym* resolved_collation = METD_get_collation(dsqlScratch->getTransaction(),
-			collation_name, field->fld_character_set_id);
+			collation_name->str_data, field->fld_character_set_id);
 
 		if (!resolved_collation)
 		{

Modified: firebird/trunk/src/dsql/metd.epp
===================================================================
--- firebird/trunk/src/dsql/metd.epp	2010-06-26 01:52:06 UTC (rev 51288)
+++ firebird/trunk/src/dsql/metd.epp	2010-06-26 02:30:01 UTC (rev 51289)
@@ -116,7 +116,7 @@
 }
 
 
-void METD_drop_collation(jrd_tra* transaction, const dsql_str* name)
+void METD_drop_collation(jrd_tra* transaction, const MetaName& name)
 {
 /**************************************
  *
@@ -137,14 +137,13 @@
 	thread_db* tdbb = JRD_get_thread_data();
 	dsql_dbb* dbb = transaction->getDsqlAttachment();
 
-	MetaName metaName(name->str_data, name->str_length);
 	dsql_intlsym* collation;
 
-	if (dbb->dbb_collations.get(metaName, collation))
+	if (dbb->dbb_collations.get(name, collation))
 	{
-		MET_dsql_cache_use(tdbb, SYM_intlsym_collation, metaName);
+		MET_dsql_cache_use(tdbb, SYM_intlsym_collation, name);
 		collation->intlsym_flags |= INTLSYM_dropped;
-		dbb->dbb_collations.remove(metaName);
+		dbb->dbb_collations.remove(name);
 	}
 }
 
@@ -249,7 +248,7 @@
 }
 
 
-dsql_intlsym* METD_get_collation(jrd_tra* transaction, const dsql_str* name, USHORT charset_id)
+dsql_intlsym* METD_get_collation(jrd_tra* transaction, const MetaName& name, USHORT charset_id)
 {
 /**************************************
  *
@@ -267,14 +266,13 @@
 	validateTransaction(transaction);
 
 	dsql_dbb* dbb = transaction->getDsqlAttachment();
-	MetaName metaName(name->str_data, name->str_length);
 
 	// Start by seeing if symbol is already defined
 
 	dsql_intlsym* symbol;
-	if (dbb->dbb_collations.get(metaName, symbol) && !(symbol->intlsym_flags & INTLSYM_dropped))
+	if (dbb->dbb_collations.get(name, symbol) && !(symbol->intlsym_flags & INTLSYM_dropped))
 	{
-		if (MET_dsql_cache_use(tdbb, SYM_intlsym_collation, metaName))
+		if (MET_dsql_cache_use(tdbb, SYM_intlsym_collation, name))
 			symbol->intlsym_flags |= INTLSYM_dropped;
 		else
 			return symbol;
@@ -289,11 +287,11 @@
 	FOR(REQUEST_HANDLE handle TRANSACTION_HANDLE transaction)
 	X IN RDB$COLLATIONS
 		CROSS Y IN RDB$CHARACTER_SETS OVER RDB$CHARACTER_SET_ID
-		WITH X.RDB$COLLATION_NAME EQ name->str_data AND
+		WITH X.RDB$COLLATION_NAME EQ name.c_str() AND
 			 X.RDB$CHARACTER_SET_ID EQ charset_id;
 	{
 		symbol = FB_NEW(dbb->dbb_pool) dsql_intlsym(dbb->dbb_pool);
-		symbol->intlsym_name = metaName;
+		symbol->intlsym_name = name;
 		symbol->intlsym_flags = 0;
 		symbol->intlsym_charset_id = X.RDB$CHARACTER_SET_ID;
 		symbol->intlsym_collate_id = X.RDB$COLLATION_ID;
@@ -307,8 +305,8 @@
 	if (!symbol)
 		return NULL;
 
-	dbb->dbb_collations.put(metaName, symbol);
-	MET_dsql_cache_use(tdbb, SYM_intlsym_collation, metaName);
+	dbb->dbb_collations.put(name, symbol);
+	MET_dsql_cache_use(tdbb, SYM_intlsym_collation, name);
 
 	return symbol;
 }

Modified: firebird/trunk/src/dsql/metd_proto.h
===================================================================
--- firebird/trunk/src/dsql/metd_proto.h	2010-06-26 01:52:06 UTC (rev 51288)
+++ firebird/trunk/src/dsql/metd_proto.h	2010-06-26 02:30:01 UTC (rev 51289)
@@ -47,7 +47,7 @@
 };
 
 void METD_drop_charset(Jrd::jrd_tra*, const Firebird::MetaName&);
-void METD_drop_collation(Jrd::jrd_tra*, const Jrd::dsql_str*);
+void METD_drop_collation(Jrd::jrd_tra*, const Firebird::MetaName&);
 void METD_drop_function(Jrd::jrd_tra*, const Jrd::dsql_str*, const Firebird::MetaName&);
 void METD_drop_procedure(Jrd::jrd_tra*, const Jrd::dsql_str*, const Firebird::MetaName&);
 void METD_drop_relation(Jrd::jrd_tra*, const Jrd::dsql_str*);
@@ -55,7 +55,7 @@
 Jrd::dsql_intlsym* METD_get_charset(Jrd::jrd_tra*, USHORT, const char* name);
 USHORT METD_get_charset_bpc(Jrd::jrd_tra*, SSHORT);
 Firebird::MetaName METD_get_charset_name(Jrd::jrd_tra*, SSHORT);
-Jrd::dsql_intlsym* METD_get_collation(Jrd::jrd_tra*, const Jrd::dsql_str*, USHORT charset_id);
+Jrd::dsql_intlsym* METD_get_collation(Jrd::jrd_tra*, const Firebird::MetaName&, USHORT charset_id);
 USHORT METD_get_col_default(Jrd::jrd_tra*, const char*, const char*, bool*, UCHAR*, USHORT);
 Jrd::dsql_str* METD_get_default_charset(Jrd::jrd_tra*);
 bool METD_get_domain(Jrd::jrd_tra*, class Jrd::dsql_fld*, const char* name);


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

[Firebird-checkins] SF.net SVN: firebird:[51288] firebird/trunk

From: <asf...@us...> - 2010-06-26 01:52:14

Revision: 51288
          http://firebird.svn.sourceforge.net/firebird/?rev=51288&view=rev
Author:   asfernandes
Date:     2010-06-26 01:52:06 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Refactor CREATE/DROP COLLATION

Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/dsql/DdlNodes.epp
    firebird/trunk/src/dsql/DdlNodes.h
    firebird/trunk/src/dsql/ddl.cpp
    firebird/trunk/src/dsql/node.h
    firebird/trunk/src/dsql/parse.y
    firebird/trunk/src/dsql/pass1.cpp
    firebird/trunk/src/include/gen/codetext.h
    firebird/trunk/src/include/gen/iberror.h
    firebird/trunk/src/include/gen/msgs.h
    firebird/trunk/src/include/gen/sql_code.h
    firebird/trunk/src/include/gen/sql_state.h
    firebird/trunk/src/jrd/Attachment.cpp
    firebird/trunk/src/jrd/Attachment.h
    firebird/trunk/src/jrd/drq.h
    firebird/trunk/src/jrd/dyn.epp
    firebird/trunk/src/jrd/dyn.h
    firebird/trunk/src/jrd/dyn_def.epp
    firebird/trunk/src/jrd/dyn_del.epp
    firebird/trunk/src/jrd/dyn_df_proto.h
    firebird/trunk/src/jrd/dyn_dl_proto.h
    firebird/trunk/src/msgs/messages2.sql
    firebird/trunk/src/msgs/system_errors2.sql

Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2010-06-26 01:52:06 UTC (rev 51288)
@@ -1638,8 +1638,18 @@
       PARAMETER (GDS__invalid_coll_attr                = 336068830)
       INTEGER*4 GDS__dyn_wrong_gtt_scope             
       PARAMETER (GDS__dyn_wrong_gtt_scope              = 336068840)
+      INTEGER*4 GDS__dyn_coll_used_table             
+      PARAMETER (GDS__dyn_coll_used_table              = 336068843)
+      INTEGER*4 GDS__dyn_coll_used_domain            
+      PARAMETER (GDS__dyn_coll_used_domain             = 336068844)
+      INTEGER*4 GDS__dyn_cannot_del_syscoll          
+      PARAMETER (GDS__dyn_cannot_del_syscoll           = 336068845)
+      INTEGER*4 GDS__dyn_cannot_del_def_coll         
+      PARAMETER (GDS__dyn_cannot_del_def_coll          = 336068846)
       INTEGER*4 GDS__dyn_table_not_found             
       PARAMETER (GDS__dyn_table_not_found              = 336068849)
+      INTEGER*4 GDS__dyn_coll_used_procedure         
+      PARAMETER (GDS__dyn_coll_used_procedure          = 336068851)
       INTEGER*4 GDS__dyn_scale_too_big               
       PARAMETER (GDS__dyn_scale_too_big                = 336068852)
       INTEGER*4 GDS__dyn_precision_too_small         

Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2010-06-26 01:52:06 UTC (rev 51288)
@@ -826,7 +826,12 @@
 	gds_max_coll_per_charset             = 336068829;
 	gds_invalid_coll_attr                = 336068830;
 	gds_dyn_wrong_gtt_scope              = 336068840;
+	gds_dyn_coll_used_table              = 336068843;
+	gds_dyn_coll_used_domain             = 336068844;
+	gds_dyn_cannot_del_syscoll           = 336068845;
+	gds_dyn_cannot_del_def_coll          = 336068846;
 	gds_dyn_table_not_found              = 336068849;
+	gds_dyn_coll_used_procedure          = 336068851;
 	gds_dyn_scale_too_big                = 336068852;
 	gds_dyn_precision_too_small          = 336068853;
 	gds_dyn_miss_priv_warning            = 336068855;

Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/DdlNodes.epp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -30,6 +30,7 @@
 #include "../jrd/msg_encode.h"
 #include "../jrd/obj.h"
 #include "../jrd/tra.h"
+#include "../jrd/IntlManager.h"
 #include "../jrd/PreparedStatement.h"
 #include "../jrd/blb_proto.h"
 #include "../jrd/cmp_proto.h"
@@ -2757,6 +2758,360 @@
 //----------------------
 
 
+void CreateCollationNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const
+{
+	text.printf(
+		"CreateCollationNode\n"
+		"  name: '%s'\n"
+		"  forCharSet: '%s'\n"
+		"  fromName: '%s'\n"
+		"  fromExternal: '%s'\n"
+		"  attributesOn: %x\n"
+		"  attributesOff: %x\n",
+		name.c_str(), forCharSet.c_str(), fromName.c_str(), fromExternal.c_str(),
+		attributesOn, attributesOff);
+}
+
+void CreateCollationNode::execute(thread_db* tdbb, jrd_tra* transaction)
+{
+	Attachment* attachment = transaction->tra_attachment;
+
+	// run all statements under savepoint control
+	AutoSavePoint savePoint(tdbb, transaction);
+
+	executeDdlTrigger(tdbb, transaction, DTW_BEFORE, DDL_TRIGGER_CREATE_COLLATION, name);
+
+	bool endStore = false;
+
+	try
+	{
+		AutoCacheRequest request(tdbb, drq_s_colls, DYN_REQUESTS);
+
+		STORE(REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
+			X IN RDB$COLLATIONS
+		{
+			X.RDB$CHARACTER_SET_ID = forCharSetId;
+			strcpy(X.RDB$COLLATION_NAME, name.c_str());
+			X.RDB$SYSTEM_FLAG = 0;
+
+			X.RDB$SPECIFIC_ATTRIBUTES.NULL = TRUE;
+			X.RDB$BASE_COLLATION_NAME.NULL = TRUE;
+
+			CharSet* cs = INTL_charset_lookup(tdbb, forCharSetId);
+			SubtypeInfo info;
+
+			if (fromName.hasData())
+			{
+				if (MET_get_char_coll_subtype_info(tdbb,
+						INTL_CS_COLL_TO_TTYPE(forCharSetId, fromCollationId), &info) &&
+					info.specificAttributes.hasData())
+				{
+					UCharBuffer temp;
+					ULONG size = info.specificAttributes.getCount() * cs->maxBytesPerChar();
+
+					size = INTL_convert_bytes(tdbb, forCharSetId, temp.getBuffer(size), size,
+						CS_METADATA, info.specificAttributes.begin(),
+						info.specificAttributes.getCount(), status_exception::raise);
+					temp.shrink(size);
+					info.specificAttributes = temp;
+				}
+
+				strcpy(X.RDB$BASE_COLLATION_NAME, info.baseCollationName.c_str());
+				X.RDB$BASE_COLLATION_NAME.NULL = FALSE;
+			}
+			else if (fromExternal.hasData())
+			{
+				strcpy(X.RDB$BASE_COLLATION_NAME, fromExternal.c_str());
+				X.RDB$BASE_COLLATION_NAME.NULL = FALSE;
+			}
+
+			if (specificAttributes.hasData())
+			{
+				UCharBuffer temp;
+				ULONG size = specificAttributes.getCount() * cs->maxBytesPerChar();
+
+				size = INTL_convert_bytes(tdbb, forCharSetId, temp.getBuffer(size), size,
+					attachment->att_charset, specificAttributes.begin(),
+					specificAttributes.getCount(), status_exception::raise);
+				temp.shrink(size);
+				specificAttributes = temp;
+			}
+
+			info.charsetName = forCharSet.c_str();
+			info.collationName = name;
+			if (X.RDB$BASE_COLLATION_NAME.NULL)
+				info.baseCollationName = info.collationName;
+			else
+				info.baseCollationName = X.RDB$BASE_COLLATION_NAME;
+			info.ignoreAttributes = false;
+
+			if (!IntlManager::collationInstalled(info.baseCollationName.c_str(),
+					info.charsetName.c_str()))
+			{
+				// msg: 223: "Collation @1 not installed for character set @2"
+				status_exception::raise(
+					Arg::Gds(isc_no_meta_update) <<
+					Arg::Gds(ENCODE_ISC_MSG(223, DYN_MSG_FAC)) <<
+					info.baseCollationName << info.charsetName);
+			}
+
+			IntlUtil::SpecificAttributesMap map;
+
+			if (!IntlUtil::parseSpecificAttributes(
+					cs, info.specificAttributes.getCount(), info.specificAttributes.begin(), &map) ||
+				!IntlUtil::parseSpecificAttributes(
+					cs, specificAttributes.getCount(), specificAttributes.begin(), &map))
+			{
+				// msg: 222: "Invalid collation attributes"
+				status_exception::raise(
+					Arg::Gds(isc_no_meta_update) <<
+					Arg::Gds(ENCODE_ISC_MSG(222, DYN_MSG_FAC)));
+			}
+
+			const string s = IntlUtil::generateSpecificAttributes(cs, map);
+			string newSpecificAttributes;
+
+			if (!IntlManager::setupCollationAttributes(
+					info.baseCollationName.c_str(), info.charsetName.c_str(), s,
+					newSpecificAttributes))
+			{
+				// msg: 222: "Invalid collation attributes"
+				status_exception::raise(
+					Arg::Gds(isc_no_meta_update) <<
+					Arg::Gds(ENCODE_ISC_MSG(222, DYN_MSG_FAC)));
+			}
+
+			memcpy(info.specificAttributes.getBuffer(newSpecificAttributes.length()),
+				newSpecificAttributes.begin(), newSpecificAttributes.length());
+
+			if (info.specificAttributes.hasData())
+			{
+				X.RDB$SPECIFIC_ATTRIBUTES.NULL = FALSE;
+				attachment->storeMetaDataBlob(tdbb, transaction, &X.RDB$SPECIFIC_ATTRIBUTES,
+					string(info.specificAttributes.begin(), info.specificAttributes.getCount()),
+					forCharSetId);
+			}
+
+			info.attributes = (info.attributes | attributesOn) & (~attributesOff);
+			X.RDB$COLLATION_ATTRIBUTES = info.attributes;
+
+			// Do not allow invalid attributes here.
+			if (!INTL_texttype_validate(tdbb, &info))
+			{
+				// msg: 222: "Invalid collation attributes"
+				status_exception::raise(
+					Arg::Gds(isc_no_meta_update) <<
+					Arg::Gds(ENCODE_ISC_MSG(222, DYN_MSG_FAC)));
+			}
+
+			// ASF: User collations are created with the last number available,
+			// to minimize the possibility of conflicts with future system collations.
+			// The greater available number is 126 to avoid signed/unsigned problems.
+
+			X.RDB$COLLATION_ID.NULL = TRUE;
+			X.RDB$COLLATION_ID = 126;
+
+			AutoCacheRequest request2(tdbb, drq_l_max_coll_id, DYN_REQUESTS);
+
+			FOR(REQUEST_HANDLE request2)
+				Y IN RDB$COLLATIONS
+				WITH Y.RDB$CHARACTER_SET_ID = forCharSetId AND
+					 Y.RDB$COLLATION_ID NOT MISSING
+				SORTED BY DESCENDING Y.RDB$COLLATION_ID
+			{
+				if (Y.RDB$COLLATION_ID + 1 <= X.RDB$COLLATION_ID)
+				{
+					X.RDB$COLLATION_ID.NULL = FALSE;
+					break;
+				}
+				else
+					X.RDB$COLLATION_ID = Y.RDB$COLLATION_ID - 1;
+			}
+			END_FOR
+
+			if (X.RDB$COLLATION_ID.NULL)
+			{
+				status_exception::raise(
+					Arg::Gds(isc_no_meta_update) <<
+					Arg::Gds(isc_max_coll_per_charset));
+			}
+
+			endStore = true;
+		}
+		END_STORE
+	}
+	catch (const status_exception& ex)
+	{
+		// DEFINE COLLATION failed
+		rethrowMetaException(ex, ENCODE_ISC_MSG(219, DYN_MSG_FAC), endStore);
+	}
+
+	executeDdlTrigger(tdbb, transaction, DTW_AFTER, DDL_TRIGGER_CREATE_COLLATION, name);
+
+	savePoint.release();	// everything is ok
+
+	// Update DSQL cache
+	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
+	METD_drop_collation(transaction, str);
+	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, str->str_data);
+}
+
+DdlNode* CreateCollationNode::internalDsqlPass()
+{
+	const dsql_intlsym* resolvedCharSet = METD_get_charset(
+		dsqlScratch->getTransaction(), forCharSet.length(), forCharSet.c_str());
+
+	if (!resolvedCharSet)
+	{
+		// specified character set not found
+		ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-504) <<
+				  Arg::Gds(isc_charset_not_found) << forCharSet);
+	}
+
+	forCharSetId = resolvedCharSet->intlsym_charset_id;
+
+	if (fromName.hasData())
+	{
+		AutoPtr<dsql_str> str(MAKE_string(fromName.c_str(), fromName.length()));
+		const dsql_intlsym* resolvedCollation = METD_get_collation(
+			dsqlScratch->getTransaction(), str, forCharSetId);
+
+		if (!resolvedCollation)
+		{
+			// Specified collation not found
+			ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-204) <<
+					  Arg::Gds(isc_collation_not_found) << fromName << forCharSet);
+		}
+
+		fromCollationId = resolvedCollation->intlsym_collate_id;
+	}
+
+	return DdlNode::internalDsqlPass();
+}
+
+
+//----------------------
+
+
+void DropCollationNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const
+{
+	text.printf(
+		"DropCollationNode\n"
+		"  name: '%s'\n",
+		name.c_str());
+}
+
+void DropCollationNode::execute(thread_db* tdbb, jrd_tra* transaction)
+{
+	// run all statements under savepoint control
+	AutoSavePoint savePoint(tdbb, transaction);
+
+	bool found = false;
+	AutoCacheRequest request(tdbb, drq_e_colls, DYN_REQUESTS);
+
+	FOR (REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
+		COLL IN RDB$COLLATIONS
+		CROSS CS IN RDB$CHARACTER_SETS
+		WITH COLL.RDB$COLLATION_NAME EQ name.c_str() AND
+			 CS.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID
+	{
+		executeDdlTrigger(tdbb, transaction, DTW_BEFORE, DDL_TRIGGER_DROP_COLLATION, name);
+
+		if (!COLL.RDB$SYSTEM_FLAG.NULL && COLL.RDB$SYSTEM_FLAG)
+		{
+			status_exception::raise(Arg::Gds(isc_no_meta_update) <<
+				Arg::Gds(isc_dyn_cannot_del_syscoll));
+		}
+
+		if (COLL.RDB$COLLATION_ID == 0 ||
+			(!CS.RDB$DEFAULT_COLLATE_NAME.NULL &&
+				MetaName(COLL.RDB$COLLATION_NAME) == MetaName(CS.RDB$DEFAULT_COLLATE_NAME)))
+		{
+			fb_utils::exact_name_limit(CS.RDB$CHARACTER_SET_NAME,
+				sizeof(CS.RDB$CHARACTER_SET_NAME));
+
+			status_exception::raise(Arg::Gds(isc_no_meta_update) <<
+				Arg::Gds(isc_dyn_cannot_del_def_coll) << CS.RDB$CHARACTER_SET_NAME);
+		}
+
+		found = true;
+		fb_utils::exact_name_limit(COLL.RDB$COLLATION_NAME, sizeof(COLL.RDB$COLLATION_NAME));
+
+		AutoCacheRequest request2(tdbb, drq_l_rfld_coll, DYN_REQUESTS);
+
+		FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
+			RF IN RDB$RELATION_FIELDS CROSS F IN RDB$FIELDS
+			WITH RF.RDB$FIELD_SOURCE EQ F.RDB$FIELD_NAME AND
+				 F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
+				 RF.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
+		{
+			fb_utils::exact_name_limit(RF.RDB$RELATION_NAME, sizeof(RF.RDB$RELATION_NAME));
+			fb_utils::exact_name_limit(RF.RDB$FIELD_NAME, sizeof(RF.RDB$FIELD_NAME));
+
+			status_exception::raise(Arg::Gds(isc_no_meta_update) <<
+				Arg::Gds(isc_dyn_coll_used_table) << COLL.RDB$COLLATION_NAME <<
+				RF.RDB$RELATION_NAME << RF.RDB$FIELD_NAME);
+		}
+		END_FOR
+
+		request2.reset(tdbb, drq_l_prm_coll, DYN_REQUESTS);
+
+		FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
+			PRM IN RDB$PROCEDURE_PARAMETERS CROSS F IN RDB$FIELDS
+			WITH PRM.RDB$FIELD_SOURCE EQ F.RDB$FIELD_NAME AND
+				 F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
+				 PRM.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
+		{
+			fb_utils::exact_name_limit(PRM.RDB$PARAMETER_NAME, sizeof(PRM.RDB$PARAMETER_NAME));
+
+			status_exception::raise(Arg::Gds(isc_no_meta_update) <<
+				Arg::Gds(isc_dyn_coll_used_procedure) <<
+				COLL.RDB$COLLATION_NAME <<
+				QualifiedName(PRM.RDB$PROCEDURE_NAME,
+					(PRM.RDB$PACKAGE_NAME.NULL ? NULL : PRM.RDB$PACKAGE_NAME)).toString().c_str() <<
+				PRM.RDB$PARAMETER_NAME);
+		}
+		END_FOR
+
+		request2.reset(tdbb, drq_l_fld_coll, DYN_REQUESTS);
+
+		FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE transaction)
+			F IN RDB$FIELDS
+			WITH F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
+				 F.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
+		{
+			fb_utils::exact_name_limit(F.RDB$FIELD_NAME, sizeof(F.RDB$FIELD_NAME));
+
+			status_exception::raise(Arg::Gds(isc_no_meta_update) <<
+				Arg::Gds(isc_dyn_coll_used_domain) << COLL.RDB$COLLATION_NAME << F.RDB$FIELD_NAME);
+		}
+		END_FOR
+
+		ERASE COLL;
+	}
+	END_FOR
+
+	if (found)
+		executeDdlTrigger(tdbb, transaction, DTW_AFTER, DDL_TRIGGER_DROP_COLLATION, name);
+	else
+	{
+		status_exception::raise(
+			Arg::Gds(isc_no_meta_update) <<
+			Arg::Gds(isc_dyn_collation_not_found) << Arg::Str(name));
+	}
+
+	savePoint.release();	// everything is ok
+
+	// Update DSQL cache
+	AutoPtr<dsql_str> str(MAKE_string(name.c_str(), name.length()));
+	METD_drop_collation(transaction, str);
+	MET_dsql_cache_release(tdbb, SYM_intlsym_collation, str->str_data);
+}
+
+
+//----------------------
+
+
 void CreateSequenceNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const
 {
 	text.printf(

Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/DdlNodes.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -24,11 +24,14 @@
 #define DSQL_DDL_NODES_H
 
 #include "../jrd/common.h"
+#include "../jrd/dyn.h"
+#include "../jrd/msg_encode.h"
 #include "../dsql/node.h"
 #include "../dsql/make_proto.h"
 #include "../dsql/Nodes.h"
 #include "../common/classes/array.h"
 #include "../common/classes/TriState.h"
+#include "../dsql/errd_proto.h"
 
 namespace Jrd {
 
@@ -494,6 +497,91 @@
 };
 
 
+class CreateCollationNode : public DdlNode
+{
+public:
+	explicit CreateCollationNode(MemoryPool& p, const Firebird::string& sqlText,
+				const Firebird::MetaName& aName, const Firebird::MetaName& aForCharSet)
+		: DdlNode(p, sqlText),
+		  name(p, aName),
+		  forCharSet(p, aForCharSet),
+		  fromName(p),
+		  fromExternal(p),
+		  specificAttributes(p),
+		  attributesOn(0),
+		  attributesOff(0),
+		  forCharSetId(0),
+		  fromCollationId(0)
+	{
+	}
+
+public:
+	virtual void print(Firebird::string& text, Firebird::Array<dsql_nod*>& nodes) const;
+	virtual void execute(thread_db* tdbb, jrd_tra* transaction);
+
+	void setAttribute(USHORT attribute)
+	{
+		if ((attributesOn | attributesOff) & attribute)
+		{
+			// msg: 222: "Invalid collation attributes"
+			using namespace Firebird;
+			ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+				Arg::Gds(ENCODE_ISC_MSG(222, DYN_MSG_FAC)));
+		}
+
+		attributesOn |= attribute;
+	}
+
+	void unsetAttribute(USHORT attribute)
+	{
+		if ((attributesOn | attributesOff) & attribute)
+		{
+			// msg: 222: "Invalid collation attributes"
+			using namespace Firebird;
+			ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+				Arg::Gds(ENCODE_ISC_MSG(222, DYN_MSG_FAC)));
+		}
+
+		attributesOff |= attribute;
+	}
+
+protected:
+	virtual DdlNode* internalDsqlPass();
+
+public:
+	Firebird::MetaName name;
+	Firebird::MetaName forCharSet;
+	Firebird::MetaName fromName;
+	Firebird::string fromExternal;
+	Firebird::UCharBuffer specificAttributes;
+
+private:
+	USHORT attributesOn;
+	USHORT attributesOff;
+	USHORT forCharSetId;
+	USHORT fromCollationId;
+};
+
+
+class DropCollationNode : public DdlNode
+{
+public:
+	explicit DropCollationNode(MemoryPool& p, const Firebird::string& sqlText,
+				const Firebird::MetaName& aName)
+		: DdlNode(p, sqlText),
+		  name(p, aName)
+	{
+	}
+
+public:
+	virtual void print(Firebird::string& text, Firebird::Array<dsql_nod*>& nodes) const;
+	virtual void execute(thread_db* tdbb, jrd_tra* transaction);
+
+public:
+	Firebird::MetaName name;
+};
+
+
 class CreateSequenceNode : public DdlNode
 {
 public:

Modified: firebird/trunk/src/dsql/ddl.cpp
===================================================================
--- firebird/trunk/src/dsql/ddl.cpp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/ddl.cpp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -132,7 +132,6 @@
 static void define_field(DsqlCompilerScratch*, dsql_nod*, SSHORT, const dsql_str*, const dsql_nod* pkcols);
 static void define_filter(DsqlCompilerScratch*);
 static SSHORT getBlobFilterSubType(DsqlCompilerScratch* dsqlScratch, const dsql_nod* node);
-static void define_collation(DsqlCompilerScratch*);
 static void define_role(DsqlCompilerScratch*);
 static void define_index(DsqlCompilerScratch*);
 static void define_rel_constraint(DsqlCompilerScratch*, dsql_nod*);
@@ -148,7 +147,6 @@
 	const dsql_nod*, const char*, const char*);
 static void define_view(DsqlCompilerScratch*, NOD_TYPE);
 static void define_view_trigger(DsqlCompilerScratch*, dsql_nod*, dsql_nod*, dsql_nod*);
-static void delete_collation(DsqlCompilerScratch*);
 static void delete_exception(DsqlCompilerScratch*, dsql_nod*, bool);
 static void delete_relation_view(DsqlCompilerScratch*, dsql_nod*, bool);
 static const dsql_nod* find_pk_columns(const dsql_nod* def_rel_elements);
@@ -270,13 +268,6 @@
 			METD_drop_relation(request->getTransaction(), string);
 			break;
 
-		case nod_del_collation:
-			// for delete, get rid of the cached collation metadata
-			string = (dsql_str*) statement->getDdlNode()->nod_arg[e_del_coll_name];
-			sym_type = SYM_intlsym_collation;
-			METD_drop_collation(request->getTransaction(), string);
-			break;
-
 		case nod_del_udf:
 		case nod_mod_udf:
 			// Signal UDF for obsolescence
@@ -1918,105 +1909,6 @@
 }
 
 
-static void define_collation(DsqlCompilerScratch* dsqlScratch)
-{
-/**************************************
- *
- *	d e f i n e _ c o l l a t i o n
- *
- **************************************
- *
- * Function
- *	Create a collation.
- *
- **************************************/
-
-	DsqlCompiledStatement* statement = dsqlScratch->getStatement();
-
-	const dsql_nod* ddlNode = statement->getDdlNode();
-	const dsql_str* coll_name = (dsql_str*) ddlNode->nod_arg[e_def_coll_name];
-	const dsql_str* coll_for = (dsql_str*) ddlNode->nod_arg[e_def_coll_for];
-	const dsql_nod* coll_from = ddlNode->nod_arg[e_def_coll_from];
-	const dsql_nod* coll_attributes = ddlNode->nod_arg[e_def_coll_attributes];
-	const dsql_nod* coll_specific_attributes =
-		PASS1_node(dsqlScratch, ddlNode->nod_arg[e_def_coll_specific_attributes]);
-
-	const dsql_intlsym* resolved_charset =
-		METD_get_charset(dsqlScratch->getTransaction(), (USHORT) strlen(coll_for->str_data),
-			coll_for->str_data);
-
-	if (!resolved_charset)
-	{
-		// specified character set not found
-		ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-504) <<
-				  Arg::Gds(isc_charset_not_found) << Arg::Str(coll_for->str_data));
-	}
-
-	if (coll_specific_attributes)
-		coll_specific_attributes = coll_specific_attributes->nod_arg[0];
-
-	dsqlScratch->appendNullString(isc_dyn_def_collation, coll_name->str_data);
-	dsqlScratch->appendNumber(isc_dyn_coll_for_charset, resolved_charset->intlsym_charset_id);
-
-	if (coll_from)
-	{
-		const dsql_str* coll_name = reinterpret_cast<dsql_str*>(coll_from->nod_arg[0]);
-		if (coll_from->nod_type == nod_collation_from)
-		{
-			const dsql_intlsym* resolved_collation = METD_get_collation(
-				dsqlScratch->getTransaction(), coll_name, resolved_charset->intlsym_charset_id);
-
-			if (!resolved_collation)
-			{
-				// Specified collation not found
-				ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-204) <<
-						  Arg::Gds(isc_collation_not_found) << Arg::Str(coll_name->str_data) <<
-						  									   Arg::Str(resolved_charset->intlsym_name));
-			}
-
-			dsqlScratch->appendNumber(isc_dyn_coll_from,
-				INTL_CS_COLL_TO_TTYPE(resolved_collation->intlsym_charset_id,
-					resolved_collation->intlsym_collate_id));
-		}
-		else if (coll_from->nod_type == nod_collation_from_external)
-		{
-			dsqlScratch->appendNullString(isc_dyn_coll_from_external, coll_name->str_data);
-		}
-		else
-			fb_assert(false);
-	}
-
-	if (coll_attributes)
-	{
-		const dsql_nod* const* ptr = coll_attributes->nod_arg;
-		for (const dsql_nod* const* const end = ptr + coll_attributes->nod_count; ptr < end; ptr++)
-		{
-			const dsql_nod* attribute = *ptr;
-
-			switch (attribute->nod_type)
-			{
-				case nod_collation_attr:
-					dsqlScratch->appendNumber(isc_dyn_coll_attribute, (IPTR) attribute->nod_arg[0]);
-					break;
-
-				default:
-					break;
-			}
-		}
-	}
-
-	if (coll_specific_attributes)
-	{
-		dsqlScratch->appendNumber(isc_dyn_coll_specific_attributes_charset,
-			coll_specific_attributes->nod_desc.dsc_ttype());
-		dsqlScratch->appendNullString(isc_dyn_coll_specific_attributes,
-			((dsql_str*)coll_specific_attributes->nod_arg[0])->str_data);
-	}
-
-	dsqlScratch->appendUChar(isc_dyn_end);
-}
-
-
 static void define_index(DsqlCompilerScratch* dsqlScratch)
 {
 /**************************************
@@ -3258,26 +3150,6 @@
 }
 
 
-static void delete_collation(DsqlCompilerScratch* dsqlScratch)
-{
-/**************************************
- *
- *	d e l e t e _ c o l l a t i o n
- *
- **************************************
- *
- * Function
- *	Delete a collation.
- *
- **************************************/
-
-	DsqlCompiledStatement* statement = dsqlScratch->getStatement();
-	const dsql_str* coll_name = (dsql_str*) statement->getDdlNode()->nod_arg[e_del_coll_name];
-	dsqlScratch->appendNullString(isc_dyn_del_collation, coll_name->str_data);
-	dsqlScratch->appendUChar(isc_dyn_end);
-}
-
-
 static void delete_exception (DsqlCompilerScratch* dsqlScratch, dsql_nod* node, bool silent_deletion)
 {
 /**************************************
@@ -3673,14 +3545,6 @@
 		modify_map(dsqlScratch);
 		break;
 
-	case nod_def_collation:
-		define_collation(dsqlScratch);
-		break;
-
-	case nod_del_collation:
-		delete_collation(dsqlScratch);
-		break;
-
 	case nod_add_user:
 		define_user(dsqlScratch, isc_dyn_user_add);
 		break;

Modified: firebird/trunk/src/dsql/node.h
===================================================================
--- firebird/trunk/src/dsql/node.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/node.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -265,12 +265,6 @@
 	nod_redef_exception, // RECREATE EXCEPTION
 	nod_replace_exception, // CREATE OR ALTER EXCEPTION
 	nod_mod_udf,
-	nod_def_collation,
-	nod_del_collation,
-	nod_collation_from,
-	nod_collation_from_external,
-	nod_collation_attr,
-	nod_collation_specific_attr,
 	nod_strlen,
 	nod_trim,
 	nod_returning,
@@ -831,16 +825,6 @@
 	e_mod_udf_module,
 	e_mod_udf_count,
 
-	e_def_coll_name = 0,
-	e_def_coll_for,
-	e_def_coll_from,
-	e_def_coll_attributes,
-	e_def_coll_specific_attributes,
-	e_def_coll_count,
-
-	e_del_coll_name = 0,
-	e_del_coll_count,
-
 	e_strlen_type = 0,				// constant representing type of length
 	e_strlen_value,
 	e_strlen_count,

Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/parse.y	2010-06-26 01:52:06 UTC (rev 51288)
@@ -627,6 +627,7 @@
 	Jrd::ExprNode* exprNode;
 	Jrd::StmtNode* stmtNode;
 	Jrd::DdlNode* ddlNode;
+	Jrd::CreateCollationNode* createCollationNode;
 	Jrd::CreateAlterFunctionNode* createAlterFunctionNode;
 	Jrd::CreateAlterProcedureNode* createAlterProcedureNode;
 	Jrd::CreateAlterTriggerNode* createAlterTriggerNode;
@@ -659,10 +660,7 @@
 %type <legacyNode> case_abbreviation case_expression case_operand case_result case_specification
 %type <legacyNode> cast_specification char_length_expression character_keyword character_type
 %type <legacyNode> charset_clause check_constraint check_opt close_cursor col_opt collate_clause
-%type <legacyNode> collation_accent_attribute collation_attribute collation_attribute_list
-%type <legacyNode> collation_attribute_list_opt collation_case_attribute collation_clause
-%type <legacyNode> collation_pad_attribute collation_sequence_definition
-%type <legacyNode> collation_specific_attribute_opt column_constraint column_constraint_clause
+%type <legacyNode> column_constraint column_constraint_clause
 %type <legacyNode> column_constraint_def column_constraint_list column_def
 
 %type <legacyNode> column_list column_name column_parens column_parens_opt column_select
@@ -822,6 +820,16 @@
 %type <createAlterProcedureNode> alter_procedure_clause procedure_clause procedure_clause_start replace_procedure_clause
 %type <externalClause> external_clause
 
+%type <createCollationNode> collation_clause
+%type collation_sequence_definition(<createCollationNode>)
+%type collation_accent_attribute(<createCollationNode>)
+%type collation_attribute(<createCollationNode>)
+%type collation_attribute_list(<createCollationNode>)
+%type collation_attribute_list_opt(<createCollationNode>)
+%type collation_case_attribute(<createCollationNode>)
+%type collation_pad_attribute(<createCollationNode>)
+%type collation_specific_attribute_opt(<createCollationNode>)
+
 %type <triBoolVal> trigger_active
 %type <uint64Val> trigger_db_type trigger_ddl_type trigger_ddl_type_items trigger_type
 %type <uint64Val> trigger_type_prefix trigger_type_suffix
@@ -1213,7 +1221,7 @@
 		| ROLE role_clause
 			{ $$ = $2; }
 		| COLLATION collation_clause
-			{ $$ = $2; }
+			{ $$ = makeClassNode($2); }
 		| USER create_user_clause
 			{ $$ = $2; }
 		| PACKAGE package_clause
@@ -1426,62 +1434,71 @@
 
 // CREATE COLLATION
 
-collation_clause : symbol_collation_name FOR symbol_character_set_name
-		collation_sequence_definition
-		collation_attribute_list_opt collation_specific_attribute_opt
-			{ $$ = make_node (nod_def_collation,
-						(int) e_def_coll_count, $1, $3, $4, make_list($5), $6); }
-		;
+collation_clause
+	: symbol_collation_name FOR symbol_character_set_name
+			{
+				$<createCollationNode>$ = FB_NEW(getPool()) CreateCollationNode(
+					getPool(), compilingText, toName($1), toName($3));
+			}
+		collation_sequence_definition($4)
+		collation_attribute_list_opt($4) collation_specific_attribute_opt($4)
+			{ $$ = $4; }
+	;
 
-collation_sequence_definition :
-		FROM symbol_collation_name
-			{ $$ = make_node(nod_collation_from, 1, $2); }
-		| FROM EXTERNAL '(' sql_string ')'
-			{ $$ = make_node(nod_collation_from_external, 1, $4); }
-		|
-			{ $$ = NULL; }
-		;
+collation_sequence_definition($createCollation)
+	:
+	| FROM symbol_collation_name
+		{ $createCollation->fromName = toName($2); }
+	| FROM EXTERNAL '(' sql_string ')'
+		{ $createCollation->fromExternal = toString($4); }
+	;
 
-collation_attribute_list_opt :
-			{ $$ = NULL; }
-		| collation_attribute_list
-		;
+collation_attribute_list_opt($createCollation)
+	:
+	| collation_attribute_list($createCollation)
+	;
 
-collation_attribute_list : collation_attribute
-		| collation_attribute_list collation_attribute
-			{ $$ = make_node(nod_list, 2, $1, $2); }
-		;
+collation_attribute_list($createCollation)
+	: collation_attribute($createCollation)
+	| collation_attribute_list collation_attribute($createCollation)
+	;
 
-collation_attribute :
-		  collation_pad_attribute
-		| collation_case_attribute
-		| collation_accent_attribute
-		;
+collation_attribute($createCollation)
+	: collation_pad_attribute($createCollation)
+	| collation_case_attribute($createCollation)
+	| collation_accent_attribute($createCollation)
+	;
 
-collation_pad_attribute : NO PAD
-			{ $$ = make_node(nod_collation_attr, 1, -TEXTTYPE_ATTR_PAD_SPACE); }
-		| PAD SPACE
-			{ $$ = make_node(nod_collation_attr, 1, TEXTTYPE_ATTR_PAD_SPACE); }
-		;
+collation_pad_attribute($createCollation)
+	: NO PAD
+		{ $createCollation->unsetAttribute(TEXTTYPE_ATTR_PAD_SPACE); }
+	| PAD SPACE
+		{ $createCollation->setAttribute(TEXTTYPE_ATTR_PAD_SPACE); }
+	;
 
-collation_case_attribute : CASE SENSITIVE
-			{ $$ = make_node(nod_collation_attr, 1, -TEXTTYPE_ATTR_CASE_INSENSITIVE); }
-		| CASE INSENSITIVE
-			{ $$ = make_node(nod_collation_attr, 1, TEXTTYPE_ATTR_CASE_INSENSITIVE); }
-		;
+collation_case_attribute($createCollation)
+	: CASE SENSITIVE
+		{ $createCollation->unsetAttribute(TEXTTYPE_ATTR_CASE_INSENSITIVE); }
+	| CASE INSENSITIVE
+		{ $createCollation->setAttribute(TEXTTYPE_ATTR_CASE_INSENSITIVE); }
+	;
 
-collation_accent_attribute : ACCENT SENSITIVE
-			{ $$ = make_node(nod_collation_attr, 1, -TEXTTYPE_ATTR_ACCENT_INSENSITIVE); }
-		| ACCENT INSENSITIVE
-			{ $$ = make_node(nod_collation_attr, 1, TEXTTYPE_ATTR_ACCENT_INSENSITIVE); }
-		;
+collation_accent_attribute($createCollation)
+	: ACCENT SENSITIVE
+		{ $createCollation->unsetAttribute(TEXTTYPE_ATTR_ACCENT_INSENSITIVE); }
+	| ACCENT INSENSITIVE
+		{ $createCollation->setAttribute(TEXTTYPE_ATTR_ACCENT_INSENSITIVE); }
+	;
 
-collation_specific_attribute_opt :
-			{ $$ = NULL; }
-		| sql_string
-			{ $$ = make_node(nod_collation_specific_attr, 1,
-				MAKE_constant((dsql_str*)$1, CONSTANT_STRING)); }
-		;
+collation_specific_attribute_opt($createCollation)
+	:
+	| sql_string
+		{
+			string s(toString($1));
+			$createCollation->specificAttributes.clear();
+			$createCollation->specificAttributes.add((const UCHAR*) s.begin(), s.length());
+		}
+	;
 
 // ALTER CHARACTER SET
 
@@ -3361,7 +3378,7 @@
 		| SEQUENCE symbol_generator_name
 			{ $$ = make_node (nod_del_generator, (int) 1, $2); }
 		| COLLATION symbol_collation_name
-			{ $$ = make_node (nod_del_collation, (int) 1, $2); }
+			{ $$ = makeClassNode(FB_NEW(getPool()) DropCollationNode(getPool(), compilingText, toName($2))); }
 		| USER drop_user_clause
 			{ $$ = $2; }
 		| PACKAGE symbol_package_name

Modified: firebird/trunk/src/dsql/pass1.cpp
===================================================================
--- firebird/trunk/src/dsql/pass1.cpp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/dsql/pass1.cpp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -1929,8 +1929,6 @@
 	case nod_add_user:
 	case nod_mod_user:
 	case nod_del_user:
-	case nod_def_collation:
-	case nod_del_collation:
 		dsqlScratch->getStatement()->setType(DsqlCompiledStatement::TYPE_DDL);
 		return input;
 
@@ -10696,30 +10694,6 @@
 		verb = "mod_udf";
 		break;
 
-	case nod_def_collation:
-		verb = "def_collation";
-		break;
-
-	case nod_del_collation:
-		verb = "del_collation";
-		break;
-
-	case nod_collation_from:
-		verb = "collation_from";
-		break;
-
-	case nod_collation_from_external:
-		verb = "collation_from_external";
-		break;
-
-	case nod_collation_attr:
-		verb = "collation_attr";
-		break;
-
-	case nod_collation_specific_attr:
-		verb = "collation_specific_attr";
-		break;
-
 	case nod_returning:
 		verb = "returning";
 		break;

Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/include/gen/codetext.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -815,7 +815,12 @@
 	{"max_coll_per_charset", 336068829},
 	{"invalid_coll_attr", 336068830},
 	{"dyn_wrong_gtt_scope", 336068840},
+	{"dyn_coll_used_table", 336068843},
+	{"dyn_coll_used_domain", 336068844},
+	{"dyn_cannot_del_syscoll", 336068845},
+	{"dyn_cannot_del_def_coll", 336068846},
 	{"dyn_table_not_found", 336068849},
+	{"dyn_coll_used_procedure", 336068851},
 	{"dyn_scale_too_big", 336068852},
 	{"dyn_precision_too_small", 336068853},
 	{"dyn_miss_priv_warning", 336068855},

Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/include/gen/iberror.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -849,7 +849,12 @@
 const ISC_STATUS isc_max_coll_per_charset             = 336068829L;
 const ISC_STATUS isc_invalid_coll_attr                = 336068830L;
 const ISC_STATUS isc_dyn_wrong_gtt_scope              = 336068840L;
+const ISC_STATUS isc_dyn_coll_used_table              = 336068843L;
+const ISC_STATUS isc_dyn_coll_used_domain             = 336068844L;
+const ISC_STATUS isc_dyn_cannot_del_syscoll           = 336068845L;
+const ISC_STATUS isc_dyn_cannot_del_def_coll          = 336068846L;
 const ISC_STATUS isc_dyn_table_not_found              = 336068849L;
+const ISC_STATUS isc_dyn_coll_used_procedure          = 336068851L;
 const ISC_STATUS isc_dyn_scale_too_big                = 336068852L;
 const ISC_STATUS isc_dyn_precision_too_small          = 336068853L;
 const ISC_STATUS isc_dyn_miss_priv_warning            = 336068855L;
@@ -1123,7 +1128,7 @@
 const ISC_STATUS isc_trace_switch_param_miss          = 337182758L;
 const ISC_STATUS isc_trace_param_act_notcompat        = 337182759L;
 const ISC_STATUS isc_trace_mandatory_switch_miss      = 337182760L;
-const ISC_STATUS isc_err_max                          = 1067;
+const ISC_STATUS isc_err_max                          = 1072;
 
 #else /* c definitions */
 
@@ -1942,7 +1947,12 @@
 #define isc_max_coll_per_charset             336068829L
 #define isc_invalid_coll_attr                336068830L
 #define isc_dyn_wrong_gtt_scope              336068840L
+#define isc_dyn_coll_used_table              336068843L
+#define isc_dyn_coll_used_domain             336068844L
+#define isc_dyn_cannot_del_syscoll           336068845L
+#define isc_dyn_cannot_del_def_coll          336068846L
 #define isc_dyn_table_not_found              336068849L
+#define isc_dyn_coll_used_procedure          336068851L
 #define isc_dyn_scale_too_big                336068852L
 #define isc_dyn_precision_too_small          336068853L
 #define isc_dyn_miss_priv_warning            336068855L
@@ -2216,7 +2226,7 @@
 #define isc_trace_switch_param_miss          337182758L
 #define isc_trace_param_act_notcompat        337182759L
 #define isc_trace_mandatory_switch_miss      337182760L
-#define isc_err_max                          1067
+#define isc_err_max                          1072
 
 #endif
 

Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/include/gen/msgs.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -818,7 +818,12 @@
 	{336068829, "Maximum number of collations per character set exceeded"},		/* max_coll_per_charset */
 	{336068830, "Invalid collation attributes"},		/* invalid_coll_attr */
 	{336068840, "@1 cannot reference @2"},		/* dyn_wrong_gtt_scope */
+	{336068843, "Collation @1 is used in table @2 (field name @3) and cannot be dropped"},		/* dyn_coll_used_table */
+	{336068844, "Collation @1 is used in domain @2 and cannot be dropped"},		/* dyn_coll_used_domain */
+	{336068845, "Cannot delete system collation"},		/* dyn_cannot_del_syscoll */
+	{336068846, "Cannot delete default collation of CHARACTER SET @1"},		/* dyn_cannot_del_def_coll */
 	{336068849, "Table @1 not found"},		/* dyn_table_not_found */
+	{336068851, "Collation @1 is used in procedure @2 (parameter name @3) and cannot be dropped"},		/* dyn_coll_used_procedure */
 	{336068852, "New scale specified for column @1 must be at most @2."},		/* dyn_scale_too_big */
 	{336068853, "New precision specified for column @1 must be at least @2."},		/* dyn_precision_too_small */
 	{336068855, "Warning: @1 on @2 is not granted to @3."},		/* dyn_miss_priv_warning */

Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/include/gen/sql_code.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -814,7 +814,12 @@
 	{336068829, -829}, /* 221 max_coll_per_charset */
 	{336068830, -829}, /* 222 invalid_coll_attr */
 	{336068840, -901}, /* 232 dyn_wrong_gtt_scope */
+	{336068843, -901}, /* 235 dyn_coll_used_table */
+	{336068844, -901}, /* 236 dyn_coll_used_domain */
+	{336068845, -607}, /* 237 dyn_cannot_del_syscoll */
+	{336068846, -901}, /* 238 dyn_cannot_del_def_coll */
 	{336068849, -901}, /* 241 dyn_table_not_found */
+	{336068851, -901}, /* 243 dyn_coll_used_procedure */
 	{336068852, -829}, /* 244 dyn_scale_too_big */
 	{336068853, -829}, /* 245 dyn_precision_too_small */
 	{336068855,  106}, /* 247 dyn_miss_priv_warning */

Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/include/gen/sql_state.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -814,7 +814,12 @@
 	{336068829, "2C000"}, // 221 max_coll_per_charset
 	{336068830, "HY000"}, // 222 invalid_coll_attr
 	{336068840, "HY000"}, // 232 dyn_wrong_gtt_scope
+	{336068843, "HY000"}, // 235 dyn_coll_used_table
+	{336068844, "HY000"}, // 236 dyn_coll_used_domain
+	{336068845, "HY000"}, // 237 dyn_cannot_del_syscoll
+	{336068846, "HY000"}, // 238 dyn_cannot_del_def_coll
 	{336068849, "42000"}, // 241 dyn_table_not_found
+	{336068851, "HY000"}, // 243 dyn_coll_used_procedure
 	{336068852, "42000"}, // 244 dyn_scale_too_big
 	{336068853, "42000"}, // 245 dyn_precision_too_small
 	{336068855, "42000"}, // 247 dyn_miss_priv_warning

Modified: firebird/trunk/src/jrd/Attachment.cpp
===================================================================
--- firebird/trunk/src/jrd/Attachment.cpp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/Attachment.cpp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -264,10 +264,10 @@
 
 // We store in CS_METADATA.
 void Jrd::Attachment::storeMetaDataBlob(thread_db* tdbb, jrd_tra* transaction,
-	bid* blobId, const string& text)
+	bid* blobId, const string& text, USHORT fromCharSet)
 {
 	UCharBuffer bpb;
-	BLB_gen_bpb(isc_blob_text, isc_blob_text, att_charset, CS_METADATA, bpb);
+	BLB_gen_bpb(isc_blob_text, isc_blob_text, fromCharSet, CS_METADATA, bpb);
 
 	blb* blob = BLB_create2(tdbb, transaction, blobId, bpb.getCount(), bpb.begin());
 	try

Modified: firebird/trunk/src/jrd/Attachment.h
===================================================================
--- firebird/trunk/src/jrd/Attachment.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/Attachment.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -195,7 +195,13 @@
 	Firebird::string stringToUserCharSet(thread_db* tdbb, const Firebird::string& str);
 
 	void storeMetaDataBlob(thread_db* tdbb, jrd_tra* transaction, bid* blobId,
-		const Firebird::string& text);
+		const Firebird::string& text)
+	{
+		storeMetaDataBlob(tdbb, transaction, blobId, text, att_charset);
+	}
+
+	void storeMetaDataBlob(thread_db* tdbb, jrd_tra* transaction,
+		bid* blobId, const Firebird::string& text, USHORT fromCharSet);
 	void storeBinaryBlob(thread_db* tdbb, jrd_tra* transaction, bid* blobId,
 		const UCHAR* data, unsigned length);
 

Modified: firebird/trunk/src/jrd/drq.h
===================================================================
--- firebird/trunk/src/jrd/drq.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/drq.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -160,7 +160,6 @@
 	drq_m_fun,				// modify udf
 	drq_m_view,				// modify view
 	drq_s_colls,			// store collations
-	drq_l_charset,			// lookup charset
 	drq_dom_is_array,		// lookup domain to see if it's an array
 	drq_l_rel_info,			// lookup name and flags of one master relation
 	drq_l_rel_info2,		// lookup names and flags of all master relations

Modified: firebird/trunk/src/jrd/dyn.epp
===================================================================
--- firebird/trunk/src/jrd/dyn.epp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn.epp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -378,14 +378,6 @@
 		DYN_modify_database(gbl, ptr);
 		break;
 
-	case isc_dyn_def_collation:
-		DYN_define_collation(gbl, ptr);
-		break;
-
-	case isc_dyn_del_collation:
-		DYN_delete_collation(gbl, ptr);
-		break;
-
 	case isc_dyn_def_rel:
 	case isc_dyn_def_view:
 		DYN_define_relation(gbl, ptr, verb == isc_dyn_def_view);

Modified: firebird/trunk/src/jrd/dyn.h
===================================================================
--- firebird/trunk/src/jrd/dyn.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -25,6 +25,10 @@
 #define JRD_DYN_H
 
 #include "../common/classes/MsgPrint.h"
+#include "../common/classes/MetaName.h"
+#include "../common/classes/array.h"
+#include "../common/classes/fb_string.h"
+#include "../jrd/dsc.h"
 
 const char* const ALL_PRIVILEGES = "SIUDR";	// all applicable grant/revoke privileges
 const char* const ALL_PROC_PRIVILEGES = "X";	// all applicable grant/revoke privileges for a procedure
@@ -40,6 +44,7 @@
 
 struct bid;
 class jrd_tra;
+class thread_db;
 
 class Global
 {

Modified: firebird/trunk/src/jrd/dyn_def.epp
===================================================================
--- firebird/trunk/src/jrd/dyn_def.epp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn_def.epp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -108,287 +108,6 @@
 static void make_relation_scope_name(const TEXT*, const rel_t, Firebird::string&);
 
 
-void DYN_define_collation( Global* gbl, const UCHAR** ptr)
-{
-/**************************************
- *
- *	D Y N _ d e f i n e _ c o l l a t i o n
- *
- **************************************
- *
- * Functional description
- *	Define a collation.
- *
- **************************************/
-
-	thread_db* tdbb = JRD_get_thread_data();
-	Jrd::Attachment* attachment = tdbb->getAttachment();
-
-	MetaName collation_name;
-	MetaName charsetName;
-
-	GET_STRING(ptr, collation_name);
-
-	DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_BEFORE,
-		DDL_TRIGGER_CREATE_COLLATION, collation_name, gbl->sqlText);
-
-	AutoCacheRequest request(tdbb, drq_s_colls, DYN_REQUESTS);
-
-	bool b_ending_store = false;
-
-	try
-	{
-		STORE(REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
-			X IN RDB$COLLATIONS
-		{
-			CharSet* cs = NULL;
-			SubtypeInfo info;
-			USHORT attributes_on = 0;
-			USHORT attributes_off = 0;
-			SSHORT specific_attributes_charset = CS_NONE;
-			UCharBuffer specific_attributes;
-
-			X.RDB$SYSTEM_FLAG = 0;
-			X.RDB$SYSTEM_FLAG.NULL = FALSE;
-			X.RDB$SPECIFIC_ATTRIBUTES.NULL = TRUE;
-			X.RDB$BASE_COLLATION_NAME.NULL = TRUE;
-
-			while (**ptr != isc_dyn_end)
-			{
-				switch (*(*ptr)++)
-				{
-					case isc_dyn_coll_for_charset:
-					{
-						X.RDB$CHARACTER_SET_ID.NULL = FALSE;
-						X.RDB$CHARACTER_SET_ID = DYN_get_number(ptr);
-
-						cs = INTL_charset_lookup(tdbb, X.RDB$CHARACTER_SET_ID);
-
-						AutoCacheRequest request2(tdbb, drq_l_charset, DYN_REQUESTS);
-
-						FOR(REQUEST_HANDLE request2
-							TRANSACTION_HANDLE gbl->gbl_transaction)
-							CS IN RDB$CHARACTER_SETS
-							WITH CS.RDB$CHARACTER_SET_ID EQ X.RDB$CHARACTER_SET_ID
-						{
-							charsetName = CS.RDB$CHARACTER_SET_NAME;
-						}
-						END_FOR
-
-						break;
-					}
-
-					case isc_dyn_coll_from:
-						if (!MET_get_char_coll_subtype_info(tdbb, DYN_get_number(ptr), &info))
-							break;
-
-						fb_assert(cs);
-						if (cs)
-						{
-							if (info.specificAttributes.getCount() != 0)
-							{
-								UCharBuffer temp;
-								ULONG size = info.specificAttributes.getCount() * cs->maxBytesPerChar();
-
-								size = INTL_convert_bytes(tdbb, X.RDB$CHARACTER_SET_ID,
-														temp.getBuffer(size), size,
-														CS_METADATA, info.specificAttributes.begin(),
-														info.specificAttributes.getCount(), ERR_post);
-								temp.shrink(size);
-								info.specificAttributes = temp;
-							}
-						}
-
-						X.RDB$BASE_COLLATION_NAME.NULL = FALSE;
-						strcpy(X.RDB$BASE_COLLATION_NAME, info.baseCollationName.c_str());
-
-						break;
-
-					case isc_dyn_coll_from_external:
-						GET_STRING(ptr, X.RDB$BASE_COLLATION_NAME);
-						X.RDB$BASE_COLLATION_NAME.NULL = FALSE;
-						break;
-
-					case isc_dyn_coll_attribute:
-					{
-						const SSHORT attr = DYN_get_number(ptr);
-
-						if (attr >= 0)
-						{
-							attributes_on |= attr;
-							attributes_off &= ~attr;
-						}
-						else
-						{
-							attributes_on &= ~(-attr);
-							attributes_off |= -attr;
-						}
-
-						break;
-					}
-
-					// ASF: Our DDL strings is very weak.
-					// I've added isc_dyn_coll_specific_attributes_charset to pass the character set of a string.
-					// It may be the connection charset or some charset specified with INTRODUCER.
-					// Better approach is to pass DYN strings (including delimited identifiers) with the
-					// charset and reading it converting to CS_METADATA.
-					case isc_dyn_coll_specific_attributes_charset:
-						specific_attributes_charset = DYN_get_number(ptr);
-						break;
-
-					case isc_dyn_coll_specific_attributes:
-						GET_STRING(ptr, specific_attributes);
-
-						fb_assert(cs);
-						if (cs)
-						{
-							if (specific_attributes.getCount() != 0)
-							{
-								UCharBuffer temp;
-								ULONG size = specific_attributes.getCount() * cs->maxBytesPerChar();
-
-								size = INTL_convert_bytes(tdbb, X.RDB$CHARACTER_SET_ID,
-														temp.getBuffer(size), size,
-														specific_attributes_charset, specific_attributes.begin(),
-														specific_attributes.getCount(), ERR_post);
-								temp.shrink(size);
-								specific_attributes = temp;
-							}
-						}
-
-						break;
-
-					default:
-						DYN_unsupported_verb();
-				}
-			}
-
-			strcpy(X.RDB$COLLATION_NAME, collation_name.c_str());
-
-			info.charsetName = charsetName.c_str();
-			info.collationName = X.RDB$COLLATION_NAME;
-			if (X.RDB$BASE_COLLATION_NAME.NULL)
-				info.baseCollationName = info.collationName;
-			else
-				info.baseCollationName = X.RDB$BASE_COLLATION_NAME;
-			info.ignoreAttributes = false;
-
-			if (!IntlManager::collationInstalled(info.baseCollationName.c_str(),
-					info.charsetName.c_str()))
-			{
-				DYN_error_punt(false, 223,
-					SafeArg() << info.baseCollationName.c_str() << info.charsetName.c_str());
-				// msg: 223: "Collation @1 not installed for character set @2"
-			}
-
-			fb_assert(cs);
-			if (cs)
-			{
-				IntlUtil::SpecificAttributesMap map;
-
-				if (!IntlUtil::parseSpecificAttributes(
-						cs, info.specificAttributes.getCount(), info.specificAttributes.begin(), &map) ||
-					!IntlUtil::parseSpecificAttributes(
-						cs, specific_attributes.getCount(), specific_attributes.begin(), &map))
-				{
-					DYN_error_punt(false, 222);
-					// msg: 222: "Invalid collation attributes"
-				}
-
-				const string s = IntlUtil::generateSpecificAttributes(cs, map);
-				string newSpecificAttributes;
-
-				if (!IntlManager::setupCollationAttributes(
-						info.baseCollationName.c_str(), info.charsetName.c_str(), s,
-						newSpecificAttributes))
-				{
-					DYN_error_punt(false, 222);
-					// msg: 222: "Invalid collation attributes"
-				}
-
-				memcpy(info.specificAttributes.getBuffer(newSpecificAttributes.length()),
-					newSpecificAttributes.begin(), newSpecificAttributes.length());
-			}
-
-			info.attributes = (info.attributes | attributes_on) & (~attributes_off);
-			X.RDB$COLLATION_ATTRIBUTES = info.attributes;
-
-			if (info.specificAttributes.getCount() != 0)
-			{
-				X.RDB$SPECIFIC_ATTRIBUTES.NULL = FALSE;
-
-				UCHAR bpb[] = {isc_bpb_version1,
-							   isc_bpb_source_type, 1, isc_blob_text, isc_bpb_source_interp, 1, 0,
-							   isc_bpb_target_type, 1, isc_blob_text, isc_bpb_target_interp, 1, 0};
-
-				bpb[6] = X.RDB$CHARACTER_SET_ID;	// from charset
-				bpb[12] = CS_METADATA;				// to charset
-
-				blb* blob = BLB_create2(tdbb, gbl->gbl_transaction, &X.RDB$SPECIFIC_ATTRIBUTES,
-										sizeof(bpb), bpb);
-				BLB_put_segment(tdbb, blob, info.specificAttributes.begin(),
-								info.specificAttributes.getCount());
-				BLB_close(tdbb, blob);
-			}
-
-			// Do not allow invalid attributes here.
-			if (!INTL_texttype_validate(tdbb, &info))
-			{
-				DYN_error_punt(false, 222);
-				// msg: 222: "Invalid collation attributes"
-			}
-
-			// ASF: User collations are created with the last number available,
-			// to minimize the possibility of conflicts with future system collations.
-			// The greater available number is 126 to avoid signed/unsigned problems.
-
-			X.RDB$COLLATION_ID.NULL = TRUE;
-			X.RDB$COLLATION_ID = 126;
-
-			AutoCacheRequest request2(tdbb, drq_l_max_coll_id, DYN_REQUESTS);
-
-			FOR(REQUEST_HANDLE request2)
-				Y IN RDB$COLLATIONS
-				WITH Y.RDB$CHARACTER_SET_ID = X.RDB$CHARACTER_SET_ID AND
-					 Y.RDB$COLLATION_ID NOT MISSING
-				SORTED BY DESCENDING Y.RDB$COLLATION_ID
-			{
-				if (Y.RDB$COLLATION_ID + 1 <= X.RDB$COLLATION_ID)
-				{
-					X.RDB$COLLATION_ID.NULL = FALSE;
-					break;
-				}
-				else
-					X.RDB$COLLATION_ID = Y.RDB$COLLATION_ID - 1;
-			}
-			END_FOR
-
-			if (X.RDB$COLLATION_ID.NULL)
-			{
-				ERR_post(Arg::Gds(isc_no_meta_update) <<
-						 Arg::Gds(isc_max_coll_per_charset));
-			}
-
-			b_ending_store = true;
-		}
-		END_STORE
-	}
-	catch (const Exception& ex)
-	{
-		Firebird::stuff_exception(tdbb->tdbb_status_vector, ex);
-		if (b_ending_store)
-		{
-			DYN_error_punt(true, 219);
-			// msg 219: "DEFINE COLLATION failed"
-		}
-		throw;
-	}
-
-	DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_AFTER,
-		DDL_TRIGGER_CREATE_COLLATION, collation_name, gbl->sqlText);
-}
-
-
 void DYN_define_constraint(Global*		gbl,
 						   const UCHAR**	ptr,
 						   const Firebird::MetaName*	relation_name,

Modified: firebird/trunk/src/jrd/dyn_del.epp
===================================================================
--- firebird/trunk/src/jrd/dyn_del.epp	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn_del.epp	2010-06-26 01:52:06 UTC (rev 51288)
@@ -79,134 +79,6 @@
 static bool delete_index_segment_records(Global*, const Firebird::MetaName&);
 
 
-void DYN_delete_collation(Global* gbl, const UCHAR** ptr)
-{
-/**************************************
- *
- *	D Y N _ d e l e t e _ c o l l a t i o n
- *
- **************************************
- *
- * Functional description
- *	Execute a dynamic ddl statement that
- *	deletes a collation from rdb$collations.
- *
- **************************************/
-	thread_db* tdbb = JRD_get_thread_data();
-
-	bool found = false;
-	Firebird::MetaName collName;
-
-	try
-	{
-        GET_STRING(ptr, collName);
-
-        AutoCacheRequest request(tdbb, drq_e_colls, DYN_REQUESTS);
-
-        FOR (REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
-            COLL IN RDB$COLLATIONS
-            CROSS CS IN RDB$CHARACTER_SETS
-            WITH COLL.RDB$COLLATION_NAME EQ collName.c_str() AND
-				 CS.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID
-		{
-			DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_BEFORE,
-				DDL_TRIGGER_DROP_COLLATION, collName, gbl->sqlText);
-
-			if (COLL.RDB$SYSTEM_FLAG == 1)
-			{
-				DYN_error_punt(false, 237);
-				// msg 237: "Cannot delete system collation"
-			}
-
-			if (COLL.RDB$COLLATION_ID == 0 ||
-				(!CS.RDB$DEFAULT_COLLATE_NAME.NULL &&
-					Firebird::MetaName(COLL.RDB$COLLATION_NAME) == Firebird::MetaName(CS.RDB$DEFAULT_COLLATE_NAME)))
-			{
-				fb_utils::exact_name_limit(CS.RDB$CHARACTER_SET_NAME,
-					sizeof(CS.RDB$CHARACTER_SET_NAME));
-
-				DYN_error_punt(false, 238, CS.RDB$CHARACTER_SET_NAME);
-				// msg 238: "Cannot delete default collation of CHARACTER SET %s"
-			}
-
-		    found = true;
-			fb_utils::exact_name_limit(COLL.RDB$COLLATION_NAME,
-				sizeof(COLL.RDB$COLLATION_NAME));
-
-	        AutoCacheRequest request2(tdbb, drq_l_rfld_coll, DYN_REQUESTS);
-
-			FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE gbl->gbl_transaction)
-				RF IN RDB$RELATION_FIELDS CROSS F IN RDB$FIELDS
-				WITH RF.RDB$FIELD_SOURCE EQ F.RDB$FIELD_NAME AND
-					 F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
-					 RF.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
-			{
-				fb_utils::exact_name_limit(RF.RDB$RELATION_NAME, sizeof(RF.RDB$RELATION_NAME));
-				fb_utils::exact_name_limit(RF.RDB$FIELD_NAME, sizeof(RF.RDB$FIELD_NAME));
-
-				DYN_error_punt(false, 235, SafeArg() << COLL.RDB$COLLATION_NAME <<
-								RF.RDB$RELATION_NAME << RF.RDB$FIELD_NAME);
-				// msg 235: "Collation %s is used in table %s (field name %s) and cannot be dropped"
-			}
-			END_FOR
-
-	        request2.reset(tdbb, drq_l_prm_coll, DYN_REQUESTS);
-
-			FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE gbl->gbl_transaction)
-				PRM IN RDB$PROCEDURE_PARAMETERS CROSS F IN RDB$FIELDS
-				WITH PRM.RDB$FIELD_SOURCE EQ F.RDB$FIELD_NAME AND
-					 F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
-					 PRM.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
-			{
-				fb_utils::exact_name_limit(PRM.RDB$PARAMETER_NAME, sizeof(PRM.RDB$PARAMETER_NAME));
-
-				DYN_error_punt(false, 243, SafeArg() <<
-					COLL.RDB$COLLATION_NAME <<
-					QualifiedName(PRM.RDB$PROCEDURE_NAME,
-						(PRM.RDB$PACKAGE_NAME.NULL ? NULL : PRM.RDB$PACKAGE_NAME)).toString().c_str() <<
-					PRM.RDB$PARAMETER_NAME);
-				// msg 243: "Collation %s is used in procedure %s (parameter name %s) and cannot be dropped"
-			}
-			END_FOR
-
-	        request2.reset(tdbb, drq_l_fld_coll, DYN_REQUESTS);
-
-			FOR (REQUEST_HANDLE request2 TRANSACTION_HANDLE gbl->gbl_transaction)
-				F IN RDB$FIELDS
-				WITH F.RDB$CHARACTER_SET_ID EQ COLL.RDB$CHARACTER_SET_ID AND
-					 F.RDB$COLLATION_ID EQ COLL.RDB$COLLATION_ID
-			{
-				fb_utils::exact_name_limit(F.RDB$FIELD_NAME, sizeof(F.RDB$FIELD_NAME));
-
-				DYN_error_punt(false, 236, SafeArg() << COLL.RDB$COLLATION_NAME << F.RDB$FIELD_NAME);
-				// msg 236: "Collation %s is used in domain %s and cannot be dropped"
-			}
-			END_FOR
-
-			ERASE COLL;
-		}
-        END_FOR
-    }
-	catch (const Firebird::Exception& ex)
-	{
-		Firebird::stuff_exception(tdbb->tdbb_status_vector, ex);
-		DYN_error_punt(true, 233);
-		// msg 234: "ERASE RDB$COLLATIONS failed"
-    }
-
-	if (found)
-	{
-		DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_AFTER,
-			DDL_TRIGGER_DROP_COLLATION, collName, gbl->sqlText);
-	}
-	else
-	{
-		DYN_error_punt(false, 152, collName.c_str());
-	    // msg 152: "Collation %s not found"
-	}
-}
-
-
 void DYN_delete_constraint (Global* gbl, const UCHAR** ptr, const Firebird::MetaName* relation)
 {
 /**************************************

Modified: firebird/trunk/src/jrd/dyn_df_proto.h
===================================================================
--- firebird/trunk/src/jrd/dyn_df_proto.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn_df_proto.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -24,7 +24,6 @@
 #ifndef JRD_DYN_DF_PROTO_H
 #define JRD_DYN_DF_PROTO_H
 
-void DYN_define_collation(Jrd::Global*, const UCHAR**);
 void DYN_define_constraint(Jrd::Global*, const UCHAR**, const Firebird::MetaName*, Firebird::MetaName*);
 void DYN_define_dimension(Jrd::Global*, const UCHAR**, const Firebird::MetaName*, Firebird::MetaName*);
 void DYN_define_exception(Jrd::Global*, const UCHAR**);

Modified: firebird/trunk/src/jrd/dyn_dl_proto.h
===================================================================
--- firebird/trunk/src/jrd/dyn_dl_proto.h	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/jrd/dyn_dl_proto.h	2010-06-26 01:52:06 UTC (rev 51288)
@@ -24,7 +24,6 @@
 #ifndef JRD_DYN_DL_PROTO_H
 #define JRD_DYN_DL_PROTO_H
 
-void	DYN_delete_collation(Jrd::Global*, const UCHAR**);
 void	DYN_delete_constraint(Jrd::Global*, const UCHAR**, const Firebird::MetaName*);
 void	DYN_delete_dimensions(Jrd::Global*, const UCHAR**); //, const Firebird::MetaName*, Firebird::MetaName*);
 void	DYN_delete_exception(Jrd::Global*, const UCHAR**);

Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql	2010-06-26 01:24:31 UTC (rev 51287)
+++ firebird/trunk/src/msgs/messages2.sql	2010-06-26 01:52:06 UTC (rev 51288)
@@ -1798,15 +1798,15 @@
 ('dyn_wrong_gtt_scope', 'DYN_define_constraint', 'dyn_def.e', NULL, 8, 232, NULL, '@1 cannot reference @2', NULL, NULL);
 (NULL, 'dyn_mod.epp', 'DYN_modify_sql_field', NULL, 8, 233, NULL, 'Local column @1 is computed, cannot set a default value', NULL, NULL);
 ('del_coll_fail', 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 234, NULL, 'ERASE RDB$COLLATIONS failed', NULL, NULL);
-(NULL, NULL, 'dyn_del.epp', NULL, 8, 235, NULL, 'Collation @1 is used in table @2 (field name @3) and cannot be dropped', NULL, NULL);
-(NULL, NULL, 'dyn_del.epp', NULL, 8, 236, NULL, 'Collation @1 is used in domain @2 and cannot be dropped', NULL, NULL);
-(NULL, 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 237, NULL, 'Cannot delete system collation', NULL, NULL);
-(NULL, 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 238, NULL, 'Cannot delete default collation of CHARACTER SET @1', NULL, NULL);
+('dyn_coll_used_table', NULL, 'dyn_del.epp', NULL, 8, 235, NULL, 'Collation @1 is used in table @2 (field name @3) and cannot be dropped', NULL, NULL);
+('dyn_coll_used_domain', NULL, 'dyn_del.epp', NULL, 8, 236, NULL, 'Collation @1 is used in domain @2 and cannot be dropped', NULL, NULL);
+('dyn_cannot_del_syscoll', 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 237, NULL, 'Cannot delete system collation', NULL, NULL);
+('dyn_cannot_del_def_coll', 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 238, NULL, 'Cannot delete default collation of CHARACTER SET @1', NULL, NULL);
 (NULL, NULL, 'dyn_del.epp', NULL, 8, 239, NULL, 'Domain @1 is used in procedure @2 (parameter name @3) and cannot be dropped', NULL, NULL);
 (NULL, 'DYN_define_index', 'dyn_def.epp', NULL, 8, 240, NULL, 'Field @1 cannot be used twice in index @2', NULL, NULL);
 ('dyn_table_not_found', 'DYN_define_index', 'dyn_def.epp', NULL, 8, 241, NULL, 'Table @1 not found', NULL, NULL);
 (NULL, 'DYN_define_index', 'dyn_def.epp', NULL, 8, 242, NULL, 'attempt to reference a view (@1) in a foreign key', NULL, NULL);
-(NULL, 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 243, NULL, 'Collation @1 is used in procedure @2 (parameter name @3) and cannot be dropped', NULL, NULL);
+('dyn_coll_used_procedure', 'DYN_delete_collation', 'dyn_del.epp', NULL, 8, 243, NULL, 'Collation @1 is used in procedure @2 (parameter name @3) and cannot be dropped', NULL, NULL);
 -- Do not change the arguments of the previous DYN messages.
 -- Write the new DYN messages h...
 
[truncated message content]

[Firebird-checkins] CVS: firebird2/doc WhatsNew, 1.190.2.24, 1.190.2.25

From: Adriano d. S. F. <asf...@us...> - 2010-06-26 01:27:03

Build Version :  T3.0.0.28595 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28770 2010/06/26 01:26:53 asfernandes )

Update of /cvsroot/firebird/firebird2/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18071/doc

Modified Files:
      Tag: B2_5_Release
	WhatsNew 
Log Message:
Credits


Index: WhatsNew
===================================================================
RCS file: /cvsroot/firebird/firebird2/doc/WhatsNew,v
retrieving revision 1.190.2.24
retrieving revision 1.190.2.25
diff -b -U3 -r1.190.2.24 -r1.190.2.25
--- WhatsNew	25 Jun 2010 09:04:58 -0000	1.190.2.24
+++ WhatsNew	26 Jun 2010 01:26:51 -0000	1.190.2.25
@@ -90,6 +90,7 @@
     * Bugfix CORE-2985
         Altering COMPUTED columns doesn't handle dependencies well
       Contributor(s):
+        Nickolay Samofatov <skidder at users.sourceforge.net>
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
     * Bugfix CORE-2984

[Firebird-checkins] SF.net SVN: firebird:[51287] firebird/branches/B2_5_Release/doc/WhatsNew

From: <asf...@us...> - 2010-06-26 01:24:38

Revision: 51287
          http://firebird.svn.sourceforge.net/firebird/?rev=51287&view=rev
Author:   asfernandes
Date:     2010-06-26 01:24:31 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Credits

Modified Paths:
--------------
    firebird/branches/B2_5_Release/doc/WhatsNew

Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-26 01:18:53 UTC (rev 51286)
+++ firebird/branches/B2_5_Release/doc/WhatsNew	2010-06-26 01:24:31 UTC (rev 51287)
@@ -90,6 +90,7 @@
     * Bugfix CORE-2985
         Altering COMPUTED columns doesn't handle dependencies well
       Contributor(s):
+        Nickolay Samofatov <skidder at users.sourceforge.net>
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
     * Bugfix CORE-2984


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

[Firebird-checkins] SF.net SVN: firebird:[51286] firebird/trunk/src

From: <asf...@us...> - 2010-06-26 01:19:00

Revision: 51286
          http://firebird.svn.sourceforge.net/firebird/?rev=51286&view=rev
Author:   asfernandes
Date:     2010-06-26 01:18:53 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Misc

Modified Paths:
--------------
    firebird/trunk/src/jrd/event_proto.h
    firebird/trunk/src/jrd/isc_s_proto.h
    firebird/trunk/src/jrd/isc_sync.cpp
    firebird/trunk/src/jrd/trace/TraceConfigStorage.h
    firebird/trunk/src/lock/lock.cpp
    firebird/trunk/src/lock/lock_proto.h
    firebird/trunk/src/lock/print.cpp

Modified: firebird/trunk/src/jrd/event_proto.h
===================================================================
--- firebird/trunk/src/jrd/event_proto.h	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/jrd/event_proto.h	2010-06-26 01:18:53 UTC (rev 51286)
@@ -98,12 +98,14 @@
 		return 0;
 	}
 
-/*	static void init_shmem(void* arg, sh_mem* shmem, bool init)
+	/*
+	static void init_shmem(void* arg, sh_mem* shmem, bool init)
 	{
 		EventManager* const eventMgr = static_cast<EventManager*>(arg);
 		eventMgr->init_shmem(shmem, init);
 	}
-*/
+	*/
+
 	static void mutex_bugcheck(const TEXT*, int);
 	static void punt(const TEXT*);
 

Modified: firebird/trunk/src/jrd/isc_s_proto.h
===================================================================
--- firebird/trunk/src/jrd/isc_s_proto.h	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/jrd/isc_s_proto.h	2010-06-26 01:18:53 UTC (rev 51286)
@@ -113,12 +113,12 @@
 
 struct FAST_MUTEX_SHARED_SECTION
 {
-	SLONG   fInitialized;
-	SLONG   lSpinLock;
-	SLONG   lThreadsWaiting;
-	SLONG   lAvailable;
+	SLONG fInitialized;
+	SLONG lSpinLock;
+	SLONG lThreadsWaiting;
+	SLONG lAvailable;
 #ifdef _DEBUG
-	DWORD  dwThreadId;
+	DWORD dwThreadId;
 #endif
 };
 
@@ -126,7 +126,7 @@
 {
 	HANDLE hEvent;
 	HANDLE hFileMap;
-	SLONG  lSpinCount;
+	SLONG lSpinCount;
 	volatile FAST_MUTEX_SHARED_SECTION* lpSharedInfo;
 };
 
@@ -137,10 +137,10 @@
 
 struct event_t
 {
-	SLONG		event_pid;
-	SLONG		event_id;
-	SLONG		event_count;
-	void*		event_handle;
+	SLONG event_pid;
+	SLONG event_id;
+	SLONG event_count;
+	void* event_handle;
 };
 
 #endif // WIN_NT
@@ -182,7 +182,7 @@
 	USHORT mhb_version;
 #ifndef WIN_NT
 	struct mtx mhb_mutex;
-#endif		
+#endif
 };
 
 class SharedMemoryBase
@@ -232,7 +232,7 @@
 	enum MemoryTypes
 	{
 		SRAM_LOCK_MANAGER = 0xFF,		// To avoid mixing with old files no matter of endianness
-		SRAM_DATABASE_SNAPSHOT = 0xFE,	// use downcount for shared memeory types
+		SRAM_DATABASE_SNAPSHOT = 0xFE,	// use downcount for shared memory types
 		SRAM_EVENT_MANAGER = 0xFD,
 		SRAM_TRACE_CONFIG = 0xFC,
 		SRAM_TRACE_LOG = 0xFB
@@ -247,7 +247,9 @@
 {
 public:
 	SharedMemory()
-		: SharedMemoryBase(), sh_mem_header(NULL) { }
+		: SharedMemoryBase(), sh_mem_header(NULL)
+	{ }
+
 	~SharedMemory()
 	{
 		if (sh_mem_header)

Modified: firebird/trunk/src/jrd/isc_sync.cpp
===================================================================
--- firebird/trunk/src/jrd/isc_sync.cpp	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/jrd/isc_sync.cpp	2010-06-26 01:18:53 UTC (rev 51286)
@@ -1617,7 +1617,7 @@
 				"\tto terminate abnormally.", err_msg);
 		break;
 	case EXCEPTION_STACK_OVERFLOW:
-		Firebird::status_exception::raise(Firebird::Arg::Gds(isc_exception_stack_overflow));
+		status_exception::raise(Arg::Gds(isc_exception_stack_overflow));
 		// This will never be called, but to be safe it's here
 		result = (ULONG) EXCEPTION_CONTINUE_EXECUTION;
 		is_critical = false;
@@ -1693,7 +1693,7 @@
 
 #ifdef UNIX
 
-bool SharedMemoryBase::mapFile(Firebird::Arg::StatusVector& statusVector, 
+bool SharedMemoryBase::mapFile(Arg::StatusVector& statusVector,
 							   const TEXT* filename, ULONG length)
 {
 /**************************************
@@ -1926,7 +1926,7 @@
 
 
 #ifdef WIN_NT
-bool SharedMemoryBase::mapFile(Firebird::Arg::StatusVector& statusVector, 
+bool SharedMemoryBase::mapFile(Arg::StatusVector& statusVector,
 							   const TEXT* filename, ULONG length)
 {
 /**************************************
@@ -2337,8 +2337,8 @@
 
 #ifdef WIN_NT
 
-UCHAR* SharedMemoryBase::mapObject(Arg::StatusVector& statusVector, 
-								   ULONG object_offset, 
+UCHAR* SharedMemoryBase::mapObject(Arg::StatusVector& statusVector,
+								   ULONG object_offset,
 								   ULONG object_length)
 {
 /**************************************
@@ -2378,7 +2378,7 @@
 }
 
 
-void SharedMemoryBase::unmapObject(Arg::StatusVector& statusVector, 
+void SharedMemoryBase::unmapObject(Arg::StatusVector& statusVector,
 								   UCHAR** object_pointer, ULONG object_length)
 {
 /**************************************
@@ -3140,7 +3140,7 @@
 		return false;
 	}
 
-	munmap((char *) getHeader(), sh_mem_length_mapped);
+	munmap((char*) getHeader(), sh_mem_length_mapped);
 
 #ifdef USE_SYS5SEMAPHORE
 	SharedFile::remap(getHeader(), address, new_length);
@@ -3162,7 +3162,7 @@
 
 #ifdef WIN_NT
 #define ISC_REMAP_FILE_DEFINED
-bool SharedMemoryBase::remapFile(Arg::StatusVector& statusVector, 
+bool SharedMemoryBase::remapFile(Arg::StatusVector& statusVector,
 								 ULONG new_length, bool flag)
 {
 /**************************************
@@ -3263,7 +3263,7 @@
 
 
 #ifndef ISC_REMAP_FILE_DEFINED
-bool SharedMemoryBase::remapFile(Firebird::Arg::StatusVector& statusVector, ULONG, bool)
+bool SharedMemoryBase::remapFile(Arg::StatusVector& statusVector, ULONG, bool)
 {
 /**************************************
  *
@@ -3276,7 +3276,7 @@
  *
  **************************************/
 
-	statusVector << Arg::Gds(isc_unavailable) << 
+	statusVector << Arg::Gds(isc_unavailable) <<
 					Arg::Gds(isc_random) << "SharedMemory::remapFile";
 
 	return NULL;
@@ -3628,7 +3628,7 @@
 }
 
 SharedMemoryBase::SharedMemoryBase()
-  :	sh_mem_mutex(0), sh_mem_length_mapped(0), 
+  :	sh_mem_mutex(0), sh_mem_length_mapped(0),
 #ifdef WIN_NT
 	sh_mem_handle(0), sh_mem_object(0), sh_mem_interest(0), sh_mem_hdr_object(0),
 	sh_mem_hdr_address(0)
@@ -3643,7 +3643,7 @@
 {
 }
 
-void SharedMemoryBase::logError(const char* text, const Firebird::Arg::StatusVector& status)
+void SharedMemoryBase::logError(const char* text, const Arg::StatusVector& status)
 {
 	iscLogStatus(text, status.value());
 }

Modified: firebird/trunk/src/jrd/trace/TraceConfigStorage.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceConfigStorage.h	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/jrd/trace/TraceConfigStorage.h	2010-06-26 01:18:53 UTC (rev 51286)
@@ -41,7 +41,7 @@
 	volatile ULONG change_number;
 	volatile ULONG session_number;
 	ULONG cnt_uses;
-	char  cfg_file_name[MAXPATHLEN];
+	char cfg_file_name[MAXPATHLEN];
 };
 
 class ConfigStorage : public Firebird::GlobalStorage, public SharedMemory<TraceCSHeader>

Modified: firebird/trunk/src/lock/lock.cpp
===================================================================
--- firebird/trunk/src/lock/lock.cpp	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/lock/lock.cpp	2010-06-26 01:18:53 UTC (rev 51286)
@@ -1061,7 +1061,7 @@
 	ULONG spins = 0;
 	while (spins++ < m_acquireSpins)
 	{
-		if (mutexLockCond()) 
+		if (mutexLockCond())
 		{
 			status = FB_SUCCESS;
 			break;
@@ -1199,7 +1199,7 @@
 
 
 #ifdef USE_SHMEM_EXT
-bool LockManager::Extent::initialize(bool) 
+bool LockManager::Extent::initialize(bool)
 {
 	return false;
 }
@@ -2310,7 +2310,7 @@
 	}
 #endif
 
-	if (!initializeMemory) 
+	if (!initializeMemory)
 	{
 		return true;
 	}

Modified: firebird/trunk/src/lock/lock_proto.h
===================================================================
--- firebird/trunk/src/lock/lock_proto.h	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/lock/lock_proto.h	2010-06-26 01:18:53 UTC (rev 51286)
@@ -311,8 +311,8 @@
 
 class Database;
 
-class LockManager : public Firebird::RefCounted, 
-					public Firebird::GlobalStorage, 
+class LockManager : public Firebird::RefCounted,
+					public Firebird::GlobalStorage,
 					public SharedMemory<lhb>
 {
 	typedef Firebird::GenericMap<Firebird::Pair<Firebird::Left<Firebird::string, LockManager*> > > DbLockMgrMap;
@@ -446,30 +446,34 @@
 	public:
 		Extent() { }
 		Extent(Firebird::MemoryPool&) { }
-		Extent(const SharedMemoryBase& p) 
-		{ 
+
+		Extent(const SharedMemoryBase& p)
+		{
 			assign(p);
 		}
-		Extent(Firebird::MemoryPool&, const SharedMemoryBase& p) 
-		{ 
+
+		Extent(Firebird::MemoryPool&, const SharedMemoryBase& p)
+		{
 			assign(p);
 		}
-		Extent& operator=(const SharedMemoryBase& p)
-		{ 
-			assign(p);
-			return *this;
-		}
 
 		~Extent()
 		{
 			sh_mem_header = NULL;	// avoid unmapping in dtor
 		}
 
+		Extent& operator=(const SharedMemoryBase& p)
+		{
+			assign(p);
+			return *this;
+		}
+
 		void assign(const SharedMemoryBase& p);
 
 		bool initialize(bool init);
 		void mutexBug(int osErrorCode, const char* text);
 	};
+
 	Firebird::ObjectsArray<Extent> m_extents;
 
 	ULONG getTotalMapped() const

Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp	2010-06-25 12:16:28 UTC (rev 51285)
+++ firebird/trunk/src/lock/print.cpp	2010-06-26 01:18:53 UTC (rev 51286)
@@ -86,7 +86,8 @@
 	SRQ_PTR waitque_entry[30];
 };
 
-namespace {
+namespace
+{
 	class sh_mem : public Jrd::SharedMemory<lhb>
 	{
 	public:
@@ -94,7 +95,7 @@
 		  :	sh_mem_consistency(p_consistency)
 		{ }
 
-		bool initialize(bool) 
+		bool initialize(bool)
 		{
 			// Initialize a lock table to looking -- i.e. don't do nuthin.
 			return sh_mem_consistency;


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

[Firebird-checkins] CVS: firebird2 ChangeLog, 1.2008.2.119, 1.2008.2.120

From: Frank Schlottmann-G. <fs...@us...> - 2010-06-25 12:59:07

Build Version :  T3.0.0.28594 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28769 2010/06/25 12:58:53 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16564/firebird2

Modified Files:
      Tag: B2_5_Release
	ChangeLog 
Log Message:
nightly update B2_5_Release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.2008.2.119
retrieving revision 1.2008.2.120
diff -b -U3 -r1.2008.2.119 -r1.2008.2.120
--- ChangeLog	24 Jun 2010 12:56:31 -0000	1.2008.2.119
+++ ChangeLog	25 Jun 2010 12:58:48 -0000	1.2008.2.120
@@ -1,3 +1,10 @@
+2010-06-25 11:04  dimitr
+
+	* firebird2/: src/jrd/isc_version.h (1.10.2.18), doc/WhatsNew
+	(1.190.2.24):
+
+	Update.
+
 2010-06-23 15:28  hvlad
 
 	* firebird2/src/remote/server.cpp (1.264.2.3):

77 messages has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 7 > >> (Page 1 of 7)

S	M	T	W	T	F	S
		1 (2)	2 (3)	3 (1)	4 (4)	5 (19)
6 (11)	7 (6)	8 (11)	9 (9)	10 (10)	11 (3)	12 (12)
13 (9)	14 (6)	15 (11)	16 (7)	17 (16)	18 (10)	19 (5)
20 (7)	21 (4)	22 (5)	23 (9)	24 (5)	25 (10)	26 (14)
27 (4)	28 (6)	29 (5)	30 (9)