2007-09-11 AMC <[email protected]>

	* OdbcDataReader.cs (GetPrimaryKeys): ODBC data reader can now
	properly handle "no-primary-keys" situation. Fixes bug # 82560.

2007-09-11  Nagappan A  <[email protected]>

	* OdbcConnectionStringBuilder.cs: Fixed Dsn DisplayName attribute.


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

mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,3 +1,12 @@
+2007-09-11  AMC  <[email protected]>
+
+	* OdbcDataReader.cs (GetPrimaryKeys): ODBC data reader can now
+	properly handle "no-primary-keys" situation. Fixes bug # 82560.
+
+2007-09-11  Nagappan A  <[email protected]>
+
+	* OdbcConnectionStringBuilder.cs: Fixed Dsn DisplayName attribute.
+
 2007-08-13  Nagappan A  <[email protected]>
 
 	* OdbcMetaDataColumnNames.cs: Added new class.

mcs/class/System.Data/System.Data.Odbc/OdbcConnectionStringBuilder.cs

@@ -133,7 +133,7 @@ namespace System.Data.Odbc
 			}
 		}
 
-		[DisplayNameAttribute ("Driver")]
+		[DisplayName ("Driver")]
 		[RefreshProperties (RefreshProperties.All)]
 		public string Driver { 
 			get {
@@ -157,7 +157,7 @@ namespace System.Data.Odbc
 			 }
 		}
 		
-		[DisplayNameAttribute ("Driver")]
+		[DisplayName ("Dsn")]
 		[RefreshProperties (RefreshProperties.All)]
 		public string Dsn { 
 			get { 

mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs

@@ -957,6 +957,8 @@ namespace System.Data.Odbc
 				} catch (OdbcException) {
 				}
                         }
+			if (keys == null)
+				return null;
 			keys.Sort ();
 			return (string []) keys.ToArray (typeof (string));
                 }