** Fixes #340451.

svn path=/trunk/mcs/; revision=97218

diff --git a/mcs/class/System.Data/System.Data.Odbc/ChangeLog b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
index defec561fa6ed6a1cc2d58336f109b1466037a09..9c9c36e693286e5c618307d1626a7230307fbf28 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-03  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       ** Fixes Bug#340451 - patch provided by Ernesto Carrea
+       <equistango@gmail.com>
+       * OdbcConnection.cs (GetInfo): Trim the value to actual length
+       returned by libodbc.
+       
 2008-03-03  Veerapuram Varadhan  <vvaradhan@novell.com>
 
        ** Fixes from BNC#332809 - patch provided by Ernesto Carrea

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
index d9c6be93603ced82ea31355c4aceb25d1cb21fcc..f03a3393551e1148d9a9a0bb721f0fafe41ca7a3 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
@@ -470,7 +470,7 @@ namespace System.Data.Odbc
                                                                        OdbcHandleType.Dbc,
                                                                        hdbc));
 
-                       return System.Text.Encoding.Default.GetString (buffer);
+                       return System.Text.Encoding.Default.GetString (buffer).Substring (0, actualLength);
                }
 
                private void RaiseStateChange (ConnectionState from, ConnectionState to)