bzr push into mysql-trunk branch (davi:3346 to 3347)

[Davi Arnaut]

 3347 Davi Arnaut	2010-11-17 [merge]
      Merge of mysql-5.5-bugteam into mysql-trunk-bugfixing.

    modified:
      include/m_string.h
 3346 He Zhenxing	2010-11-17 [merge]
      Auto merge patch for BUG#57764

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync.test
=== modified file 'include/m_string.h'
--- a/include/m_string.h	2010-11-16 10:05:56 +0000
+++ b/include/m_string.h	2010-11-17 09:57:44 +0000
@@ -76,8 +76,8 @@ extern "C" {
 extern void *(*my_str_malloc)(size_t);
 extern void (*my_str_free)(void *);
 
-#if MY_GNUC_PREREQ(3, 4)
-#define strmov(dest, src) __builtin_stpcpy(dest, src)
+#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4)
+#define strmov(A,B) __builtin_stpcpy((A),(B))
 #elif defined(HAVE_STPCPY)
 #define strmov(A,B) stpcpy((A),(B))
 #ifndef stpcpy

No bundle (reason: useless for push emails).