summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-12-16 19:31:19 +0200
committerGeorgi Kodinov <joro@sun.com>2009-12-16 19:31:19 +0200
commitb640b8f0369716052dcbf14a131ba31e04a464ae (patch)
tree3ced378450a6cc83a82e27f10b1d7183ae48f151 /strings
parent01cfb57fae2c7601ce5ec74432cb9e3659129517 (diff)
downloadmariadb-git-b640b8f0369716052dcbf14a131ba31e04a464ae.tar.gz
Bug #48866: mysql.test fails under Fedora 12
strmov() is not guaranteed to work correctly on overlapping source and destination buffers. On some OSes it may work, but Fedora 12 has a stpcpy() that's not working correctly on overlapping buffers. Fixed to use the overlap-safe version of strmov instead. Re-vitalized the overlap-safe version of strmov.
Diffstat (limited to 'strings')
-rw-r--r--strings/strmov.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/strings/strmov.c b/strings/strmov.c
index 1393411dd8f..eedf22a4ef1 100644
--- a/strings/strmov.c
+++ b/strings/strmov.c
@@ -24,13 +24,11 @@
#include <my_global.h>
#include "m_string.h"
-#ifdef BAD_STRING_COMPILER
+#ifdef strmov
#undef strmov
#define strmov strmov_overlapp
#endif
-#ifndef strmov
-
#if !defined(MC68000) && !defined(DS90)
char *strmov(register char *dst, register const char *src)
@@ -53,5 +51,3 @@ char *strmov(dst, src)
}
#endif
-
-#endif /* strmov */