Fixes some warnings in System.Data.dll

diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/StringFunctions.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/StringFunctions.cs
index a0156e20e8a54942b1ae0d4742c81cd422f17e1b..8e7356eddb6ff8ae893fc40db43ede880c23985f 100644 (file)
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/StringFunctions.cs
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/StringFunctions.cs
@@ -94,7 +94,6 @@ namespace Mono.Data.SqlExpressions {
                override public object Eval (DataRow row)
                {
                        string str = (string)base.Eval (row);
-                       object x = start.Eval (row);
                        int istart = Convert.ToInt32 (start.Eval (row));
                        int ilen = Convert.ToInt32 (len.Eval (row));
                        

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
index 9c85ec9bdd31bfad19ae85e6e01bb9a52bd61882..70ead40da8209c50eed0fc083d69f5b4a0243b24 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
@@ -462,7 +462,6 @@ namespace System.Data.Odbc
                            (CommandText.ToUpper().IndexOf("INSERT")!=-1) ||
                            (CommandText.ToUpper().IndexOf("DELETE")!=-1)) {
                                int numrows = 0;
-                               OdbcReturn ret = libodbc.SQLRowCount (hstmt, ref numrows);
                                records = numrows;
                        } else
                                records = -1;

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index 9cc5e5c3740355471f8d44b95d7c1c433c10a456..dcda8e980b87af9e7348bfddbf16b95142ef66f9 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -834,7 +834,6 @@ namespace System.Data.Odbc
                                case OdbcType.Binary :
                                        bufsize = col.MaxLength;
                                        buffer = new byte [bufsize];
-                                       long read = GetBytes (i, 0, buffer, 0, bufsize);
                                        ret = OdbcReturn.Success;
                                        DataValue = buffer;
                                        break;

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
index 02d77d8d6b26d9ce34218e4511dc978a1490c1dd..301aa9a68a226fc122074a4efcdcd7a3c705f3f7 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -750,7 +750,6 @@ namespace System.Data.SqlClient
                {
                        TdsDataColumn column;
                        TdsColumnType ctype;
-                       string datatypeName;
                        int csize;
                        short precision;
                        short scale;
@@ -1277,11 +1276,6 @@ namespace System.Data.SqlClient
 #endif
                object GetSqlValue (int i)
                {
-                       int csize;
-                       short precision, scale;
-                       TdsColumnType ctype;
-                       TdsDataColumn column;
-
                        object value = GetValue (i);
                        //Console.WriteLine ("Type of value: {0}", value.GetType ());
                        

diff --git a/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs b/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
index 18b6595bd643c3565d32c4c8dad30a066fd1638a..3f7ff03d9a79bb11309c4ad5b582a6b60f223692 100644 (file)
--- a/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
+++ b/mcs/class/System.Data/System.Data/CustomDataClassGenerator.cs
@@ -1818,10 +1818,6 @@ namespace System.Data
                
                private CodeTypeDeclaration GenerateTableAdapterType (TableAdapterSchemaInfo taInfo)
                {
-                       string qualifiedBaseClassName;
-                       Type type = null;
-                       int fIndex = -1;
-                       
                        CodeTypeDeclaration t = new CodeTypeDeclaration ();
                        t.Name = opts.TableAdapterName (taInfo.Name);
                        t.BaseTypes.Add (TypeRef (taInfo.BaseClass));
@@ -2326,7 +2322,7 @@ namespace System.Data
                        CodeExpression expr1;
                        int idx = 0;
                        string tmp;
-                       DbType dbType = DbType.DateTime;
+
                        foreach (DbParameter param in cmd.Parameters) {
                                if (param.Direction != ParameterDirection.ReturnValue) {
                                        if (param.ParameterName[0] == '@')

diff --git a/mcs/class/System.Data/System.Data/DataRow.cs b/mcs/class/System.Data/System.Data/DataRow.cs
index 5511ef0582e817babdcaa5c5ed8a09d378500f57..db4ad0c29c9a7c613b58052fd4454093a948cbb2 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataRow.cs
+++ b/mcs/class/System.Data/System.Data/DataRow.cs
@@ -1257,7 +1257,6 @@ namespace System.Data {
                /// </summary>
                public bool IsNull (DataColumn column, DataRowVersion version)
                {
-                       object o = this [column, version];
                        return column.DataContainer.IsNull (IndexFromVersion (version));
                }
 

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index 3b0f0c4e9adb3e3fb239c90d66301bcd0176440c..9d6b56d68c5fcd268ec2c8f7e2352c9aa08ac45d 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1329,7 +1329,6 @@ namespace System.Data
 \r
                        SplitColumns (table, out atts, out elements, out simple);\r
                        //sort out the namespacing\r
-                       int relationCount = table.ParentRelations.Count;\r
 \r
                        foreach (DataRow row in rows) {\r
                                if (skipIfNested) {\r

diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
index 063f88595c6b24c31d8648d7188115494bead16f..551da284b5413d2794dd7fd6b281649234e9a0c8 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataTable.cs
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -77,7 +77,6 @@ namespace System.Data {
 \r
                private string _displayExpression;\r
                private PropertyCollection _extendedProperties;\r
-               private bool _hasErrors;\r
                private CultureInfo _locale;\r
                private int _minimumCapacity;\r
                private string _nameSpace;\r
@@ -88,12 +87,9 @@ namespace System.Data {
                private DataRowCollection _rows;\r
                private ISite _site;\r
                private string _tableName;\r
-               private bool _containsListCollection;\r
-               private string _encodedTableName;\r
                internal bool _duringDataLoad;\r
                internal bool _nullConstraintViolationDuringDataLoad;\r
                private bool dataSetPrevEnforceConstraints;\r
-               private bool dataTablePrevEnforceConstraints;\r
                private bool enforceConstraints = true;\r
                private DataRowBuilder _rowBuilder;\r
                private ArrayList _indexes;\r

diff --git a/mcs/class/System.Data/System.Data/UniqueConstraint.cs b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
index bf228fd1028a6a7ae585e109e25b9ee4c1faafad..4b7e43fc633beaedd4b663c7f8e4b43be1a96b37 100644 (file)
--- a/mcs/class/System.Data/System.Data/UniqueConstraint.cs
+++ b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
@@ -418,7 +418,6 @@ namespace System.Data {
                                Columns [0].Unique = false;
 
                        _belongsToCollection = false;
-                       Index index = Index;
                        Index = null;
                }
 

diff --git a/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs b/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
index 15fe9d0f4ae559716a13ac2e3b21a1974b491f35..9a1475e8765e0bdf74a78c34c49c63579d834260 100644 (file)
--- a/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
+++ b/mcs/class/System.Data/System.Data/XmlDataInferenceLoader.cs
@@ -392,12 +392,6 @@ namespace System.Data
                                        continue;\r
 \r
                                hasAttributes = true;\r
-                               DataColumn col = GetMappedColumn (table,\r
-                                       XmlHelper.Decode (attr.LocalName),\r
-                                       attr.Prefix,\r
-                                       attr.NamespaceURI,\r
-                                       MappingType.Attribute,\r
-                                       null);\r
                        }\r
 \r
                        foreach (XmlNode n in el.ChildNodes) {\r

diff --git a/mcs/class/System.Data/System.Data/XmlDataReader.cs b/mcs/class/System.Data/System.Data/XmlDataReader.cs
index 879d9c15e68df8de2e7dd30b73a64f2f3aff5a6c..db452d820c9fbd76146ef3514034850fa89a2d7d 100644 (file)
--- a/mcs/class/System.Data/System.Data/XmlDataReader.cs
+++ b/mcs/class/System.Data/System.Data/XmlDataReader.cs
@@ -314,12 +314,12 @@ namespace System.Data
                                                        reader.Skip ();\r
                                                }                                               \r
                                                row [col] = obj;\r
-                                       } catch (XmlException e) {\r
+                                       } catch (XmlException) {\r
 #endif\r
                                                // XML is not in accordance to expected standards, try reading the content as an xml doc\r
                                                row [col] = reader.ReadInnerXml ();\r
 #if NET_2_0\r
-                                       } catch (InvalidOperationException e) {\r
+                                       } catch (InvalidOperationException) {\r
 \r
                                                row [col] = reader.ReadInnerXml ();\r
                                        }\r

diff --git a/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs b/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
index 829cf135209372af899371227b222eb5ef9f2dfc..474616bf05997c96287f15de9dcd2a3930723c62 100644 (file)
--- a/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
+++ b/mcs/class/System.Data/System.Data/XmlSchemaDataImporter.cs
@@ -1361,8 +1361,6 @@ namespace System.Data
                
                private void ProcessDbSource (XmlElement el)
                {
-                       
-                       string cmdType;
                        string tmp = null;
                        XmlElement e;