Connector/J commit: r6566 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc connector-j/src/testsuite/regression

[mmatthews]

Modified:
   branches/branch_5_1/
   branches/branch_5_1/connector-j/CHANGES
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
   branches/branch_5_1/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
Log:
Merged revisions
6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6522,6524,6526-6528,6530-6531,6533-6534,6536-6537,6539-6540,6543-6545,6547,6549-6550,6552-6555,6557-6565
via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/trunk

...............
  r6565 | mmatthews | 2007-09-06 09:07:15 -0500 (Thu, 06 Sep 2007) | 13 lines
  
  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: branches/branch_5_1
___________________________________________________________________
Name: svnmerge-integrated
   -
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6556
   +
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6565

Modified: branches/branch_5_1/connector-j/CHANGES
===================================================================
--- branches/branch_5_1/connector-j/CHANGES	2007-09-06 14:07:15 UTC (rev 6565)
+++ branches/branch_5_1/connector-j/CHANGES	2007-09-06 14:14:17 UTC (rev 6566)
@@ -250,6 +250,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: branches/branch_5_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
===================================================================
--- branches/branch_5_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2007-09-06
14:07:15 UTC (rev 6565)
+++ branches/branch_5_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2007-09-06
14:14:17 UTC (rev 6566)
@@ -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:
branches/branch_5_1/connector-j/src/testsuite/regression/ResultSetRegressionTest.java
===================================================================
---
branches/branch_5_1/connector-j/src/testsuite/regression/ResultSetRegressionTest.java	2007-09-06
14:07:15 UTC (rev 6565)
+++
branches/branch_5_1/connector-j/src/testsuite/regression/ResultSetRegressionTest.java	2007-09-06
14:14:17 UTC (rev 6566)
@@ -4445,5 +4445,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();
+			}
+		}        
+	}
 }