Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

2 files changed, 9 insertions, 2 deletions

diff --git a/mysys/file_logger.c b/mysys/file_logger.c
index 078286cd7d0..35a077c4391 100644
--- a/mysys/file_logger.c
+++ b/mysys/file_logger.c
@@ -172,7 +172,7 @@ int logger_vprintf(LOGGER_HANDLE *log, const char* fmt, va_list ap)
   if (n_bytes >= sizeof(cvtbuf))
     n_bytes= sizeof(cvtbuf) - 1;
 
-  result= my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0));
+  result= (int)my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0));
 
 exit:
   flogger_mutex_unlock(&log->lock);
@@ -196,7 +196,7 @@ int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size)
       goto exit; /* Log rotation needed but failed */
     }
 
-  result= my_write(log->file, (uchar *) buffer, size, MYF(0));
+  result= (int)my_write(log->file, (uchar *) buffer, size, MYF(0));
 
 exit:
   flogger_mutex_unlock(&log->lock);
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 6b24f777aaa..6a3ec8da093 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -212,6 +212,13 @@ void my_free(void *ptr)
     my_bool old_flags;
     old_size= MALLOC_SIZE_AND_FLAG(ptr, &old_flags);
     update_malloc_size(- (longlong) old_size - MALLOC_PREFIX_SIZE, old_flags);
+#ifndef SAFEMALLOC
+    /*
+      Trash memory if not safemalloc. We don't have to do this if safemalloc
+      is used as safemalloc will also do trashing
+    */
+    TRASH_FREE(ptr, old_size);
+#endif
     sf_free(MALLOC_FIX_POINTER_FOR_FREE(ptr));
   }
   DBUG_VOID_RETURN;