From: Martin Zaun Date: October 20 2010 2:12am Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:3903) List-Archive: http://lists.mysql.com/commits/121239 Message-Id: <201010200213.o9K250Yg029665@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0635530655==" --===============0635530655== 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:martin.zaun@stripped 3903 Martin Zaun 2010-10-19 [merge] ndbjtie - merge unit test fix modified: storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp === modified file 'storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp' --- a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp 2010-09-28 08:19:43 +0000 +++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp 2010-10-20 02:11:18 +0000 @@ -35,7 +35,7 @@ const int32_t B0::d0sc = -20; int32_t B1::d0s = 30; const int32_t B1::d0sc = -30; -A * A::a; +A * A::a = NULL; int32_t A::d0s = 10; const int32_t A::d0sc = -10; @@ -52,96 +52,112 @@ void B1::finit() { } void A::init() { - assert(!a); - a = new A(); - //printf(" a = %p\n", a); + //printf(" XXX A::a = %p\n", A::a); + assert(!A::a); + A::a = new A(); + //printf(" YYY A::a = %p\n", A::a); } void A::finit() { - assert(a); - delete a; - a = NULL; + //printf(" ZZZ A::a = %p\n", A::a); + assert(A::a); + delete A::a; + A::a = NULL; } // ---------------------------------------- -const C0 * C0::cc; -C0 * C0::c; +const C0 * C0::cc = NULL; +C0 * C0::c = NULL; -const C1 * C1::cc; -C1 * C1::c; +const C1 * C1::cc = NULL; +C1 * C1::c = NULL; void C0::init() { - assert(!c); - assert(!cc); + //printf(" XXX C0::c = %p, C0::cc = %p\n", C0::c, C0::cc); + //printf(" XXX C1::c = %p, C1::cc = %p\n", C1::c, C1::cc); + assert(!C0::c); + assert(!C0::cc); assert(C1::c); assert(C1::cc); - c = C1::c; - cc = C1::cc; - //printf(" c = %p, cc = %p\n", C0::c, C0::cc); + C0::c = C1::c; + C0::cc = C1::cc; + //printf(" YYY C0::c = %p, C0::cc = %p\n", C0::c, C0::cc); } void C0::finit() { - assert(c); - assert(cc); - c = NULL; - cc = NULL; + //printf(" ZZZ C0::c = %p, C0::cc = %p\n", C0::c, C0::cc); + assert(C0::c); + assert(C0::cc); + C0::c = NULL; + C0::cc = NULL; } void C1::init() { - assert(!c); - assert(!cc); - c = new C1(); - cc = new C1(); - //printf(" c = %p, cc = %p\n", C1::c, C1::cc); + //printf(" XXX C1::c = %p, C1::cc = %p\n", C1::c, C1::cc); + assert(!C1::c); + assert(!C1::cc); + C1::c = new C1(); + C1::cc = new C1(); + //printf(" YYY C1::c = %p, C1::cc = %p\n", C1::c, C1::cc); } void C1::finit() { - assert(c); - assert(cc); - delete c; - delete cc; - c = NULL; - cc = NULL; + //printf(" ZZZ C1::c = %p, C1::cc = %p\n", C1::c, C1::cc); + assert(C1::c); + assert(C1::cc); + delete C1::c; + delete C1::cc; + C1::c = NULL; + C1::cc = NULL; } // ---------------------------------------- -D0 * D0::d; -D1 * D1::d; -D2 * D2::d; +D0 * D0::d = NULL; +D1 * D1::d = NULL; +D2 * D2::d = NULL; void D0::init() { - assert(!d); - d = new D0(); + //printf(" XXX D0::d = %p\n", D0::d); + assert(!D0::d); + D0::d = new D0(); + //printf(" YYY D0::d = %p\n", D0::d); } void D0::finit() { - assert(d); - delete d; - d = NULL; + //printf(" ZZZ D0::d = %p\n", D0::d); + assert(D0::d); + delete D0::d; + D0::d = NULL; } void D1::init() { - assert(!d); - d = new D1(); + //printf(" XXX D1::d = %p\n", D1::d); + assert(!D1::d); + D1::d = new D1(); + //printf(" YYY D1::d = %p\n", D1::d); } void D1::finit() { - assert(d); - delete d; - d = NULL; + //printf(" ZZZ D1::d = %p\n", D1::d); + assert(D1::d); + delete D1::d; + D1::d = NULL; } void D2::init() { - assert(!d); - d = new D2(); + //printf(" XXX D2::d = %p\n", D2::d); + assert(!D2::d); + D2::d = new D2(); + //printf(" YYY D2::d = %p\n", D2::d); } void D2::finit() { - assert(d); - delete d; - d = NULL; + //printf(" ZZZ D2::d = %p\n", D2::d); + assert(D2::d); + delete D2::d; + D2::d = NULL; } // ---------------------------------------- @@ -159,14 +175,14 @@ void myapi_init() { } void myapi_finit() { - A::init(); - B0::init(); - B1::init(); - C0::init(); - C1::init(); - D0::init(); - D1::init(); - D2::init(); + A::finit(); + B0::finit(); + B1::finit(); + C0::finit(); + C1::finit(); + D0::finit(); + D1::finit(); + D2::finit(); } // --------------------------------------------------------------------------- --===============0635530655== 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: c175d7b5a9804b44abf61c023bc107dbc61eda25 # timestamp: 2010-10-19 19:12:54 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@stripped\ # isra2bdj0u4if573 # # Begin bundle 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 Nji/+LuSKcKEhnB33mg= --===============0635530655==--