UNDO dlmalloc changes. addresses #1377

git-svn-id: file:///svn/mysql/tokudb-engine/src@9174 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb.cc

@@ -9,7 +9,6 @@ extern "C" {
 #if defined(_WIN32)
 #include "misc.h"
 #endif
-#include "dlmalloc.h"
 }
 
 #if !defined(HA_END_SPACE_KEY) || HA_END_SPACE_KEY != 0
@@ -1795,7 +1794,7 @@ int ha_tokudb::get_status() {
         }
         else if (error == 0 && value.size == sizeof(share->version)) {
             share->version = *(uint *)value.data;
-            dlfree(value.data);
+            free(value.data);
             value.data = NULL;
         }
         else {
@@ -1817,7 +1816,7 @@ int ha_tokudb::get_status() {
         }
         else if (error == 0 && value.size == sizeof(share->version)) {
             share->capabilities= *(uint *)value.data;
-            dlfree(value.data);
+            free(value.data);
             value.data = NULL;
         }
         else {
@@ -3450,7 +3449,7 @@ int ha_tokudb::reset(void) {
     if (current_row.flags & (DB_DBT_MALLOC | DB_DBT_REALLOC)) {
         current_row.flags = 0;
         if (current_row.data) {
-            dlfree(current_row.data);
+            free(current_row.data);
             current_row.data = 0;
         }
     }
@@ -4371,7 +4370,7 @@ void ha_tokudb::init_auto_increment() {
         
         if (error == 0 && value.size == sizeof(share->last_auto_increment)) {
             share->last_auto_increment = *(uint *)value.data;
-            dlfree(value.data);
+            free(value.data);
             value.data = NULL;
         }
         else {
@@ -4393,7 +4392,7 @@ void ha_tokudb::init_auto_increment() {
         
         if (error == 0 && value.size == sizeof(share->auto_inc_create_value)) {
             share->auto_inc_create_value = *(uint *)value.data;
-            dlfree(value.data);
+            free(value.data);
             value.data = NULL;
         }
         else {

storage/tokudb/hatoku_hton.cc

@@ -7,7 +7,6 @@ extern "C" {
 #include "misc.h"
 #endif
 #include "toku_os.h"
-#include "dlmalloc.h"
 }
 
 
@@ -121,7 +120,6 @@ static int tokudb_init_func(void *p) {
 #if defined(_WIN32)
     toku_ydb_init();
 #endif
-    setup_dlmalloc();
 
     tokudb_hton = (handlerton *) p;
 
@@ -448,9 +446,9 @@ static bool tokudb_show_logs(THD * thd, stat_print_fn * stat_print) {
     }
   err:
     if (all_logs)
-        dlfree(all_logs);
+        free(all_logs);
     if (free_logs)
-        dlfree(free_logs);
+        free(free_logs);
     free_root(&show_logs_root, MYF(0));
     *root_ptr = old_mem_root;
     TOKUDB_DBUG_RETURN(error);
@@ -494,7 +492,7 @@ void tokudb_cleanup_log_files(void) {
 #endif
         }
 
-        dlfree(names);
+        free(names);
     }
 
     DBUG_VOID_RETURN;