Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Author: jdduncan

storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt

@@ -24,7 +24,7 @@ CREATE_JAR(jtie-test-unload ${JAVA_SOURCES}
 
 SET(JAR "${JAVA_NDB_VERSION}.jar")
 SET(JTIE_TEST_UNLOAD_JAR "${CMAKE_CURRENT_BINARY_DIR}/jtie-test-unload-${JAR}")
-GET_FILENAME_COMPONENT(PARENT ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
+GET_FILENAME_COMPONENT(PARENT ${CMAKE_CURRENT_BINARY_DIR} PATH)
 SET(JTIE_MYJAPI_DIR "${PARENT}/myjapi")
 SET(JTIE_MYJAPI_JAR "${JTIE_MYJAPI_DIR}/jtie-test-myjapi-${JAR}")