Fixed dubug info.

sql/set_var.cc:
  fixed parameters.

2 files changed, 8 insertions, 9 deletions

diff --git a/mysys/my_safehash.c b/mysys/my_safehash.c
index 00ca1569b91..57f408942bf 100644
--- a/mysys/my_safehash.c
+++ b/mysys/my_safehash.c
@@ -52,7 +52,7 @@
 
 static void safe_hash_entry_free(SAFE_HASH_ENTRY *entry)
 {
-  DBUG_ENTER("free_assign_entry");
+  DBUG_ENTER("safe_hash_entry_free");
   my_free((gptr) entry, MYF(0));
   DBUG_VOID_RETURN;
 }
@@ -99,7 +99,7 @@ static byte *safe_hash_entry_get(SAFE_HASH_ENTRY *entry, uint *length,
 my_bool safe_hash_init(SAFE_HASH *hash, uint elements,
                        byte *default_value)
 {
-  DBUG_ENTER("safe_hash");
+  DBUG_ENTER("safe_hash_init");
   if (hash_init(&hash->hash, &my_charset_bin, elements,
                 0, 0, (hash_get_key) safe_hash_entry_get,
                 (void (*)(void*)) safe_hash_entry_free, 0))
@@ -272,7 +272,7 @@ end:
 void safe_hash_change(SAFE_HASH *hash, byte *old_data, byte *new_data)
 {
   SAFE_HASH_ENTRY *entry, *next;
-  DBUG_ENTER("safe_hash_set");
+  DBUG_ENTER("safe_hash_change");
 
   rw_wrlock(&hash->mutex);
 
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 04c80576887..55db1f6fd5c 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -4013,15 +4013,14 @@ static PAGECACHE *create_pagecache(const char *name, uint length)
     {
       /*
 	Set default values for a key cache
-	The values in dflt_pagecache_var is set by my_getopt() at startup
+	The values in maria_pagecache_var is set by my_getopt() at startup
 	We don't set 'buff_size' as this is used to enable the key cache
       */
-      pagecache->param_buff_size=      (dflt_pagecache_var.param_buff_size ?
-                                        dflt_pagecache_var.param_buff_size:
+      pagecache->param_buff_size=      (maria_pagecache_var.param_buff_size ?
+                                        maria_pagecache_var.param_buff_size:
                                         KEY_CACHE_SIZE);
-      pagecache->param_block_size=     dflt_pagecache_var.param_block_size;
-      pagecache->param_division_limit= dflt_pagecache_var.param_division_limit;
-      pagecache->param_age_threshold=  dflt_pagecache_var.param_age_threshold;
+      pagecache->param_division_limit= maria_pagecache_var.param_division_limit;
+      pagecache->param_age_threshold=  maria_pagecache_var.param_age_threshold;
     }
   }
   DBUG_RETURN(pagecache);