Merge mysql.com:/usr/home/bar/mysql-5.1-new.19392

into  mysql.com:/usr/home/bar/mysql-5.1-kt


sql/sql_db.cc:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 11c892fee44..f598f58b8ee 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -134,9 +134,9 @@ void lock_db_delete(const char *name, uint length)
 {
   my_dblock_t *opt;
   safe_mutex_assert_owner(&LOCK_lock_db);
-  opt= (my_dblock_t *)hash_search(&lock_db_cache, (const byte*) name, length);
-  DBUG_ASSERT(opt != NULL);
-  hash_delete(&lock_db_cache, (byte*) opt);
+  if ((opt= (my_dblock_t *)hash_search(&lock_db_cache,
+                                       (const byte*) name, length)))
+    hash_delete(&lock_db_cache, (byte*) opt);
 }