Modified:
trunk/Installer/main.iss
trunk/Package.build
trunk/TestSuite/Source/AsyncTests.cs
trunk/TestSuite/Source/BaseTest.cs
trunk/TestSuite/Source/DataReaderTests.cs
trunk/TestSuite/Source/Syntax.cs
Log:
merged r:894 from 5.1
Modified: trunk/Installer/main.iss
===================================================================
--- trunk/Installer/main.iss 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/Installer/main.iss 2007-08-14 21:47:05 UTC (rev 895)
@@ -3,7 +3,7 @@
[Setup]
AppName=MySQL Connector/Net
-AppVersion=VERSION
+AppVersion={#VERSION}
AppVerName=MySQL Connector/Net {#SetupSetting("AppVersion")}
AppPublisher=MySQL, Inc.
AppPublisherURL=http://www.mysql.com.com/
@@ -19,6 +19,7 @@
WizardImageFile=Bitmaps\dlgbmp-is.bmp
WizardImageStretch=false
WizardSmallImageFile=compiler:wizmodernsmallimage-is.bmp
+VersionInfoVersion={#VERSION}
[Languages]
Name: english; MessagesFile: compiler:Default.isl
@@ -44,7 +45,7 @@
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
-Name: {group}\{cm:UninstallProgram,MySQL Connector/Net}; Filename: {uninstallexe}
+Name: {group}\{cm:UninstallProgram,MySQL Connector Net}; Filename: {uninstallexe}
Name: {group}\Change Log; Filename: {app}\CHANGES
Name: {group}\Release Notes; Filename: {app}\Release Notes.txt
Name: {group}\Help; Filename: {app}\Documentation\MySql.Data.chm
Modified: trunk/Package.build
===================================================================
--- trunk/Package.build 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/Package.build 2007-08-14 21:47:05 UTC (rev 895)
@@ -39,9 +39,9 @@
<target name="PackageInstall">
<exec if="${IsGPL}" program="iscc" workingdir="Installer" failonerror="true"
- commandline="main.iss /dVERSION=${ver} /dGPL=1 /fmysql-connector-net-${ver}${postfix}.exe"/>
+ commandline="main.iss /dVERSION=${ver} /dGPL=1 /fmysql-connector-net-${ver}${postfix}"/>
<exec unless="${IsGPL}" program="iscc" workingdir="Installer" failonerror="true"
- commandline="main.iss /dVERSION=${ver} /fmysql-connector-net-${ver}${postfix}.exe"/>
+ commandline="main.iss /dVERSION=${ver} /fmysql-connector-net-${ver}${postfix}"/>
<move todir="packages">
<fileset basedir="installer/output">
<include name="mysql*.exe"/>
Modified: trunk/TestSuite/Source/AsyncTests.cs
===================================================================
--- trunk/TestSuite/Source/AsyncTests.cs 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/TestSuite/Source/AsyncTests.cs 2007-08-14 21:47:05 UTC (rev 895)
@@ -28,88 +28,90 @@
[TestFixture]
public class AsyncTests : BaseTest
{
- [Test]
- public void ExecuteNonQuery()
- {
- if (version < new Version(5, 0)) return;
+ [Test]
+ public void ExecuteNonQuery()
+ {
+ if (version < new Version(5, 0)) return;
- execSQL("DROP TABLE IF EXISTS test");
- execSQL("CREATE TABLE test (id int)");
- execSQL("CREATE PROCEDURE spTest() BEGIN SET @x=0; REPEAT INSERT INTO test VALUES(@x); " +
- "SET @x=@x+1; UNTIL @x = 300 END REPEAT; END");
+ execSQL("DROP TABLE IF EXISTS test");
+ execSQL("CREATE TABLE test (id int)");
+ execSQL("CREATE PROCEDURE spTest() BEGIN SET @x=0; REPEAT INSERT INTO test VALUES(@x); " +
+ "SET @x=@x+1; UNTIL @x = 300 END REPEAT; END");
- try
- {
- MySqlCommand proc = new MySqlCommand("spTest", conn);
- proc.CommandType = CommandType.StoredProcedure;
- IAsyncResult iar = proc.BeginExecuteNonQuery();
- int count = 0;
- while (!iar.IsCompleted)
- {
- count++;
- System.Threading.Thread.Sleep(20);
- }
- int updated = proc.EndExecuteNonQuery(iar);
- Assert.IsTrue(count > 0);
+ try
+ {
+ MySqlCommand proc = new MySqlCommand("spTest", conn);
+ proc.CommandType = CommandType.StoredProcedure;
+ IAsyncResult iar = proc.BeginExecuteNonQuery();
+ int count = 0;
+ while (!iar.IsCompleted)
+ {
+ count++;
+ System.Threading.Thread.Sleep(20);
+ }
+ int updated = proc.EndExecuteNonQuery(iar);
+ Assert.IsTrue(count > 0);
- proc.CommandType = CommandType.Text;
- proc.CommandText = "SELECT COUNT(*) FROM test";
- object cnt = proc.ExecuteScalar();
- Assert.AreEqual(300, cnt);
- }
- catch (Exception ex)
- {
- Assert.Fail(ex.Message);
- }
- finally
- {
- }
- }
+ proc.CommandType = CommandType.Text;
+ proc.CommandText = "SELECT COUNT(*) FROM test";
+ object cnt = proc.ExecuteScalar();
+ Assert.AreEqual(300, cnt);
+ }
+ catch (Exception ex)
+ {
+ Assert.Fail(ex.Message);
+ }
+ finally
+ {
+ }
+ }
- [Test]
- public void ExecuteReader()
- {
- if (version < new Version(5, 0)) return;
+ [Test]
+ public void ExecuteReader()
+ {
+ if (version < new Version(5, 0)) return;
- execSQL("DROP TABLE IF EXISTS test");
- execSQL("CREATE TABLE test (id int)");
- execSQL("CREATE PROCEDURE spTest() BEGIN SET @x=0; REPEAT INSERT INTO test VALUES(@x); " +
- "SET @x=@x+1; UNTIL @x = 300 END REPEAT; SELECT 'done'; END");
+ execSQL("DROP TABLE IF EXISTS test");
+ execSQL("CREATE TABLE test (id int)");
+ execSQL("CREATE PROCEDURE spTest() BEGIN INSERT INTO test VALUES(1); " +
+ "SELECT SLEEP(2); SELECT 'done'; END");
- MySqlDataReader reader = null;
- try
- {
- MySqlCommand proc = new MySqlCommand("spTest", conn);
- proc.CommandType = CommandType.StoredProcedure;
- IAsyncResult iar = proc.BeginExecuteReader();
- int count = 0;
- while (!iar.IsCompleted)
- {
- count++;
- System.Threading.Thread.Sleep(20);
- }
+ MySqlDataReader reader = null;
+ try
+ {
+ MySqlCommand proc = new MySqlCommand("spTest", conn);
+ proc.CommandType = CommandType.StoredProcedure;
+ IAsyncResult iar = proc.BeginExecuteReader();
+ int count = 0;
+ while (!iar.IsCompleted)
+ {
+ count++;
+ System.Threading.Thread.Sleep(20);
+ }
- reader = proc.EndExecuteReader(iar);
- Assert.IsNotNull(reader);
- Assert.IsTrue(count > 0);
- Assert.IsTrue(reader.Read());
- Assert.AreEqual("done", reader.GetString(0));
- reader.Close();
+ reader = proc.EndExecuteReader(iar);
+ Assert.IsNotNull(reader);
+ Assert.IsTrue(count > 0, "count > 0");
+ Assert.IsTrue(reader.Read(), "can read");
+ Assert.IsTrue(reader.NextResult());
+ Assert.IsTrue(reader.Read());
+ Assert.AreEqual("done", reader.GetString(0));
+ reader.Close();
- proc.CommandType = CommandType.Text;
- proc.CommandText = "SELECT COUNT(*) FROM test";
- object cnt = proc.ExecuteScalar();
- Assert.AreEqual(300, cnt);
- }
- catch (Exception ex)
- {
- Assert.Fail(ex.Message);
- }
- finally
- {
- if (reader != null)
- reader.Close();
- }
- }
+ proc.CommandType = CommandType.Text;
+ proc.CommandText = "SELECT COUNT(*) FROM test";
+ object cnt = proc.ExecuteScalar();
+ Assert.AreEqual(1, cnt);
+ }
+ catch (Exception ex)
+ {
+ Assert.Fail(ex.Message);
+ }
+ finally
+ {
+ if (reader != null)
+ reader.Close();
+ }
+ }
}
}
Modified: trunk/TestSuite/Source/BaseTest.cs
===================================================================
--- trunk/TestSuite/Source/BaseTest.cs 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/TestSuite/Source/BaseTest.cs 2007-08-14 21:47:05 UTC (rev 895)
@@ -104,7 +104,11 @@
identified by 'test'", database0));
suExecSQL(String.Format(@"GRANT ALL ON `{0}`.* to 'test'@'localhost'
identified by 'test'", database1));
- suExecSQL("FLUSH PRIVILEGES");
+ suExecSQL(String.Format(@"GRANT ALL ON `{0}`.* to 'test'@'%'
+ identified by 'test'", database0));
+ suExecSQL(String.Format(@"GRANT ALL ON `{0}`.* to 'test'@'%'
+ identified by 'test'", database1));
+ suExecSQL("FLUSH PRIVILEGES");
rootConn.ChangeDatabase(database0);
Modified: trunk/TestSuite/Source/DataReaderTests.cs
===================================================================
--- trunk/TestSuite/Source/DataReaderTests.cs 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/TestSuite/Source/DataReaderTests.cs 2007-08-14 21:47:05 UTC (rev 895)
@@ -394,7 +394,7 @@
[Test]
public void HungDataReader()
{
- MySqlCommand cmd = new MySqlCommand("USE test; SHOW TABLES", conn);
+ MySqlCommand cmd = new MySqlCommand("USE " + database0 + "; SHOW TABLES", conn);
MySqlDataReader reader = null;
try
{
Modified: trunk/TestSuite/Source/Syntax.cs
===================================================================
--- trunk/TestSuite/Source/Syntax.cs 2007-08-14 21:45:47 UTC (rev 894)
+++ trunk/TestSuite/Source/Syntax.cs 2007-08-14 21:47:05 UTC (rev 895)
@@ -140,6 +140,7 @@
path = path.Replace(@"\", @"\\");
cmd.CommandText = "LOAD DATA LOCAL INFILE '" + path + "' INTO TABLE Test FIELDS TERMINATED BY ','";
+ cmd.CommandTimeout = 0;
object cnt = 0;
try
| Thread |
|---|
| • Connector/NET commit: r895 - in trunk: . Installer TestSuite/Source | rburnett | 14 Aug |
