From: Tor Didriksen
Date: July 26 2010 11:17am
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3332) Bug#55553
List-Archive: http://lists.mysql.com/commits/114338
X-Bug: 55553
Message-Id: <20100726111747.2A2873592@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3998404252926124174=="

--===============3998404252926124174==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/next-mr-bf-bug54805-pp/ based on revid:tor.didriksen@stripped

 3332 Tor Didriksen	2010-07-26
      Bug #55553 hp_test2 is flaky
     @ storage/heap/hp_test2.c
        Don't save the heap position if heap_scan() returns error.

    modified:
      storage/heap/hp_test2.c
=== modified file 'storage/heap/hp_test2.c'
--- a/storage/heap/hp_test2.c	2010-07-23 20:09:27 +0000
+++ b/storage/heap/hp_test2.c	2010-07-26 11:17:39 +0000
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
   {
     if (!error)
       pos--;
-    if (i-- == 0)
+    if (!error && (i-- == 0))
     {
       bmove(record3,record,reclength);
       position=heap_position(file);
@@ -593,6 +593,7 @@ end:
   printf("\nFollowing test have been made:\n");
   printf("Write records: %d\nUpdate records: %d\nDelete records: %d\n", write_count,update,opt_delete);
   heap_clear(file);
+  heap_clear(file2);
   if (heap_close(file) || (file2 && heap_close(file2)))
     goto err;
   heap_delete_table(filename2);


--===============3998404252926124174==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   0p3udx197422llkc
# target_branch: file:///export/home/didrik/repo/next-mr-bf-bug54805-\
#   pp/
# testament_sha1: eb60e58602a5f5fb954eb41c2bba2a2148898670
# timestamp: 2010-07-26 13:17:47 +0200
# base_revision_id: tor.didriksen@stripped\
#   g2d9e272cs7w7fs0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRaUlt4AAbNfgEAQeeP//1YA
BAC/7//wUAPF4rQKoAA0Ik1PJhoGJNPVHplHqDE0xNADKaiBtGp6RsoaaeoAAAABhoaAAADQAAAA
BhoaAAADQAAAAAkkEyATIyTaAKno9U9T2qBtBPapWrSzbPsTloVuDRcYdIukgP1eANWFCLYSD267
7531VGZllz9wO0UebFIYwWtVfdup7QPm9TbfKT42N1n8wQXGNejbxLQjsBRRE9Kp1KtoGSLka+mA
Mx8Ahb8ayhY6i0U7w000sxnqxRWkREZOljdXD0oS5Ma04RV9mSLk8NjKtgi/DfKQigZ6fUEFk0fi
ZzHtDcK5LlFC8Muq/uk+5vt0oFYKEaab8s8lbFt06hX6zL63HfhmvkVIyEzXIahHQ/JYUQ18wIpT
VZBSKTK4xkCVZa0MiuVQoCa7qqteVQLx84c1XHq90ME7Ws7hULGL3egoTebHV2GFHGCOQ8bMyXLE
o97gpkVTA7LUOUMlllJKRuEz5m5G2cEGedfZ4/OqONjXvTgsNhcP4qunC+9lq6tARBegnxFJd9ip
oV+ro5QKyL/K7qJVHJXYvIjTjU0pDhx9e9Ercx7SxxqtgLII44wUHJvSxA+cLOrYldysk+do1Tnv
HYUTaMoDx1D1B0mcWkQlNph79DV/PPja15o1G37eJ0CJFTDH50paDbXEmkwcOcYjCt2wDgaw6HI4
7T2pq7pFzXDI7dGwwsj+00amqR6/K3Dzlno8YWjEW+iUNv4aBlu1d1/AYkEcoGRywJaFcz+jjdDF
mSPMUi/uuO7VbkVGdiwoXpOEqlNcqLL7hHIoBNsBVU7uKAFxN7EgS6YkqzyxmPNNUoMCcEly3PRU
xPc+9uPw7gkdTJMvXXhH8fXhw2lAmpRqenwLta56eNIETqPKJG76fqG/7uxm2oYf0TdaU3qBX0XP
J67J+gQpr+nu4km8WqGIY9Kjrs4mVNofPYQ+fxfAmkUiidY/wF9N+/ZCeSN1OsKVDtbvT9NBhZBP
ikPr9AkD3LOrJYTK0hga3ZFV1CdjvFq914VHukSU7S0saMIGyajhQUMdmeIbOqNAQpcUxi0kQZMs
SnjdRrBUcWDvBeW3iPKQwq1zcmwvWzeHgUYHqLPNmCRP95R26Sx/KbesVUWljkjRMgNNIotr4uJd
fVI/C2r9WKrhrjPLAoVanimWrXouSr3mNtXZIyNzQqD/LX1LP29mnWgapgqTY+ceOAtsWhAg1tws
TKbmwzsLWWBgM72tFcmTSZSx2LZzF8c8lpXlDHkrHWprQ008KlYLUKlSCUF79lVQUc//F3JFOFCQ
FpSW3g==


--===============3998404252926124174==--