Bug#28350915 CHERRY-PICK FIX FOR BUG#26275510

- Add NDB specific changes backported from patch for mysql-5.6

Change-Id: I9ca338e4204fdcccbbfc4b5bba247e91aa0612a1

Author: arnabray21

storage/ndb/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -172,7 +172,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/include
 
   # Util library includes
-  ${ZLIB_INCLUDE_DIR}
   ${READLINE_INCLUDE_DIR})
 
 # The root of storage/ndb/

storage/ndb/ndb_configure.cmake

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -204,10 +204,9 @@ IF(NOT DEFINED WITH_ZLIB)
   # Hardcode use of the bundled zlib if not set by MySQL
   MESSAGE(STATUS "Using bundled zlib (hardcoded)")
   SET(ZLIB_LIBRARY zlib)
-  SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/zlib)
+  INCLUDE_DIRECTORIES(SYSTEM ${CMAKE_SOURCE_DIR}/zlib)
 ENDIF()
 NDB_REQUIRE_VARIABLE(ZLIB_LIBRARY)
-NDB_REQUIRE_VARIABLE(ZLIB_INCLUDE_DIR)
 
 IF(WITH_CLASSPATH)
   MESSAGE(STATUS "Using supplied classpath: ${WITH_CLASSPATH}")

storage/ndb/src/common/util/ndbzio.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,11 +45,12 @@
  * This is a casual hack to do static memory allocation
  * (needed by NDB)
  */
-#include "../../../../zlib/zutil.h"
-#include "../../../../zlib/zconf.h"
-#include "../../../../zlib/inftrees.h"
-#include "../../../../zlib/inflate.h"
-#include "../../../../zlib/deflate.h"
+#include <zutil.h>
+#include <zlib.h>
+#include <inftrees.h>
+#include <inflate.h>
+#include <deflate.h>
+
 
 #include <util/ndbzio.h>