Merge branch 'mysql-5.6' into mysql-5.7

(cherry picked from commit aa7321167f10b02f0251f17037f1e3f4dc7ec8e1)

Author: Aditya A

plugin/innodb_memcached/daemon_memcached/include/memcached/util.h

@@ -1,3 +1,5 @@
+/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. */
+
 #ifndef UTIL_H
 #define UTIL_H
 /*
@@ -12,6 +14,11 @@
 #include <memcached/visibility.h>
 #include <memcached/types.h>
 
+/* Changed for INNODB_MEMCACHED */
+#if defined(htonll)
+#define HAVE_HTONLL 1
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif