diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
| commit | 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 (patch) | |
| tree | 87e5f83097f30c9fb7e30928800bcc92690f6bbd /strings/str_alloc.c | |
| parent | 9538bbfce9055f99529adb461d101b7b236eb5a3 (diff) | |
| download | mariadb-git-0b6c4bb34f99b8f4023fd0bef25a1b714f96b699.tar.gz | |
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)
Diffstat (limited to 'strings/str_alloc.c')
| -rw-r--r-- | strings/str_alloc.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |