bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4123 to 4124)

[Martin Zaun]

 4124 Martin Zaun	2011-03-09
      ndbjtie - minor comments fixes

    modified:
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java
 4123 Craig L Russell	2011-03-07
      Don't expect an error with node 48

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ConnectionPoolTest.java
=== modified file 'storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java'
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java	2011-03-08 00:44:56 +0000
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java	2011-03-09 09:14:45 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ public class Ndb_cluster_connection exte
     public final native int get_latest_error() /*_const_*/;
     public final native String/*_const char *_*/ get_latest_error_msg() /*_const_*/;
     static public final native Ndb_cluster_connection create(String/*_const char *_*/ connectstring /*_= 0_*/);
-    static public final native Ndb_cluster_connection create(String/*_const char *_*/ connectstring /*_= 0_*/, int force_api_nodeid);
+    static public final native Ndb_cluster_connection create(String/*_const char *_*/ connectstring, int force_api_nodeid);
     static public final native void delete(Ndb_cluster_connection p0);
     public final native void set_name(String/*_const char *_*/ name);
     public final native int set_timeout(int timeout_ms);


Attachment: [text/bzr-bundle] bzr/[e-mail]