From: Martin Zaun Date: October 20 2010 2:11am Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:3902) List-Archive: http://lists.mysql.com/commits/121238 Message-Id: <201010200211.o9K2Bl1r011255@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1709010932==" --===============1709010932== 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-dbg32/ based on revid:martin.zaun@stripped 3902 Martin Zaun 2010-10-19 ndbjtie - fixed jtie unit test (myapi [f]inalization failure). 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(); } // --------------------------------------------------------------------------- --===============1709010932== 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-dbg32/ # testament_sha1: 76d887870e1ab0644b98b0eb2cb610174e909988 # timestamp: 2010-10-19 19:11:26 -0700 # base_revision_id: martin.zaun@stripped\ # pwpzhu4sz7x2bs97 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQskKYYABLvfgEAQcnf//34H An6//9/wUAWve717u29h4PAxewPZEJJAmowmieJo1NBijSemjUPFMaaG1I9QaCNCaAQ0Q9QGgAAA AACTSipjSRoAGjQAA9RkABoAEUk0mmU2mmiaEN6ap6TJoYIaAwgZqCSSZGJGSZA0D1DT1ADIAAAH AhGnI2CD767zZdQSxcnCbGhyebGJsAjFZskHkGLUIyjA03TnODq3EUEKKKarQSSTkhGlQgU4xGz9 43lBEV9uX50wpEIeH4aq6ZEXXILDmamhhx25BeozTCKsnCMoOfFDfF5wIB7kWSXU3Xd5xsu116Xm c2T2xk98BiFLJS0s/fHx8m5pLPgzMzAjMnwDMGZgNSKAKYCrCEIQgTMzM0lKUpSlJSoAKtTP4/f/ rDKYvVytYn2JCwPXo17sbUhmaITaI5gO9QjbhXGM2UA5DZo1N+fYEkqVUwquMBiWhZbZqA6ROjMy hQoOQPmKoiY+ohvSFkldo/OC2a8c07kipdlKR2pBplZks61Dn7T6ZUfdbITVO5o3OA0rAsAk0Mzn LMLTNseWir3YVMWCRhBdznURUaXXPMWJESOu8qhBv76aVJMI8GTmE2k5FfPeKKtE0IvHqc7rb8yk G/sksCGCbhW6gatlqcJ3Y6xYXiSwBVOdErNhfyXRUZMmnO7msflF4t2SE5BHvWlnQtLTPDPfRZZG 6xC2vCdnsqTULwXwF7FaRG7RVE0NWoqV6fH/Zv475wcg2hipOTNVOzLIiCoyEdmpQVwMOsDKZZ0J jgNtwUKQsCyH8VL6NFNxwqWdYGqNoDTKR0nSm7IP1saIgt4sJRtuS61KZZYwF4TB+gRdhjhgUirE ig0cGMn7LDF8FeVqXpTSVYcDtKWILMUnTFZzsIqiywoNUwuRWfK7SyOFzXzqGTVxQVOzRREJFom5 +d1g/iyVi2mY5wCZvgioqsSMQVERRigxmQttq2222222220xjCrv8ASoQnUQgZQM6OwnQpz9uvMd HUZDXo8p6VVVYizhQ66Fxa1OqiihDDMB8TpyBPX2+DdoYeHd3t6Q00h6h+icjg271spyuQyurVgm BwmHGaBTOcEMK4ZhMZoVXKZcZoVXKZZ8HIcNBiDPlYAcgDKIByAPsJUJeYJheYJhRPJIPjbhWjj9 HlYpMiI6Ab+BwHdNHxq7kjPU4Ka/JrId6OGZHLoSLgBlXeyR3b+Hdf8MW5pGGJ34QsnkkURRiyKq qybtZq8/ZO0ejZsiFH5Tr9XH6IhTsUqzkmQhiQrfPGrK0MUtC7+WoyFn3EvGlO6xf07e4Ffq5xuf x6eu2oqdnkGRxy8Gr27tDdTOYx663s78uOsVuB5Jk++HUgMtuMG1imFgoKGxyQVbTaYcDqf+4n8Y z3qQ4ptOXGdIDWsOPdxRaYBDWpgjWVsrjAq0+yaC2HMrHlrAvb8BXIClIPC7TGeoNwWoOfO8W6LM uCxtxLw1hIKHBsikMOFeaO2UfRdojoF35n3h9D6jOx2qx9JrnCBEWxIk0bWj/JAzkhihIZ2pNwTH vFRdS4B5YSUIYhh9M23WDNNsig3KbAqeSTwO9hPcsHBJQ0XxDQZNKZLXRrUKtT5tW+2DYrjXSmXC 0jdYkEleLI98EBIFSFap3YVuAGLZZQaKqV8ZgDZhpI0KuDE9kBgGAqe2chETuevGr6kgjZeV2DAn 4ApChlh0LFdUCwaqlhuFNYwzigeJk8Oebc8nOObBNdA1Da6W5vn8VILm0/4u5IpwoSAWSFMM --===============1709010932==--