commit d060897fbff2d8f8004f1e0078d20260c7d28f79
Author: Zsolt Parragi <zsolt.parragi@cancellar.hu>
Date:   Thu Feb 8 13:04:03 2018 +0100

    PS-3767: Added clang 4/5 warnings fixes for PS 5.7
    
    Based on 320473c2c2307d155feaa81e90c91b329e6c74eb

diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
index e7f0531b8f7..b121f3a5500 100644
--- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
@@ -33,6 +33,7 @@ extern "C" {
     Initialize an array
  */
 #define def_init_xdr_array(name) \
+  MY_ATTRIBUTE((unused))         \
   static inline void init_##name##_array(name##_array *x)
 #define init_xdr_array(name)                                                 \
   def_init_xdr_array(name) {                                                 \
@@ -44,6 +45,7 @@ extern "C" {
     Free the contents of an array
  */
 #define def_free_xdr_array(name) \
+  MY_ATTRIBUTE((unused))         \
   static inline void free_##name##_array(name##_array *x)
 #define free_xdr_array(name)   \
   def_free_xdr_array(name) {   \
@@ -74,6 +76,7 @@ extern "C" {
     Define a set function for an array
  */
 #define def_set_xdr_array(name) \
+  MY_ATTRIBUTE((unused))        \
   static inline void set_##name(name##_array *x, name a, u_int n)
 #define set_xdr_array(name)          \
   def_set_xdr_array(name) {          \
@@ -86,6 +89,7 @@ extern "C" {
     Define a get function for an array
  */
 #define def_get_xdr_array(name) \
+  MY_ATTRIBUTE((unused))        \
   static inline name get_##name(name##_array *x, u_int n)
 #define get_xdr_array(name)          \
   def_get_xdr_array(name) {          \
@@ -98,6 +102,7 @@ extern "C" {
     Define a function to clone an array
  */
 #define def_clone_xdr_array(name) \
+  MY_ATTRIBUTE((unused))          \
   static inline name##_array clone_##name##_array(name##_array x)
 #define clone_xdr_array(name)                                                \
   def_clone_xdr_array(name) {                                                \
diff --git a/testclients/bug25714.cc b/testclients/bug25714.cc
index 2642bb1fd2e..85fdb028a8d 100644
--- a/testclients/bug25714.cc
+++ b/testclients/bug25714.cc
@@ -69,5 +69,5 @@ int main(int argc, char **argv) {
   mysql_close(&conn);
   my_end(0);
 
-  return 0;
+  return OK;
 }