bk commit into 5.1 tree (istruewing:1.2497)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-22 21:28:28+01:00, istruewing@stripped +1 -0
  After merge fix

  storage/myisam/ha_myisam.cc@stripped, 2007-03-22 21:28:25+01:00, istruewing@stripped +4 -2
    After merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug26996

--- 1.213/storage/myisam/ha_myisam.cc	2007-03-22 21:28:36 +01:00
+++ 1.214/storage/myisam/ha_myisam.cc	2007-03-22 21:28:36 +01:00
@@ -697,9 +697,11 @@ int ha_myisam::open(const char *name, in
         (struct st_mysql_ftparser *)parser->plugin->info;
     table->key_info[i].block_size= file->s->keyinfo[i].block_length;
   }
-  return (0);
-err:
+  my_errno= 0;
+  goto end;
+ err:
   this->close();
+ end:
   /*
     Both recinfo and keydef are allocated by my_multi_malloc(), thus only
     recinfo must be freed.