From: mmatthews
Date: February 27 2008 5:38pm
Subject: Connector/J commit: r6749 - in trunk/src: com/mysql/jdbc testsuite/regression
List-Archive: http://lists.mysql.com/commits/43090
Message-Id: <200802271738.m1RHc7cZ004392@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/src/com/mysql/jdbc/MysqlIO.java
   trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
   trunk/src/testsuite/regression/StatementRegressionTest.java
Log:
Post-merge fixups.

Modified: trunk/src/com/mysql/jdbc/MysqlIO.java
===================================================================
--- trunk/src/com/mysql/jdbc/MysqlIO.java	2008-02-27 17:12:05 UTC (rev 6748)
+++ trunk/src/com/mysql/jdbc/MysqlIO.java	2008-02-27 17:38:07 UTC (rev 6749)
@@ -93,4 +93,6 @@
     
     Buffer getSharedSendPacket();
 
+	public long getLastPacketReceivedTimeMs();
+
 }

Modified: trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
===================================================================
--- trunk/src/com/mysql/jdbc/MysqlIOprotocol.java	2008-02-27 17:12:05 UTC (rev 6748)
+++ trunk/src/com/mysql/jdbc/MysqlIOprotocol.java	2008-02-27 17:38:07 UTC (rev 6749)
@@ -359,7 +359,7 @@
             return this.mysqlInput.available() > 0;
         } catch (IOException ioEx) {
             throw SQLError.createCommunicationsException(this.connection,
-                this.lastPacketSentTimeMs, ioEx);
+                this.lastPacketSentTimeMs, this.lastPacketReceivedTimeMs, ioEx);
         }
     }
 
@@ -372,7 +372,7 @@
         return this.lastPacketSentTimeMs;
     }
 
-    protected long getLastPacketReceivedTimeMs() {
+    public long getLastPacketReceivedTimeMs() {
         return this.lastPacketReceivedTimeMs;
     }
 

Modified: trunk/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- trunk/src/testsuite/regression/StatementRegressionTest.java	2008-02-27 17:12:05 UTC (rev 6748)
+++ trunk/src/testsuite/regression/StatementRegressionTest.java	2008-02-27 17:38:07 UTC (rev 6749)
@@ -4166,6 +4166,47 @@
 			closeMemberJDBCResources();
 		}
 	}
+	/*
+	public void testBug32265() throws Exception {
+
+		if (!versionMeetsMinimum(5, 0)) {
+			return;
+		}
+		
+		Connection fetchableConn = null;
+		Statement fetchableStmt = null;
+		
+		try {
+
+			createTable("bug32265", "(Id INTEGER NOT NULL PRIMARY KEY)");
+			assertEquals(1, this.stmt
+					.executeUpdate("INSERT INTO bug32265 (Id) values (1)"));
+			this.rs = this.stmt.executeQuery("SELECT * FROM bug32265");
+			this.rs.next();
+			this.rs.getInt("bug32265.Id"); // ok
+
+			fetchableConn = getConnectionWithProps("useCursorFetch=true,dumpMetadataOnColumnNotFound=true");
+			fetchableStmt = fetchableConn.createStatement();
+			this.rs.close();
+			fetchableStmt.setFetchSize(10);
+			this.rs = fetchableStmt.executeQuery("SELECT * FROM bug32265");
+			ResultSetMetaData rs2 = this.rs.getMetaData();
+			assertEquals("bug32265", rs2.getTableName(1));
+			this.rs.next();
+			this.rs.getInt("bug32265.Id"); // fails
+
+		} finally {
+			if (fetchableStmt != null) {
+				fetchableStmt.close();
+			}
+			
+			if (fetchableConn != null) {
+				fetchableConn.close();
+			}
+			
+			closeMemberJDBCResources();
+		}
+	}*/
 	
 	public void testLancesBitMappingBug() throws Exception {
 		if (!versionMeetsMinimum(5, 0)) {