From bc9e3bb40659d1847c1c7ba95f0ef0ed4c4604d2 Mon Sep 17 00:00:00 2001 From: unknown <jimw@mysql.com> Date: Wed, 12 Jan 2005 17:20:43 -0800 Subject: [PATCH] Fix small memory leak that occured when BerkeleyDB failed to initialize. sql/ha_berkeley.cc: Skip allocation of hash and lock on error --- sql/ha_berkeley.cc | 2 ++ 1 file changed, 2 insertions(+) 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); } -- 2.30.9