From bdb262b7e33da6600b87469802dda2508a5bc7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Thu, 3 Jan 2019 21:58:32 +0200 Subject: [PATCH] Drop the ARM Mroonga patch that it is already applied upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The author Vicențiu Ciorbaru confirmed this patch can be dropped as it has already been applied upstream. --- .../patches/armhf_mroonga_storage_fail.patch | 22 ------------------- debian/patches/series | 1 - 2 files changed, 23 deletions(-) delete mode 100644 debian/patches/armhf_mroonga_storage_fail.patch diff --git a/debian/patches/armhf_mroonga_storage_fail.patch b/debian/patches/armhf_mroonga_storage_fail.patch deleted file mode 100644 index ad376b162..000000000 --- a/debian/patches/armhf_mroonga_storage_fail.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian MySQL Maintainers -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; - } - diff --git a/debian/patches/series b/debian/patches/series index a4e914cda..2eac5dd5e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,6 @@ innodb_simulate_comp_test_speedup.patch mips-groonga-atomic.patch mips-connect-unaligned.patch mips-machine.patch -#armhf_mroonga_storage_fail.patch c11_atomics.patch kFreeBSD-gettid.patch mytop-merge_src:mytop_improvements.patch -- GitLab