diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
| commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
| tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /include/m_string.h | |
| parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
| parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
| download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h index 8cd9d3a72b6..708c2562e0f 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -74,11 +74,13 @@ extern void *(*my_str_malloc)(size_t); extern void *(*my_str_realloc)(void *, size_t); extern void (*my_str_free)(void *); +#ifdef DBUG_OFF #if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) #define strmov(A,B) __builtin_stpcpy((A),(B)) #elif defined(HAVE_STPCPY) #define strmov(A,B) stpcpy((A),(B)) #endif +#endif /* Declared in int2str() */ extern const char _dig_vec_upper[]; |