From: Martin Zaun Date: June 7 2011 7:48pm Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4238) List-Archive: http://lists.mysql.com/commits/138814 Message-Id: <201106071949.p57Jn10b027901@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0906921544563416780==" --===============0906921544563416780== 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:magnus.blaudd@stripped 4238 Martin Zaun 2011-06-07 [merge] merge from ndb-7.1-jtie modified: storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java === modified file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java' --- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java 2011-02-02 09:52:33 +0000 +++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java 2011-06-07 18:35:02 +0000 @@ -331,7 +331,7 @@ public class MyJapiTest { MyJapi.f311bb(f211bb); assert (nf211bb == f211bb.asReadOnlyBuffer().get()); MyJapi.f311bb(MyJapi.f211bb()); - assert (nf211bb - 1 == f211bb.asReadOnlyBuffer().get()); + assert (nf211bb != f211bb.asReadOnlyBuffer().get()); out.println("\ncalling f312bb(f212bb())"); final ByteBuffer f212bb = MyJapi.f212bb().order(ByteOrder.nativeOrder()); @@ -425,7 +425,7 @@ public class MyJapiTest { final ByteBuffer f231bb = MyJapi.f231bb().order(ByteOrder.nativeOrder()); final byte nf231bb = f231bb.asReadOnlyBuffer().get(); MyJapi.f331bb(f231bb); - assert (nf231bb - 1 == f231bb.asReadOnlyBuffer().get()); + assert (nf231bb != f231bb.asReadOnlyBuffer().get()); out.println("\ncalling f332bb(f232bb())"); final ByteBuffer f232bb = MyJapi.f232bb().order(ByteOrder.nativeOrder()); @@ -904,7 +904,7 @@ public class MyJapiTest { MyJapi.f511bb1(f411bb); assert (nf411bb == f411bb.asReadOnlyBuffer().get()); MyJapi.f511bb1(MyJapi.f411bb1()); - assert (nf411bb - 1 == f411bb.asReadOnlyBuffer().get()); + assert (nf411bb != f411bb.asReadOnlyBuffer().get()); out.println("\ncalling f512bb1(f412bb1())"); final ByteBuffer f412bb = MyJapi.f412bb1().order(ByteOrder.nativeOrder()); @@ -998,7 +998,7 @@ public class MyJapiTest { final ByteBuffer f431bb = MyJapi.f431bb1().order(ByteOrder.nativeOrder()); final byte nf431bb = f431bb.asReadOnlyBuffer().get(); MyJapi.f531bb1(f431bb); - assert (nf431bb - 1 == f431bb.asReadOnlyBuffer().get()); + assert (nf431bb != f431bb.asReadOnlyBuffer().get()); out.println("\ncalling f532bb1(f432bb1())"); final ByteBuffer f432bb = MyJapi.f432bb1().order(ByteOrder.nativeOrder()); @@ -1072,7 +1072,7 @@ public class MyJapiTest { MyJapi.f551bb1(f451bb); assert (nf451bb == f451bb.asReadOnlyBuffer().get()); MyJapi.f551bb1(MyJapi.f451bb1()); - assert (nf451bb - 1 == f451bb.asReadOnlyBuffer().get()); + assert (nf451bb != f451bb.asReadOnlyBuffer().get()); out.println("\ncalling f552bb1(f452bb1())"); final ByteBuffer f452bb = MyJapi.f452bb1().order(ByteOrder.nativeOrder()); @@ -1166,7 +1166,7 @@ public class MyJapiTest { final ByteBuffer f471bb = MyJapi.f471bb1().order(ByteOrder.nativeOrder()); final byte nf471bb = f471bb.asReadOnlyBuffer().get(); MyJapi.f571bb1(f471bb); - assert (nf471bb - 1 == f471bb.asReadOnlyBuffer().get()); + assert (nf471bb != f471bb.asReadOnlyBuffer().get()); out.println("\ncalling f572bb1(f472bb1())"); final ByteBuffer f472bb = MyJapi.f472bb1().order(ByteOrder.nativeOrder()); --===============0906921544563416780== 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: 58606db726c333fed87500d0fe4491ea685dc351 # timestamp: 2011-06-07 12:48:59 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-jtie/ # base_revision_id: magnus.blaudd@stripped\ # 66iq8xk0ajgdhyaj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX5tw/0AAu/fgABQcGP//1IS lBC////wUAVY5Vril7bcXYytO3uvCSSaQZU/CZpNT02qeiahtT9Qj0T1PUPUyCSQBJmIknqeTKHq AAAGQAkSCIZU/0IEjTT1Mj1NqBoBoAIqETT00Qhp6TQDRkAAAAIpQqe9Bqk/Q1TxMpjGlHtUepo0 aNAepAtnUcG0fSS5mRx0mg4bcpYobRxYr7iTXGY+FZGqVhBIWAqeIvbu6WaTa+vggrMuo4YO2MLz vamWdB1iKzddYchY9fz/pL4mf28YDRlOAurT5Z6EsWVjoito0G1c+oHhGVriuMoJpNDNuYObAxmU 9DdOIWZfCNo/Ljzim0MX1blduFMUY30rV1tDcjFR/lJHSyoNJFp3IL4nRdq7+2gp/chCWcxYAYFR BkwYT40lUmpvrNNCs1h7v0hOv5N6DCeqSbTpQ0H6yhRb8JCaQMKBz9JVCLpR5KV0M0PHap7p9N0V rqHq/5ofZzlTf0rKJnztfGgyAy3wuO0mg77UkF4ZdhE29dIiJScS0t5h4na6zRqui7K2R4UD2ebb JIebzQi9SU8PTokeyIYlU7diBfnOe4jLhFKj9PEum/Mi03si6uz9DRMGThrqDrhM0gXQZ3N2bQra azLN6k04EqIfqONr1hDsSU1jvlQJlaQZG609WssGAbYwCYtS2e+VTAZDjCCWREm+ayorcYmkjXgr FKtAWnLOhu1d+0HVW22SDPakWIG3FQNLFlc1cmWtn8JUIvssL6QNbFWM5qzQmQw3ZbKJVzrveWZy hGzlnyfALrozEExz0FjM3UoY0hLaFdGG6wr0GnW4tXEahmuEOVOslWgUs3Loy32DGJMQ8GK7SHaj ZjaElDN46JpouvJK+KpoZeOqmK68ZzF7lmeA5Gouy0BkeXvPdsfU5la5wRAQee8aY5F0h6Dx2Exq rYUvnIf5OFGPfpsuPTzEh6DvsoHivSZQWStssJT9eh5UgdSdJchdBORkuxckta5LOszE29OFywk0 LDGXQM73UQWkbXA0vsCJ9AU85nvzqpWriX/OW80aIIFLxStMDPiX2aYsLQlJLTxqMcp0DJTFJYmO xhfCEvkvMvqg3Dc07rF2HpIbLdaRvJB7Swp3b/C+lvFzM6mgVPyOws78vhpZ5oHcPg4fJDAdxeP4 uO7b/CQOC8jo33EyMBX42mOpLeXEg/3YcNEUyTgkLTd4QL+bMzM0rnM1u2zhhN1T0E+xRF2ymdkP Mso5oUlbN8XVMD4jD3ocnuGzkG9zobD2tgeE4CMDA6hBmGxk7GkNUIHEZ/vtM5IbEoqCVWw3lGjP JOVa6GCcsVwhtMfsmLcBctyIgQHC9dBUBDN4WikF+0zPEkdo8W5E4sGFyD8nxGeDDneQ86LPVwme kKkSKrWdhiQysNCsG2RUNEmoxGrcS6jgJVCZNA5Y5l+SGnehBuAZL0O6p6inQbUy00j5NG416yIR CkcegMv0qdyDJU4CLwS0WZMC47jFXHO9GNR9iIFUBI9aYV08VLkhlmwm5jGWEmm2OyBDqQmUaDFZ roGVtQ3bGDUR3yRAhQ4SMHmVl/MJnYEIFozWiEsKNSH0DTa/Z8xrJIGTANTdc0etCxkOCGCyedzZ HWhWExarhdbVxK0D1Bc91WSSqKD/i7kinChIPzbh/oA= --===============0906921544563416780==--