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

766db2b5 · Davi Arnaut · 4180ba3d · a6294cd5 · 766db2b5
Commit 766db2b5 authored Nov 20, 2010 by Davi Arnaut
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/m_string.h include/m_string.h +1 -1

No files found.
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -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))