bzr push into connector-j/branches/branch_5_1 branch (todd.farmer:758 to 759) Bug#42055

[Todd Farmer]

  759 Todd Farmer	2009-01-13
      Fixing BUG#42055 ConcurrentModificationException when purging global blacklist.
modified:
  src/com/mysql/jdbc/LoadBalancingConnectionProxy.java

  758 mark@stripped	2008-12-01
      Fixed BUG#41161 - PreparedStatement.addBatch() doesn't check for all parameters
       being set, which leads to a NullPointerException when calling executeBatch() and
       rewriting batched statements into multi-value or multi-statement statements.
modified:
  CHANGES
  src/com/mysql/jdbc/PreparedStatement.java
  src/testsuite/regression/StatementRegressionTest.java

=== modified file 'src/com/mysql/jdbc/LoadBalancingConnectionProxy.java'
--- a/src/com/mysql/jdbc/LoadBalancingConnectionProxy.java	2008-11-11 06:19:59 +0000
+++ b/src/com/mysql/jdbc/LoadBalancingConnectionProxy.java	2009-01-13 23:55:53 +0000
@@ -525,7 +525,7 @@ public class LoadBalancingConnectionProx
 				synchronized(globalBlacklist){
 					globalBlacklist.remove(host);
 				}
-				blacklistClone.remove(host);
+				i.remove();
 			}
 				
 		}