lots of post-merge changes

1 files changed, 5 insertions, 5 deletions

diff --git a/storage/maria/ma_init.c b/storage/maria/ma_init.c
index 902f06d93e5..34f55bd0bf8 100644
--- a/storage/maria/ma_init.c
+++ b/storage/maria/ma_init.c
@@ -34,9 +34,9 @@ void history_state_free(MARIA_STATE_HISTORY_CLOSED *closed_history)
   for (history= closed_history->state_history; history ; history= next)
   {
     next= history->next;
-    my_free(history, MYF(0));
+    my_free(history);
   }
-  my_free(closed_history, MYF(0));
+  my_free(closed_history);
 }
 
 
@@ -72,8 +72,8 @@ int maria_init(void)
     maria_create_trn_hook= dummy_maria_create_trn_hook;
     my_handler_error_register();
   }
-  hash_init(&maria_stored_state, &my_charset_bin, 32,
-            0, sizeof(LSN), 0, (hash_free_key) history_state_free, 0);
+  my_hash_init(&maria_stored_state, &my_charset_bin, 32,
+            0, sizeof(LSN), 0, (my_hash_free_key) history_state_free, 0);
   DBUG_PRINT("info",("dummy_transaction_object: %p",
                      &dummy_transaction_object));
   return 0;
@@ -110,7 +110,7 @@ void maria_end(void)
     end_pagecache(maria_pagecache, TRUE);
     ma_control_file_end();
     pthread_mutex_destroy(&THR_LOCK_maria);
-    hash_free(&maria_stored_state);
+    my_hash_free(&maria_stored_state);
   }
 }