diff options
| author | monty@mysql.com <> | 2004-02-16 10:03:25 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-16 10:03:25 +0200 |
| commit | f43093ec0e1ca391f0cdde589418d19c4b82241a (patch) | |
| tree | 44dc172194086edaeef7da9c9ed059171579a886 /include/m_string.h | |
| parent | ce145789092b294a562f565671478ae2bf51d14a (diff) | |
| download | mariadb-git-f43093ec0e1ca391f0cdde589418d19c4b82241a.tar.gz | |
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index d72342fb3c1..5db7158f110 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -126,7 +126,7 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #include <assert.h> #define memcpy_overlap(A,B,C) \ DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ -bmove((byte*) key,(byte*) from,(size_t) length); +bmove((byte*) (A),(byte*) (B),(size_t) (C)); #else #define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) #endif /* HAVE_purify */ |