From 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 2 Oct 2013 15:04:07 +0400 Subject: MDEV-4928 Merge collation customization improvements Merging the following MySQL-5.6 changes: - WL#5624: Collation customization improvements http://dev.mysql.com/worklog/task/?id=5624 - WL#4013: Unicode german2 collation http://dev.mysql.com/worklog/task/?id=4013 - Bug#62429 XML: ExtractValue, UpdateXML max arg length 127 chars http://bugs.mysql.com/bug.php?id=62429 (required by WL#5624) --- strings/str_alloc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'strings/str_alloc.c') diff --git a/strings/str_alloc.c b/strings/str_alloc.c index 17139e7b773..91246603f2e 100644 --- a/strings/str_alloc.c +++ b/strings/str_alloc.c @@ -31,5 +31,11 @@ static void my_str_free_default(void *ptr) free(ptr); } +void *my_str_realloc_default(void *ptr, size_t size) +{ + return realloc(ptr, size); +} + void *(*my_str_malloc)(size_t)= &my_str_malloc_default; void (*my_str_free)(void *)= &my_str_free_default; +void *(*my_str_realloc)(void *, size_t)= &my_str_realloc_default; -- cgit v1.2.1