After merge fix

52debcb8 · istruewing@chilla.local · 1943b5da · 52debcb8
Commit 52debcb8 authored Mar 22, 2007 by istruewing@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.cc +4 -2

No files found.
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -697,9 +697,11 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked)
        (struct st_mysql_ftparser *)parser->plugin->info;
    table->key_info[i].block_size= file->s->keyinfo[i].block_length;
  }
-  return (0);
+  my_errno= 0;
-err:
+  goto end;
+ err:
  this->close();
+ end:
  /*
    Both recinfo and keydef are allocated by my_multi_malloc(), thus only
    recinfo must be freed.