Imported mariadb 10.1.26-1debian/10.1.26-1debian

1 files changed, 24 insertions, 0 deletions

diff --git a/debian/patches/armhf_mroonga_storage_fail.patch b/debian/patches/armhf_mroonga_storage_fail.patch
new file mode 100644
index 0000000..a57ef5f
--- /dev/null
+++ b/debian/patches/armhf_mroonga_storage_fail.patch
@@ -0,0 +1,24 @@
+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(-)
+
+diff --git a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
+index c7ef9dd..b6ad631 100644
+--- a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
++++ b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
+@@ -612,9 +612,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;
+   }
+