Connector/J commit: r6167 - branches/branch_5_0/connector-j branches/branch_5_0/connector-j/src/com/mysql/jdbc trunk/connector-j trunk/connector-j/src...

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/CHANGES
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/ResultSet.java
   trunk/connector-j/CHANGES
   trunk/connector-j/src/com/mysql/jdbc/ResultSet.java
Log:
Fixed issue where field-level for metadata from DatabaseMetaData when using 
	  INFORMATION_SCHEMA didn't have references to current connections,
	  sometimes leading to NullPointerExceptions when intropsecting them via
	  ResultSetMetaData.

Modified: branches/branch_5_0/connector-j/CHANGES
===================================================================
--- branches/branch_5_0/connector-j/CHANGES	2006-12-14 18:19:27 UTC (rev 6166)
+++ branches/branch_5_0/connector-j/CHANGES	2006-12-14 20:17:11 UTC (rev 6167)
@@ -33,7 +33,12 @@
       this behavior when there is full support for schemas in MySQL).  
             
 	- Fixed BUG#25073 - rewriting batched statements leaks internal statement
-	  instances, and causes a memory leak.	         
+	  instances, and causes a memory leak.	  
+	  
+	- Fixed issue where field-level for metadata from DatabaseMetaData when using 
+	  INFORMATION_SCHEMA didn't have references to current connections,
+	  sometimes leading to NullPointerExceptions when intropsecting them via
+	  ResultSetMetaData.       
 	   
 10-20-06 - Version 5.0.4
 

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/ResultSet.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/ResultSet.java	2006-12-14 18:19:27 UTC (rev 6166)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/ResultSet.java	2006-12-14 20:17:11 UTC (rev 6167)
@@ -779,6 +779,7 @@
 		
 		for (int i = 0; i < this.fields.length; i++) {
 			this.fields[i].setUseOldNameMetadata(true);
+			this.fields[i].setConnection(this.connection);
 		}
 	}
 

Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES	2006-12-14 18:19:27 UTC (rev 6166)
+++ trunk/connector-j/CHANGES	2006-12-14 20:17:11 UTC (rev 6167)
@@ -30,6 +30,11 @@
 
     - Fixed BUG#25073 - rewriting batched statements leaks internal statement
 	  instances, and causes a memory leak.
+	  
+	- Fixed issue where field-level for metadata from DatabaseMetaData when using 
+	  INFORMATION_SCHEMA didn't have references to current connections,
+	  sometimes leading to NullPointerExceptions when intropsecting them via
+	  ResultSetMetaData.
 	  	   	  	   
 10-20-06 - Version 5.0.4
 

Modified: trunk/connector-j/src/com/mysql/jdbc/ResultSet.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/ResultSet.java	2006-12-14 18:19:27 UTC (rev 6166)
+++ trunk/connector-j/src/com/mysql/jdbc/ResultSet.java	2006-12-14 20:17:11 UTC (rev 6167)
@@ -784,6 +784,7 @@
 		
 		for (int i = 0; i < this.fields.length; i++) {
 			this.fields[i].setUseOldNameMetadata(true);
+			this.fields[i].setConnection(this.connection);
 		}
 	}