Connector/J commit: r6565 - in trunk: . connector-j connector-j/src/com/mysql/jdbc connector-j/src/testsuite/regression

[mmatthews]

Modified:
   trunk/
   trunk/connector-j/CHANGES
   trunk/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
   trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
Log:
Merged revisions 6556-6564 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0

.......
  r6563 | mmatthews | 2007-09-06 09:02:01 -0500 (Thu, 06 Sep 2007) | 1 line
  
  Fixed BUG#30851, NPE with null column values when "padCharsWithSpace" is set to "true".
.......
  r6564 | mmatthews | 2007-09-06 09:03:59 -0500 (Thu, 06 Sep 2007) | 1 line
  
  Tags for inserting revision created.
.......



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6555 /branches/branch_5_1:1-6517,6544
   + /branches/branch_5_0:1-6564 /branches/branch_5_1:1-6517,6544

Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES	2007-09-06 14:03:59 UTC (rev 6564)
+++ trunk/connector-j/CHANGES	2007-09-06 14:07:15 UTC (rev 6565)
@@ -230,6 +230,9 @@
     - Fixed BUG#27915 - DatabaseMetaData.getColumns() doesn't
       contain SCOPE_* or IS_AUTOINCREMENT columns.
 
+    - Fixed BUG#30851, NPE with null column values when
+      "padCharsWithSpace" is set to "true".
+      
 07-19-07 - Version 5.0.7
 
     - Setting the configuration parameter "useCursorFetch" to "true" for

Modified: trunk/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2007-09-06 14:03:59 UTC
(rev 6564)
+++ trunk/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2007-09-06 14:07:15 UTC
(rev 6565)
@@ -2954,7 +2954,7 @@
 	 *             DOCUMENT ME!
 	 */
 	public String getDriverVersion() throws java.sql.SQLException {
-		return "@MYSQL_CJ_FULL_PROD_NAME@ ( $Date$, $Revision$ )";
+		return "@MYSQL_CJ_FULL_PROD_NAME@ ( Revision: @MYSQL_CJ_REVISION@ )";
 	}
 
 	/**

Modified: trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java	2007-09-06
14:03:59 UTC (rev 6564)
+++ trunk/connector-j/src/testsuite/regression/ResultSetRegressionTest.java	2007-09-06
14:07:15 UTC (rev 6565)
@@ -4439,5 +4439,31 @@
 		} finally {
 			closeMemberJDBCResources();
 		}
-	}	
+	}
+	
+	/**
+	 * Tests fix for BUG#30851, NPE with null column values when
+	 * "padCharsWithSpace" is set to "true".
+	 * 
+	 * @throws Exception
+	 */
+	public void testbug30851() throws Exception {
+		Connection padConn = getConnectionWithProps("padCharsWithSpace=true");
+		
+    	try {
+        	createTable("bug30851", "(CharCol CHAR(10) DEFAULT NULL)");
+    		this.stmt.execute("INSERT INTO bug30851 VALUES (NULL)");
+    		this.rs = padConn.createStatement().executeQuery("SELECT * FROM bug30851");
+    		this.rs.first();
+    		String strvar = this.rs.getString(1);
+    		//assertNotNull("Should be null", strvar);
+
+    	} finally {
+			closeMemberJDBCResources();
+			
+			if (padConn != null) {
+				padConn.close();
+			}
+		}        
+	}
 }