summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.cc
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-01-12 17:20:43 -0800
committerunknown <jimw@mysql.com>2005-01-12 17:20:43 -0800
commitd74020eb398a12893b7268fec3cc6885ef624852 (patch)
treef974259583127179b1416370adfb0b27ab176414 /sql/ha_berkeley.cc
parenta3d3aef15786142094a04a17148a2f3a0166197b (diff)
downloadmariadb-git-d74020eb398a12893b7268fec3cc6885ef624852.tar.gz
Fix small memory leak that occured when BerkeleyDB failed to initialize.
sql/ha_berkeley.cc: Skip allocation of hash and lock on error
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r--sql/ha_berkeley.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 2c7cce4bcd0..e33cd3fca1b 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);
}