[Task] Add an extra check in Task.WaitAny to make sure the index returned is valid

[mono.git] / mcs / class / System.Data / System.Data.Common / SchemaTableColumn.cs

diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
index 218f4a9636a0376bafede24885f8a33fd4221e8e..20a842e58a9a01737e26820ca0d0bb9bd92aa524 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
+++ b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs
@@ -7,10 +7,33 @@
 // Copyright (C) Tim Coleman, 2003
 //
 
-#if NET_1_2
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
 
 namespace System.Data.Common {
-       public sealed class SchemaTableColumn 
+       public static class SchemaTableColumn 
        {
                #region Fields
                        public static readonly string AllowDBNull = "AllowDBNull";
@@ -26,6 +49,7 @@ namespace System.Data.Common {
                        public static readonly string IsKey = "IsKey";
                        public static readonly string IsLong = "IsLong";
                        public static readonly string IsUnique = "IsUnique";
+                       public static readonly string NonVersionedProviderType = "NonVersionedProviderType";
                        public static readonly string NumericPrecision = "NumericPrecision";
                        public static readonly string NumericScale = "NumericScale";
                        public static readonly string ProviderType = "ProviderType";
@@ -34,4 +58,4 @@ namespace System.Data.Common {
        }
 }
 
-#endif // NET_1_2
+#endif // NET_2_0