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 /include/m_string.h | |
| 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 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h index 95b28d6d69a..395fd2ddda6 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -73,10 +73,12 @@ extern "C" { #endif /* - my_str_malloc() and my_str_free() are assigned to implementations in - strings/alloc.c, but can be overridden in the calling program. + my_str_malloc(), my_str_realloc() and my_str_free() are assigned to + implementations in strings/alloc.c, but can be overridden in + the calling program. */ extern void *(*my_str_malloc)(size_t); +extern void *(*my_str_realloc)(void *, size_t); extern void (*my_str_free)(void *); #if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) |