diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
| commit | 3ba6a2a9fa3fc7eed89ec612eb4f4ed6645bcd7d (patch) | |
| tree | d33ce0a47fbf5181f9c5ebfeddb7830a2e9f7223 /strings | |
| parent | 4c61db988714676e71175fbbf20173b9a96d06c2 (diff) | |
| parent | 916b559b10d06574ac77ab549785726ba2878222 (diff) | |
| download | mariadb-git-3ba6a2a9fa3fc7eed89ec612eb4f4ed6645bcd7d.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
mysql-test/collections/default.experimental
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/strmov.c | 6 |
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 */ |