List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:September 15 2007 12:23am
Subject:Rev 152: Resolved end_of_bound merge conflict. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 152
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Fri 2007-09-14 17:23:05 -0700
message:
  Resolved end_of_bound merge conflict.
modified:
  java/com/mysql/cluster/ndbj/NdbIndexScanOperationImpl.java
ndbindexscanoperatio-20070517181935-98huwjarzuh25b30-18
    ------------------------------------------------------------
    revno: 149.1.1
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Fri 2007-09-14 17:20:27 -0700
    message:
      Another quick fix for end_of_bound
    modified:
      java/com/mysql/cluster/ndbj/NdbIndexScanOperationImpl.java
ndbindexscanoperatio-20070517181935-98huwjarzuh25b30-18
=== modified file 'java/com/mysql/cluster/ndbj/NdbIndexScanOperationImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbIndexScanOperationImpl.java	2007-09-14 07:54:14 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbIndexScanOperationImpl.java	2007-09-15 00:23:05 +0000
@@ -51,10 +51,10 @@
 	 * @param range_no
 	 * @return
 	 * @throws NdbApiException
-	 * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#end_of_bound(long)
+	 * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#endOfBound(long)
 	 */
 	public int endOfBound(long range_no) throws NdbApiException {
-		return scanOpRef.end_of_bound(range_no);
+		return scanOpRef.endOfBound(range_no);
 	}
 
 	/*

Thread
Rev 152: Resolved end_of_bound merge conflict. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmergeMonty Taylor15 Sep