bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3332) Bug#55553

[Tor Didriksen]

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


Attachment: [text/bzr-bundle] bzr/[e-mail]