From: Martin Zaun
Date: June 7 2011 6:35pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4236)
List-Archive: http://lists.mysql.com/commits/138813
Message-Id: <201106071835.p57IZBfB002366@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7082635992173498746=="

--===============7082635992173498746==
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-jtie/ based on revid:craig.russell@stripped

 4236 Martin Zaun	2011-06-07
      ndbjtie - fixed jtie unit test

    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());


--===============7082635992173498746==
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-jtie/
# testament_sha1: 78a3675bd6a09c844cb229016218d9e653c40339
# timestamp: 2011-06-07 11:35:08 -0700
# base_revision_id: craig.russell@stripped\
#   31g7j0m3wcawb98u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWs4544AAfHfgABQcGP//1IS
lBC////wUAPe7diom66dFTgklNAmIzSmwU2SajT09U/VD2qBk09TygyJNMJhEjNDRAAAGgBoJFAQ
TFPQFPSaPKejUYhoaaZBoYAAAADQAAAAAIqFEemNTU09Mpo0A00GIAyARGrNfCCesmy+IF08lSO9
wl8G/BC6NGMQiOkavMXdr7cWhtePgBSVWx5PqeoZk5E3DKTpacBYcPx26D/4yqYksFc/Wp7o9xAw
tgphbEq+QLgJ2xR3D3BGOg6om/Q+u7PtBhNYgu4CReCp3G4nBI2yuaUQvUPVRR8sJjQsJdQrISmu
KiofkggnwJi1SGKvtUIq6RbHyXoKm7zMxFW4xO98Zk1puimgZM+HVRIkRlhk312ddmfsKaLFxUcf
CSfphqwOkgt7NeZEHok4T6gr0SDlVWMRWZaRsGqljzkc08SY3kFRiLiCoqQTiUxwsxIGjpnYS0xR
f2rKwtc4sL1veN6YgoSZcsy4ZWCgMqLtsMR0lFEaHAINaI+YYbDnVRJBQNwEMMzxYLRUQEwXCgth
C00YJ4Naww0vcNOhfwHkOF95AtNbBdEyqYMaH1QKcc60zNBQKg4aSFq1zwxa61O64ZYmTVTbEXKm
ikrslDWTM8fdFaMHszV5uwmzoz2250yj0ZxUXrc1ZArMinVzJBSr5i0H9BZ2E+b18teXG5RpS0Mm
PzkJzZzTi6izfNLUwYdcj8Yhy8Fpq71MSFlMlnXXL41mqlNuZe4fcYrq9KVZrTQWDC87HRGkMQ3Z
XgoxnkTqb+SCU+k8TkLvJuvKiISJEiQF4nsq55a0vHhZ380Xm0FtbQtMOJ9xSNaoPRqIATeGu8mH
Q/a/HjZ57SCigJzqLnZl3aKau6tqK7pHOav3gMln+20TKwXK+qRLF+EPZiBsBTBBR7DxNf0bbbjC
DeeWzyUAOWJvF/PjaXM528xQsU6mRmLAXkXhJQBVvL7SqnumiDgblYnHgwGIUf22l1QVhuqPGiL0
91Av0XK9Y12YFVwfG9HiDY7QphBljsSGOF0SyjuFqphHNN6nQZ+XwW124xlhhK2UwdGkyCT21kFS
XAUd1fUWkUmmu/hNdwujvE14KQNOMJ3SMwmXN7lqoL7bGZQDrVI+LyFDvQUSWaykinC8rysWOUcJ
pWgUOxNQFXCbV7E97t2A7FVcuYrdKvFAVqNoo3SFo5DUobyLd/vqWuiizQ1zIAUhWEYOKNw5Pt9h
lUBPoaaHSOFqco5Qk9Tj2DgaHftHb0mcZNrs458yzK/8XckU4UJBrOOeOA==


--===============7082635992173498746==--