10.0-base merge

1 files changed, 5 insertions, 4 deletions

diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 400135c9aaa..9c6855bb92f 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -72,12 +72,13 @@ extern PSI_file_key key_file_charset, key_file_cnf;
 #endif /* HAVE_PSI_INTERFACE */
 
 #ifdef SAFEMALLOC
-void *sf_malloc(size_t size);
-void *sf_realloc(void *ptr, size_t size);
+void *sf_malloc(size_t size, myf my_flags);
+void *sf_realloc(void *ptr, size_t size, myf my_flags);
 void sf_free(void *ptr);
+size_t sf_malloc_usable_size(void *ptr, my_bool *is_thread_specific);
 #else
-#define sf_malloc(X)    malloc(X)
-#define sf_realloc(X,Y) realloc(X,Y)
+#define sf_malloc(X,Y)    malloc(X)
+#define sf_realloc(X,Y,Z) realloc(X,Y)
 #define sf_free(X)      free(X)
 #endif