9301fefeac
Copy from server:database/mariadb based on submit request 39217 from user -miska- OBS-URL: https://build.opensuse.org/request/show/39217 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=1
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
Index: mysys/mf_keycache.c
|
|
===================================================================
|
|
--- mysys/mf_keycache.c.orig
|
|
+++ mysys/mf_keycache.c
|
|
@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach
|
|
#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);
|
|
@@ -2857,10 +2854,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);
|
|
@@ -3164,10 +3158,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);
|