Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

This commit is contained in:
Davi Arnaut 2010-11-20 12:37:55 -02:00
commit 766db2b52f

View File

@ -76,7 +76,7 @@ extern "C" {
extern void *(*my_str_malloc)(size_t);
extern void (*my_str_free)(void *);
#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4)
#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))