diff options
| author | unknown <monty@mysql.com> | 2004-03-29 19:21:53 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-29 19:21:53 +0300 |
| commit | ff908d18a27247c3b4206ce49977c4a7c73792be (patch) | |
| tree | f51ea3945f84d672edc962cdfc11eab16f569fc5 /include/m_string.h | |
| parent | 883215956e1597c7432cb79a68b510a4c0f7c9c2 (diff) | |
| parent | 501c3e7a0e1770aa7b40a2b1c19b8e89388b834f (diff) | |
| download | mariadb-git-ff908d18a27247c3b4206ce49977c4a7c73792be.tar.gz | |
Merge with 4.0 to get lastest bug fixes
include/m_string.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/bdb-crash.result:
Auto merged
sql/handler.h:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_table.cc:
Auto merged
innobase/mem/mem0dbg.c:
Merge with 4.0
mysql-test/r/myisam.result:
Merge with 4.0
mysql-test/r/order_by.result:
Merge with 4.0
mysql-test/t/bdb-crash.test:
Merge with 4.0
mysql-test/t/myisam.test:
Merge with 4.0
mysql-test/t/order_by.test:
Merge with 4.0
sql/ha_berkeley.cc:
Merge with 4.0 (use local code)
sql/sql_select.cc:
Merge with 4.0 to get fix for FORCE INDEX ... ORDER BY
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 21aa736acd4..c86801ae2d2 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -125,7 +125,7 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #ifdef HAVE_purify #include <assert.h> #define memcpy_overlap(A,B,C) \ -DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ +DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \ bmove((byte*) (A),(byte*) (B),(size_t) (C)); #else #define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) |