From: Martin Zaun
Date: March 9 2011 9:14am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4124)
List-Archive: http://lists.mysql.com/commits/132658
Message-Id: <201103090915.p297hZhr016291@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1888196328263721378=="

--===============1888196328263721378==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mz/mysql/ndb-7.1/ based on revid:craig.russell@stripped

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

    modified:
      storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.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);


--===============1888196328263721378==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: d0445a5b6111e9b25764f45a4f0a7d252c60ae26
# timestamp: 2011-03-09 10:14:54 +0100
# source_branch: file:///Users/mz/mysql/ndb-7.1-ndb_restore-test-\
#   cleanup/
# base_revision_id: craig.russell@stripped\
#   8xndgs2rnn3pxtjr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWab/O6EAAZNfgEAQUHf//3oD
iBC//99wUAOtS3ktrq5hs4JJBBMSeU9GQ0U9TZomp6ZRtRhHqAygRkwKeinqeieoaBtQAABoMhAK
TamYoZpG1MT1DQAaNDIYAAAADQAAAAAJQkxGpkTZCek8moxND1GgAAOs0lF/6h4F9iGqupQZ4RZ8
sHRpTj5l+OlnpUMHv2B8kkERLsmZWQOjbVyRdvalWh7qoQ3cPelNNn2y0oocg1Z+264fxTmRZmMa
a+0LptHtB61r5Ee0ioWGFovjC2vRV5S2kimUBCdq1tifKjB5PKoRxZuJcQMlWogBgGMSpIQnOVGC
kv0KCwNwwLQLRXFr/gWqADwtp2vCsXSRb5RFpuG21zpD4WqeGey6K1Fy9S8XeiesWDTdwSvDJ8+D
b/04jMXBMShAIkoGt8jaHNVRADNWn8HHFN6UxS9GEIyJievJXcaKjXkE2o8kllSsA+ZE1330Kpki
Z5DatN4makTbkRyWzQBSikgMQMEfsKowTcuNUPYylrQIrLkI2PdxaxTjkEVsxNAsOMxLbM2nEPSA
GooxdroBb5mGc5qgAbWJFQzCIbEPoqVBmjQwOXMrydhZhUWCzEQhFe7iZevXJb60vxxsCKU8uRkx
7vfsdO3Zucbw3g/JCtgx4ekD+3PX2G1mrjpIA2QpBYAlJElMp4SueR9ayBGCXw/pk6d/Vy6I5qjJ
6MpwcddvkjxNsSbJ58YKn6bKZs9GzBzAtgdUiFjwVFAWwGCRQV399UOfbIviVxziWVB+hOZJDYfS
TjsE8PunceZiwLTT64ZIX5zHjmy0s7hVSHKjOWokseO8t2vGSNLY2PWl+5RMCYxmxTO20iHQi3cY
yCAOK2DLmHsdZQYfO7pepaqYREVzAsUGLEuKwWGwkGisOVtGBM1T8/BFeVFwnIE5WDytQG9AyvLY
Y6rIUaVVNYSzQojay5alFb7RadDXBmyXhjXUEIAwS4MkMqJv5bKHOaYOi5JH5Ow2nVrVWqFZg+cj
E0SZWimSb6pnpM+YlHBLRSOxU6JpFqqT0aYOa1DMDLZlXWebMhSC4uE87xr7pGYKA2uXmvC+Ir87
MnqF54zR8MDCCBLSeDEmsC9ekMkCJT0qJ597VihrKvyRkBDgDmSCNijb3ChUy4LLYCzpFMY6gub9
cFAQXyzVTjLuHDmg4HWHC0dlW3bSKA8mknjIKUX+Tgibkly3g5YbYgDxKIXAagFOU84gZL8yowNh
3ApcagyL8ybg5oOgP+LuSKcKEhTf53Qg


--===============1888196328263721378==--