summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:15:41 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:15:41 -0300
commit7a344b61065080902ad9530d33ed0fa72a1522fa (patch)
tree8ebb41f71112bff8879b8515ccb1e6c890d2f1f4 /mysys
parentcc3a26289d7b3e8275bf26f7c7d5682f8c86f2ad (diff)
downloadmariadb-git-7a344b61065080902ad9530d33ed0fa72a1522fa.tar.gz
WL#5498: Remove dead and unused source code
Remove the obsolete and buggy bmove512, use memcpy instead.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_keycache.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index c42c3d469e6..fc62d3d8a8e 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -2683,10 +2683,7 @@ uchar *key_cache_read(KEY_CACHE *keycache,
#endif
/* Copy data from the cache buffer */
- if (!(read_length & 511))
- bmove512(buff, block->buffer+offset, read_length);
- else
- memcpy(buff, block->buffer+offset, (size_t) read_length);
+ memcpy(buff, block->buffer+offset, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);
@@ -2920,10 +2917,7 @@ int key_cache_insert(KEY_CACHE *keycache,
#endif
/* Copy data from buff */
- if (!(read_length & 511))
- bmove512(block->buffer+offset, buff, read_length);
- else
- memcpy(block->buffer+offset, buff, (size_t) read_length);
+ memcpy(block->buffer+offset, buff, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);
@@ -3246,10 +3240,7 @@ int key_cache_write(KEY_CACHE *keycache,
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_unlock(&keycache->cache_lock);
#endif
- if (!(read_length & 511))
- bmove512(block->buffer+offset, buff, read_length);
- else
- memcpy(block->buffer+offset, buff, (size_t) read_length);
+ memcpy(block->buffer+offset, buff, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);