diff --git a/sql/handler.cc b/sql/handler.cc
index 56319bcc91c..fdf25c2670a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -980,13 +980,14 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
 void ha_key_cache(void)
 {
   if (keybuff_size)
-    (void) init_key_cache((ulong) keybuff_size);
+    (void) init_key_cache(&dflt_keycache,dflt_key_block_size,
+                          (ulong) keybuff_size);
 }
 
 
 void ha_resize_key_cache(void)
 {
-  (void) resize_key_cache((ulong) keybuff_size);
+  (void) resize_key_cache(&dflt_keycache,(ulong) keybuff_size);
 }
 
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 68fa0cca2d5..9e2dbcc576f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -874,7 +874,7 @@ void clean_up(bool print_message)
     udf_free();
 #endif
   (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
-  end_key_cache();
+  end_key_cache(&dflt_keycache,1);
   end_thr_alarm(1);			/* Free allocated memory */
 #ifdef USE_RAID
   end_raid();