-----Original Message----- From: rbur...@mysql.com [mailto:rbur...@mysql.com] Sent: 19 August 2005 14:19 To: dot...@lists.mysql.com Subject: Connector/NET commit: r145 - in branches/1.0: . TestSuite mysqlclient

Modified: branches/1.0/CHANGES branches/1.0/TestSuite/CultureTests.cs branches/1.0/TestSuite/StoredProcedure.cs branches/1.0/mysqlclient/StoredProcedure.cs Log: CHANGES - added notice of a bug fix TestSuite/CultureTests.cs - fixed a problem where one test was leaving the
system in the Turkey Culture TestSuite/StoredProcedure.cs - Cleaned up some of the NUnit syntax

Modified: branches/1.0/CHANGES =================================================================== --- branches/1.0/CHANGES 2005-08-18 20:42:43 UTC (rev 144) +++ branches/1.0/CHANGES 2005-08-19 13:18:44 UTC (rev 145) @@ -39,6 +39,7 @@ Bug #12163 Insert using prepared statement causes double insert Bug #12245 using Prepare() on an insert command causes null parameters to
convert to "0" Bug #12646 Parameters are defaulted to Decimal [added a new test case] + Bug #12628 off by one on random selection of multiple hosts/ip addresses
[fixed]

Other changes -------------

Modified: branches/1.0/TestSuite/CultureTests.cs =================================================================== --- branches/1.0/TestSuite/CultureTests.cs 2005-08-18 20:42:43 UTC (rev 144) +++ branches/1.0/TestSuite/CultureTests.cs 2005-08-19 13:18:44 UTC (rev 145) @@ -122,8 +122,8 @@ Assert.Fail(ex.Message); }

- Thread.CurrentThread.CurrentCulture = c; - Thread.CurrentThread.CurrentUICulture = c; + Thread.CurrentThread.CurrentCulture = curCulture; + Thread.CurrentThread.CurrentUICulture = curUICulture; } } }

Modified: branches/1.0/TestSuite/StoredProcedure.cs =================================================================== --- branches/1.0/TestSuite/StoredProcedure.cs 2005-08-18 20:42:43 UTC (rev 144) +++ branches/1.0/TestSuite/StoredProcedure.cs 2005-08-19 13:18:44 UTC (rev 145) @@ -28,7 +28,7 @@ /// <summary> /// Summary description for StoredProcedure. /// </summary> - [TestFixture()] + [TestFixture] public class StoredProcedure : BaseTest { private static string fillError = null; @@ -36,7 +36,7 @@ [TestFixtureSetUp] public void FixtureSetup() { - //csAdditions = ";logging=true"; + csAdditions = ";pooling=false"; Open(); execSQL("DROP TABLE IF EXISTS Test; CREATE TABLE Test (id INT, name
VARCHAR(100))"); } @@ -55,7 +55,7 @@ public void ReturningResultset() { // create our procedure - execSQL( "CREATE PROCEDURE spTest( val decimal(10,3)) begin select val; end"
); + execSQL( "CREATE PROCEDURE spTest(val decimal(10,3)) begin select val;
end");

using (MySqlCommand cmd = new MySqlCommand("spTest", conn)) { @@ -71,7 +71,7 @@ } }

- [Test()] + [Test] [Category("5.0")] public void NonQuery() {

Modified: branches/1.0/mysqlclient/StoredProcedure.cs =================================================================== --- branches/1.0/mysqlclient/StoredProcedure.cs 2005-08-18 20:42:43 UTC (rev
144) +++ branches/1.0/mysqlclient/StoredProcedure.cs 2005-08-19 13:18:44 UTC (rev
145) @@ -1,23 +1,23 @@ -// Copyright (C) 2004-2005 MySQL AB -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as published
by -// the Free Software Foundation -// -// There are special exceptions to the terms and conditions of the GPL -// as it is applied to this software. View the full text of the -// exception in file EXCEPTIONS in the directory of this software -// distribution. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +// Copyright (C) 2004-2005 MySQL AB +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as published
by +// the Free Software Foundation +// +// There are special exceptions to the terms and conditions of the GPL +// as it is applied to this software. View the full text of the +// exception in file EXCEPTIONS in the directory of this software +// distribution. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + using System; using System.Data; using MySql.Data.Common; @@ -123,7 +123,7 @@ string[] paramDefs = Utility.ContextSplit( param_list, ",", "()" ); foreach (string paramDef in paramDefs) { - string[] parts = Utility.ContextSplit( paramDef.ToLower(), " \t\r\n",
""); + string[] parts = Utility.ContextSplit(paramDef.ToLower(), " \t\r\n", ""); if (parts.Length == 0) continue; string direction = parts.Length >= 3 ? parts[0] : "in"; string vName = parts.Length >= 3 ? parts[1] : parts[0]; @@ -131,7 +131,7 @@ string pName = connection.ParameterMarker + vName; vName = "@" + hash + vName;

- if (direction == "in") + if (direction.Equals("in")) sqlStr += pName + ", "; else if (direction == "out") {