Done DNET-192.

FirebirdSQL · Oct 20, 2008 · 8671a47 · 8671a47
1 parent 405b913
commit 8671a47
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/NETProvider/source/FirebirdSql/Data/Client/ExternalEngine/ExtDatabase.cs b/NETProvider/source/FirebirdSql/Data/Client/ExternalEngine/ExtDatabase.cs
@@ -275,7 +275,7 @@ public string GetServerVersion()
 		{
 			byte[] items = new byte[]
 			{
-				IscCodes.isc_info_isc_version,
+				IscCodes.isc_info_firebird_version,
 				IscCodes.isc_info_end
 			};
 

diff --git a/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsDatabase.cs b/NETProvider/source/FirebirdSql/Data/Client/Managed/Version10/GdsDatabase.cs
@@ -578,7 +578,7 @@ public virtual string GetServerVersion()
 		{
 			byte[] items = new byte[]
 			{
-				IscCodes.isc_info_isc_version,
+				IscCodes.isc_info_firebird_version,
 				IscCodes.isc_info_end
 			};
 

diff --git a/NETProvider/source/FirebirdSql/Data/Client/Native/FesDatabase.cs b/NETProvider/source/FirebirdSql/Data/Client/Native/FesDatabase.cs
@@ -355,7 +355,7 @@ public string GetServerVersion()
 		{
 			byte[] items = new byte[]
 			{
-				IscCodes.isc_info_isc_version,
+				IscCodes.isc_info_firebird_version,
 				IscCodes.isc_info_end
 			};
 

diff --git a/NETProvider/source/FirebirdSql/Data/Common/IscHelper.cs b/NETProvider/source/FirebirdSql/Data/Common/IscHelper.cs
@@ -126,6 +126,7 @@ public static ArrayList ParseDatabaseInfo(byte[] buffer)
                         break;
 
                     case IscCodes.isc_info_isc_version:
+                    case IscCodes.isc_info_firebird_version:
                         /* Version identification string of	the	database implementation:
                          *		• 1	byte containing	the	number 1
                          *		• 1	byte specifying	the	length,	n, of the following	string
@@ -245,10 +246,6 @@ public static ArrayList ParseDatabaseInfo(byte[] buffer)
                     // Misc
                     //
 
-                    case IscCodes.isc_info_firebird_version:
-                        info.Add(Encoding.Default.GetString(buffer, pos + 2, buffer[pos + 1]));
-                        break;
-
                     case IscCodes.isc_info_db_class:
                         int serverClass = VaxInteger(buffer, pos, length);
                         if (serverClass == IscCodes.isc_info_db_class_classic_access)