Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init

into mysql.com:/home/jimw/my/mysql-5.0-clean

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index fe266fdbf14..915d5dcea26 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -165,11 +165,13 @@ bool berkeley_init(void)
   {
     db_env->close(db_env,0); /* purecov: inspected */
     db_env=0; /* purecov: inspected */
+    goto err;
   }
 
   (void) hash_init(&bdb_open_tables,system_charset_info,32,0,0,
 		   (hash_get_key) bdb_get_key,0,0);
   pthread_mutex_init(&bdb_mutex,MY_MUTEX_INIT_FAST);
+err:
   DBUG_RETURN(db_env == 0);
 }