Commit bdb262b7 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Drop the ARM Mroonga patch that it is already applied upstream

The author Vicențiu Ciorbaru confirmed this patch can be dropped as it
has already been applied upstream.
parent b306798e
From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
Date: Thu, 10 Aug 2017 20:40:29 +0200
Subject: armhf_mroonga_storage_fail
---
storage/mroonga/lib/mrn_multiple_column_key_codec.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
+++ b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
@@ -623,9 +623,10 @@ namespace mrn {
long long int long_long_value;
mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size);
int max_bit = (grn_key_size * 8 - 1);
- *((long long int *)mysql_key) =
+ long_long_value =
long_long_value ^ (((long_long_value ^ (1LL << max_bit)) >> max_bit) |
(1LL << max_bit));
+ memcpy(mysql_key, &long_long_value, sizeof(long_long_value));
DBUG_VOID_RETURN;
}
...@@ -4,7 +4,6 @@ innodb_simulate_comp_test_speedup.patch ...@@ -4,7 +4,6 @@ innodb_simulate_comp_test_speedup.patch
mips-groonga-atomic.patch mips-groonga-atomic.patch
mips-connect-unaligned.patch mips-connect-unaligned.patch
mips-machine.patch mips-machine.patch
#armhf_mroonga_storage_fail.patch
c11_atomics.patch c11_atomics.patch
kFreeBSD-gettid.patch kFreeBSD-gettid.patch
mytop-merge_src:mytop_improvements.patch mytop-merge_src:mytop_improvements.patch
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment