Thanks Magnus
Magnus Blåudd wrote:
> #At file:///home/msvensson/mysql/7.0/ based on
> revid:jack@stripped
>
> 3103 Magnus Blåudd 2009-10-09
> Bug#44607 Ndb : Fragmented long signals need node failure handling code
> - Fix compilation error caused by compiler that does not like anon union with
> anon struct
>
> modified:
> storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
> storage/ndb/src/kernel/vm/SimulatedBlock.cpp
> === modified file 'storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp'
> --- a/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp 2009-10-08
> 10:19:19 +0000
> +++ b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp 2009-10-09
> 08:15:14 +0000
> @@ -57,7 +57,7 @@ private:
> Uint32 cursor;
> Uint32 elementsCleaned;
> Uint32 callbackStart; /* Callback structure placed here */
> - };
> + } cleanup;
> };
> };
>
>
> === modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.cpp'
> --- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp 2009-10-08 11:15:24 +0000
> +++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp 2009-10-09 08:15:14 +0000
> @@ -1853,13 +1853,13 @@ SimulatedBlock::execCONTINUE_FRAGMENTED(
> callbackWords);
>
> Callback cb;
> - memcpy(&cb, &sig->callbackStart, callbackWords << 2);
> + memcpy(&cb, &sig->cleanup.callbackStart, callbackWords << 2);
>
> doNodeFailureCleanup(signal,
> - sig->failedNodeId,
> - sig->resource,
> - sig->cursor,
> - sig->elementsCleaned,
> + sig->cleanup.failedNodeId,
> + sig->cleanup.resource,
> + sig->cleanup.cursor,
> + sig->cleanup.elementsCleaned,
> cb);
> break;
> }
> @@ -2503,15 +2503,15 @@ SimulatedBlock::doNodeFailureCleanup(Sig
>
> ContinueFragmented * sig = (ContinueFragmented*)signal->getDataPtrSend();
> sig->type = ContinueFragmented::CONTINUE_CLEANUP;
> - sig->failedNodeId = failedNodeId;
> - sig->resource = resource;
> - sig->cursor = cursor;
> - sig->elementsCleaned= elementsCleaned;
> + sig->cleanup.failedNodeId = failedNodeId;
> + sig->cleanup.resource = resource;
> + sig->cleanup.cursor = cursor;
> + sig->cleanup.elementsCleaned= elementsCleaned;
> Uint32 callbackWords = (sizeof(Callback) + 3) >> 2;
> Uint32 sigLen = ContinueFragmented::CONTINUE_CLEANUP_FIXED_WORDS +
> callbackWords;
> ndbassert(sigLen <= 25); // Should be STATIC_ASSERT
> - memcpy(&sig->callbackStart, &cb, callbackWords << 2);
> + memcpy(&sig->cleanup.callbackStart, &cb, callbackWords << 2);
>
> sendSignal(reference(), GSN_CONTINUE_FRAGMENTED, signal, sigLen, JBB);
>
>
>
> ------------------------------------------------------------------------
>
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: magnus.blaudd@stripped
> # target_branch: file:///home/msvensson/mysql/7.0/
> # testament_sha1: f3cd29d61515f82d6824faf577edbd02952a4c67
> # timestamp: 2009-10-09 10:15:19 +0200
> # source_branch: file:///home/msvensson/mysql/6.3/
> # base_revision_id: jack@stripped
> #
> # Begin bundle
> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYD4uWgAAol/gEAQAgBZZ///
> WyMIgL////JQBf729d0A066DoorJ229sJRJpko2QyaepqaZqek2iYmjINBpoNBlRNqAyeoaaaaaN
> NA0NMQyaAMmCU0kp+Qj0p6mmRo09NTQ9QAAAABIqGSNT0niE0PUep6gGQ0aaAAGgkkCaAI1MZTIy
> aaaT1MJPTRNDTR6i2BhobbncycffElrpeUEGdQPbzmoJlY1EtOyEUlUS2xtwx36p5HWJEyRVpc8u
> VaSsbYNrz1i+Jp6pCxbrMxFRGyQWJUc9iMF3cTjPVFZbb6xugSc+GH9/tlStXpaj20D43k90COSh
> ToKkeqJBPHAIocv3MMLqFf8mWjK6sw3GNoQGV4ohE2YPrbDkrF6xdUpkvY2UZ1V8UVhAsQsm/LgM
> BHancuizpiVwDlnPigtO7IZI2p4sKZjU29mM6LiksnEcbbLW5pHNLI4MGhNCrcxBbSKNATOsbfAk
> BEJpiBABOT/pQcvGskfL9F4nsnCsErpuNT77c5YUY6Wo91ERO0N6oV1gEa+rqijjdKL6VmaBhUaM
> AvqgUnVvEEXr20mgpIuGJhYXwLCjTBG83SO0u4LI0E6itXFhGOzbQpEiJeOGMToBolyuMNgGayt1
> hceb73gXMwMGIyoTwga92clMsOu40kKTSQOqbbpGazNxvLh/ao6LIuduGuNzFwERqzWQOOBKqGse
> VEzIzycSNfbtOhY15WOqNi12XG4gRvI4297AYitLLTAtNcP7OLh3TpUP/DzyFcjycJgwEtJUPESg
> FdCochSZG4txJlBdOoyGOzdeBfAqpm18Eh7IVxB7SsLdxIuAq6i8YuAosLGqULBlWEHqlEfrW3fX
> vhgZOUfvMatENpQ8kbFeJPSJzEiPMJmv8Wu6IRck9z/ARMnuTAXRZkw34vhhSqqIlAPdJOmFavIr
> kd7Smo7K5zrZgkkmFcUmYvKS4gQNmq3OsQWXmgzEfmaDmGOrpoBwap6rE2Y5I1aAJFkmMbAcyCv4
> 6jV8ricjxInI6RKg8SQHqggYeh3Y6uIjZQHYaMCsoXuPILVkYVdfO53snJb+Yi2iTrhJlMctxZvH
> kewx/vghvmOWzmPOYu4wDUSB24CdLaQK0Dg9Bxw/UyJuPE1CNRtQ7bI5H1XevIrpOvuLl/E9k5HN
> HEMdzF0jcgeQ+su2JwKZzQsJ0lRXInfEJc7J01uTDRTFpdDGwcctbYFKgSHh1Jw5MHEiaMbWMPQy
> Lcwy4Gy1XKnWPQdALUR2c0YHWxw4HAzNJpKDAZS4mlQ9jmTVFZlugsD7Hcqtj7TpTScLwhaiRq1p
> 2M3muMHiiDdsiWmmvGX7EoGZhIMdTWvGnaBHwKzDT/wESlWgstnDtS2JzUHxQY1eKMKv4muMKJww
> cBmgx9vH49JFuw+u0yKi2Zpp1bkV+zkoG3Yl6vXae9ZM7Ih0JeKq9UFoXPC5l8JyQ5TWTvPshJoU
> JaJhzdV2bLKzVvESzXy+DMCnak8C8nGekGo/uvmVN/ECvknnLeTWfwWj5IqBN7MleYLjbQLwHSZQ
> yl5EhDv6uHFloiPHWLCmqGgagkVCJFDizAXq/b9FjiY4IDCRGg1YOiBg8WGhsyC2FS1yqnLFQDWI
> ck+kDUQx1ru7u4K4qkOA4s36VXVUM8+YHM3yV/uaSzO83ycx6qA96YX0yGxcU1qI3fUB7mfL3OZk
> 0K2nSitkaIZwuom0xySJcUG4COqLsCiNhYaJr4NYl2lmwY25ZNB0oJTiuKFiDIqVpWTM1BOCuRXZ
> 5An6zVfYTy2a++Z4HEHZ/YiQiEVqtCmb2WDkmlPzAeY1AJMRQU6oGbw0w7amCyppWhoKUSpAOG2S
> FYSybOQoBC+UwiwUd75AeQnFjupc+6eZ+Xmex+JFwFGQ5HZbX8x2PIg9x9tmGJ5PtzIEVA1Vxs17
> ReX+LuSKcKEhAfFy0A==
>
>
>
> ------------------------------------------------------------------------
>
>
>
--
Frazer Clement, Software Engineer, MySQL Cluster
Sun Microsystems - www.mysql.com
Office: Edinburgh, UK
Are you MySQL certified? www.mysql.com/certification
